From 456aa2db499409ab500d98c464b3321d4b7cecc3 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 15 Apr 2021 15:40:20 +0200 Subject: [PATCH 001/213] nixos-rebuild: Allow remote building when using flakes --- .../linux/nixos-rebuild/nixos-rebuild.sh | 65 +++++++++++++++---- 1 file changed, 53 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 5874f334fed..6e31e174c84 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -214,6 +214,49 @@ nixBuild() { fi } +nixFlakeBuild() { + if [ -z "$buildHost" ]; then + nix build "$@" --out-link "${tmpDir}/result" + readlink -f "${tmpDir}/result" + else + local attr="$1" + shift 1 + local evalArgs=() + local buildArgs=() + while [ "$#" -gt 0 ]; do + local i="$1"; shift 1 + case "$i" in + --recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file) + evalArgs+=("$i") + ;; + --update-input) + local j="$1"; shift 1 + evalArgs+=("$i" "$j") + ;; + --override-input) + local j="$1"; shift 1 + local k="$1"; shift 1 + evalArgs+=("$i" "$j" "$k") + ;; + *) + buildArgs+=("$i") + ;; + esac + done + + local drv="$(nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildArgs[@]}")" + if [ -a "$drv" ]; then + NIX_SSHOPTS=$SSHOPTS nix "${flakeFlags[@]}" copy --derivation --to "ssh://$buildHost" "$drv" + # The 'nix-command flakes' part in "${flakeFlags[@]}" is seen as two separate args over SSH + buildHostCmd nix --experimental-features "'nix-command flakes'" build "${buildArgs[@]}" --out-link "${tmpDir}/result" "$drv" + buildHostCmd readlink -f "${tmpDir}/result" + else + echo "nix eval failed" + exit 1 + fi + fi +} + if [ -z "$action" ]; then showSyntax; fi @@ -315,8 +358,14 @@ fi tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX) SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60" +if [ -n "$buildHost" -a -n "$flake" ]; then + buildHostCmd mkdir -p "$tmpDir" +fi cleanup() { + if [ -n "$buildHost" -a -n "$flake" ]; then + buildHostCmd rm -rf "$tmpDir" + fi for ctrl in "$tmpDir"/ssh-*; do ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true done @@ -418,10 +467,7 @@ if [ -z "$rollback" ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' --no-out-link -A system "${extraBuildFlags[@]}")" else - outLink=$tmpDir/result - nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.toplevel" \ - "${extraBuildFlags[@]}" "${lockFlags[@]}" --out-link $outLink - pathToConfig="$(readlink -f $outLink)" + pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}")" fi copyToTarget "$pathToConfig" targetHostCmd nix-env -p "$profile" --set "$pathToConfig" @@ -429,24 +475,19 @@ if [ -z "$rollback" ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A system -k "${extraBuildFlags[@]}")" else - nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}" - pathToConfig="$(readlink -f ./result)" + pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}")" fi elif [ "$action" = build-vm ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A vm -k "${extraBuildFlags[@]}")" else - nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.vm" \ - "${extraBuildFlags[@]}" "${lockFlags[@]}" - pathToConfig="$(readlink -f ./result)" + pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.vm" "${extraBuildFlags[@]}" "${lockFlags[@]}")" fi elif [ "$action" = build-vm-with-bootloader ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A vmWithBootLoader -k "${extraBuildFlags[@]}")" else - nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.vmWithBootLoader" \ - "${extraBuildFlags[@]}" "${lockFlags[@]}" - pathToConfig="$(readlink -f ./result)" + pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.vmWithBootLoader" "${extraBuildFlags[@]}" "${lockFlags[@]}")" fi else showSyntax From fa827f3f624659d822666bc79d36534d6d3ea9d1 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 16 Apr 2021 12:42:26 +0200 Subject: [PATCH 002/213] nixos-rebuild: Use old-style nix command when building flake on a remote host --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 6e31e174c84..01d0fa823b9 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -247,9 +247,7 @@ nixFlakeBuild() { local drv="$(nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildArgs[@]}")" if [ -a "$drv" ]; then NIX_SSHOPTS=$SSHOPTS nix "${flakeFlags[@]}" copy --derivation --to "ssh://$buildHost" "$drv" - # The 'nix-command flakes' part in "${flakeFlags[@]}" is seen as two separate args over SSH - buildHostCmd nix --experimental-features "'nix-command flakes'" build "${buildArgs[@]}" --out-link "${tmpDir}/result" "$drv" - buildHostCmd readlink -f "${tmpDir}/result" + buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" else echo "nix eval failed" exit 1 @@ -358,14 +356,8 @@ fi tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX) SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60" -if [ -n "$buildHost" -a -n "$flake" ]; then - buildHostCmd mkdir -p "$tmpDir" -fi cleanup() { - if [ -n "$buildHost" -a -n "$flake" ]; then - buildHostCmd rm -rf "$tmpDir" - fi for ctrl in "$tmpDir"/ssh-*; do ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true done From 78028964a855cf338dcda60954546a13024b6959 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Sat, 17 Apr 2021 20:45:08 -0600 Subject: [PATCH 003/213] emacsMacPort: 8.0 -> 8.2 --- pkgs/applications/editors/emacs/macport.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index b8fcc678faa..8c395219aeb 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -5,20 +5,20 @@ stdenv.mkDerivation rec { pname = "emacs"; - version = "27.1"; + version = "27.2"; emacsName = "emacs-${version}"; - macportVersion = "8.0"; + macportVersion = "8.2"; name = "emacs-mac-${version}-${macportVersion}"; src = fetchurl { url = "mirror://gnu/emacs/${emacsName}.tar.xz"; - sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a"; + sha256 = "1ff182gjw9wqsbx1kj5gl2r5pbqhp4ar54g04j33fgz6g17cr9xl"; }; macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; - sha256 = "0rjk82k9qp1g701pfd4f0q2myzvsnp9q8xzphlxwi5yzwbs91kjq"; + sha256 = "1bgm2g3ky7rkj1l27wnmyzqsqxzjng7y9bf72ym37wiyhyi2a9za"; }; hiresSrc = fetchurl { From 377f91645110571699851e88868da74935f6b586 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 10:47:17 +0000 Subject: [PATCH 004/213] galene: 0.3 -> 0.3.3 --- pkgs/servers/web-apps/galene/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix index ae56fed52bd..d377b00a300 100644 --- a/pkgs/servers/web-apps/galene/default.nix +++ b/pkgs/servers/web-apps/galene/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "galene"; - version = "0.3"; + version = "0.3.3"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - sha256 = "1pl3mnkmfqykhq55q36kvvnvn9fgsk72pfa7nii3hywzad0bj0ar"; + sha256 = "sha256-8CgNMI7zOeDxrnmQNDM61Bgpw+N0sc7HR9c+YsQTO5I="; }; - vendorSha256 = "0jrc6y5chkj25bnpzn6blvfb0vd09h6fdcz75g54605z8nqd397p"; + vendorSha256 = "sha256-qOHuZGMr0CPwy/DuuWYCDSe24Y6ivg1uQJGXCuKGV/M="; outputs = [ "out" "static" ]; From a4580b69f7c376b8b5671fc1d0b51671c6d712fb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 21:36:59 +0000 Subject: [PATCH 005/213] lidarr: 0.7.2.1878 -> 0.8.1.2135 --- pkgs/servers/lidarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index 60c2027e552..9bd998cd850 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lidarr"; - version = "0.7.2.1878"; + version = "0.8.1.2135"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.linux.tar.gz"; - sha256 = "0kv0x3vvv4rp3i5k5985zp95mm8ca7gpm7kr82l11v3hm3n6yvqn"; + sha256 = "sha256-eJX6t19D2slX68fXSMd/Vix3XSgCVylK+Wd8VH9jsuI="; }; nativeBuildInputs = [ makeWrapper ]; From af10e7ca21d7c09d56af9467326fe682980c6f13 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sun, 2 May 2021 19:07:05 -0700 Subject: [PATCH 006/213] timg: 1.4.0 -> 1.4.2 Signed-off-by: Henner Zeller --- pkgs/tools/graphics/timg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/timg/default.nix b/pkgs/tools/graphics/timg/default.nix index 5acbaa7ffd2..7c2d004144d 100644 --- a/pkgs/tools/graphics/timg/default.nix +++ b/pkgs/tools/graphics/timg/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "timg"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "hzeller"; repo = "timg"; rev = "v${version}"; - sha256 = "10qhjfkbazncmj07y0a6cpmi7ki0l10qzpvi2zh8369yycqqxr8y"; + sha256 = "1zjcaxnik8imkn22g5kz6zly3yxpknrzd093sfxpgqnfw4sq8149"; }; buildInputs = [ graphicsmagick ffmpeg libexif libjpeg zlib ]; From a43526ba13c9842b6a23a25f8e24857d68c40b4d Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 1 May 2021 21:33:05 +0200 Subject: [PATCH 007/213] cawbird: 1.3.2 -> 1.4.0 - regular minor feature update, changelog: https://github.com/IBBoard/cawbird/releases/tag/v1.4 - specified exact version of GPLv3 usage --- pkgs/applications/networking/cawbird/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix index 9cf0e715e0e..5f7fab1816a 100644 --- a/pkgs/applications/networking/cawbird/default.nix +++ b/pkgs/applications/networking/cawbird/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , glib , gtk3 @@ -22,14 +23,14 @@ }: stdenv.mkDerivation rec { - version = "1.3.2"; + version = "1.4"; pname = "cawbird"; src = fetchFromGitHub { owner = "IBBoard"; repo = "cawbird"; rev = "v${version}"; - sha256 = "1baw3h5wq2ib4bnphazq7n9c9wc94g0n6v4y5kg71n1dir0c3jkh"; + sha256 = "sha256:1cjhbjbd4w1i7i63ib6h5wvx2s0v1l6b85wp07pvn3hmsrmis265"; }; nativeBuildInputs = [ @@ -69,11 +70,18 @@ stdenv.mkDerivation rec { patchShebangs data/meson_post_install.py ''; + # supply Twitter API keys + # use default keys supplied by upstream, see https://github.com/IBBoard/cawbird/blob/master/README.md#preparation + mesonFlags = [ + "-Dconsumer_key_base64=VmY5dG9yRFcyWk93MzJEZmhVdEk5Y3NMOA==" + "-Dconsumer_secret_base64=MThCRXIxbWRESDQ2Y0podzVtVU13SGUyVGlCRXhPb3BFRHhGYlB6ZkpybG5GdXZaSjI=" + ]; + meta = with lib; { description = "Native GTK Twitter client for the Linux desktop"; longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird."; homepage = "https://ibboard.co.uk/cawbird/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with lib.maintainers; [ jonafato schmittlauch ]; }; From 47c033e55e7afca78ee5f06179664b24ed0cbc24 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Tue, 4 May 2021 15:56:21 +0200 Subject: [PATCH 008/213] nzbhydra2: use openjdk11 --- pkgs/top-level/all-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bbc2ca4957..e058be45a94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7133,7 +7133,12 @@ in nzbget = callPackage ../tools/networking/nzbget { }; - nzbhydra2 = callPackage ../servers/nzbhydra2 { }; + nzbhydra2 = callPackage ../servers/nzbhydra2 { + # You need Java (at least 8, at most 15) + # https://github.com/theotherp/nzbhydra2/issues/697 + # https://github.com/theotherp/nzbhydra2/#how-to-run + jre = openjdk11; + }; oapi-codegen = callPackage ../tools/networking/oapi-codegen { }; From c7fbb3e6b44d1bc4a0a19919a6e74c0cdc9adb98 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 May 2021 09:09:49 +0200 Subject: [PATCH 009/213] python3Packages.amqtt: init at 0.10.0-alpha.3 --- .../python-modules/amqtt/default.nix | 64 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/development/python-modules/amqtt/default.nix diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix new file mode 100644 index 00000000000..8ab0e7a7c0c --- /dev/null +++ b/pkgs/development/python-modules/amqtt/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, docopt +, fetchFromGitHub +, hypothesis +, passlib +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pyyaml +, transitions +, websockets +}: + +buildPythonPackage rec { + pname = "amqtt"; + version = "0.10.0-alpha.3"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Yakifo"; + repo = pname; + rev = "v${version}"; + sha256 = "0wz85ykjgi2174qcdgpakmc4m0p96v62az7pvc9hyallq1v1k4n6"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + docopt + passlib + pyyaml + transitions + websockets + ]; + + checkInputs = [ + hypothesis + pytest-asyncio + pytestCheckHook + ]; + + disabledTestPaths = [ + # Test are not ported from hbmqtt yet + "tests/test_cli.py" + "tests/test_client.py" + ]; + + disabledTests = [ + # Requires network access + "test_connect_tcp" + ]; + + pythonImportsCheck = [ "amqtt" ]; + + meta = with lib; { + description = "Python MQTT client and broker implementation"; + homepage = "https://amqtt.readthedocs.io/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19d2a40dce6..37a1b725d35 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -383,6 +383,8 @@ in { amqplib = callPackage ../development/python-modules/amqplib { }; + amqtt = callPackage ../development/python-modules/amqtt { }; + android-backup = callPackage ../development/python-modules/android-backup { }; androidtv = callPackage ../development/python-modules/androidtv { }; From 92b12e0687b051345ae333e37d2630dfbf7916a8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 May 2021 10:07:41 +0200 Subject: [PATCH 010/213] python3Packages.roombapy: 1.6.2-1 -> 1.6.3 --- .../python-modules/roombapy/default.nix | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix index 9c438bde756..041c92b1fe1 100644 --- a/pkgs/development/python-modules/roombapy/default.nix +++ b/pkgs/development/python-modules/roombapy/default.nix @@ -1,31 +1,41 @@ -{ buildPythonPackage +{ lib +, amqtt +, buildPythonPackage , fetchFromGitHub -, hbmqtt -, lib , paho-mqtt -, poetry +, poetry-core , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "roombapy"; - version = "1.6.2-1"; + version = "1.6.3"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pschmitt"; repo = "roombapy"; rev = version; - sha256 = "14k7bys479xwpa4alpdwphzmxm3x8kc48nfqnshn1wj94vyxc425"; + sha256 = "sha256-GkDfIC2jx4Mpguk/Wu45pZw0czhabJwTz58WYSLCOV8="; }; - format = "pyproject"; + nativeBuildInputs = [ poetry-core ]; - nativeBuildInputs = [ poetry ]; propagatedBuildInputs = [ paho-mqtt ]; - checkInputs = [ hbmqtt pytest-asyncio pytestCheckHook ]; - pytestFlagsArray = [ "tests/" "--ignore=tests/test_discovery.py" ]; + checkInputs = [ + amqtt + pytest-asyncio + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests/" ]; + + disabledTestPaths = [ "tests/test_discovery.py" ]; + pythonImportsCheck = [ "roombapy" ]; meta = with lib; { From 00427b462b82bd6f7a690e588bbe01affcf9e958 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 May 2021 21:41:14 +0200 Subject: [PATCH 011/213] python3Packages.roombapy: 1.6.2-1 -> 1.6.3 --- pkgs/development/python-modules/roombapy/default.nix | 7 ++++--- pkgs/servers/home-assistant/default.nix | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix index 041c92b1fe1..459037d6191 100644 --- a/pkgs/development/python-modules/roombapy/default.nix +++ b/pkgs/development/python-modules/roombapy/default.nix @@ -32,9 +32,10 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests/" ]; - - disabledTestPaths = [ "tests/test_discovery.py" ]; + disabledTestPaths = [ + # Requires network access + "tests/test_discovery.py" + ]; pythonImportsCheck = [ "roombapy" ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c836d85ac9b..636abf68587 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -354,6 +354,7 @@ in with py.pkgs; buildPythonApplication rec { "rituals_perfume_genie" "rmvtransport" "roku" + "roomba" "rss_feed_template" "ruckus_unleashed" "safe_mode" From 7e7c78886ef139cc11b6f264e828be4e60fc6767 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 May 2021 22:54:28 +0200 Subject: [PATCH 012/213] python3Packages.pyialarm: init at 1.5 --- .../python-modules/pyialarm/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pyialarm/default.nix diff --git a/pkgs/development/python-modules/pyialarm/default.nix b/pkgs/development/python-modules/pyialarm/default.nix new file mode 100644 index 00000000000..6a35445fca1 --- /dev/null +++ b/pkgs/development/python-modules/pyialarm/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, dicttoxml +, fetchFromGitHub +, pythonOlder +, xmltodict +}: + +buildPythonPackage rec { + pname = "pyialarm"; + version = "1.5"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "RyuzakiKK"; + repo = pname; + rev = "v${version}"; + sha256 = "0vpscc2h13mmwscvjpm0bfd80x94mzh4d204v6n421mdz3ddhjqp"; + }; + + propagatedBuildInputs = [ + dicttoxml + xmltodict + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pyialarm" ]; + + meta = with lib; { + description = "Python library to interface with Antifurto365 iAlarm systems"; + homepage = "https://github.com/RyuzakiKK/pyialarm"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19d2a40dce6..a3f2beb8ffd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5617,6 +5617,8 @@ in { pyi2cflash = callPackage ../development/python-modules/pyi2cflash { }; + pyialarm = callPackage ../development/python-modules/pyialarm { }; + pyicloud = callPackage ../development/python-modules/pyicloud { }; PyICU = callPackage ../development/python-modules/pyicu { }; From 7d01cf8b74e944ff4a90236ee143d2ff15831e11 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 May 2021 02:23:27 +0000 Subject: [PATCH 013/213] doctl: 1.59.0 -> 1.60.0 --- pkgs/development/tools/doctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 83256efd5fa..fee73f7e98c 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.59.0"; + version = "1.60.0"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-mkFKYWPUEHVtQi9eUPxvWYxNCfVrKdjo2bH2DEwL1d0="; + sha256 = "sha256-HhJOjTuPuQT8CYRf4yaR+d/MyTWlM1y+FiEU7S5rEs0="; }; meta = with lib; { From c59f333f21b5e30afa8bee67a738c37c9fcd360a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 May 2021 11:44:17 +0200 Subject: [PATCH 014/213] python3Packages.plexapi: 4.5.1 -> 4.5.2 --- pkgs/development/python-modules/plexapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 52c37115411..dc832809c28 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "PlexAPI"; - version = "4.5.1"; + version = "4.5.2"; disabled = isPy27; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "sha256-WrjIN6+7ybprnjCv57BdKaQYoQ+HgGVr/XytXcbAmwg="; + sha256 = "sha256-9rdpisEuLUO7oO7+7SQb4fXqRG30rf4R7bSFY+QpMhM="; }; propagatedBuildInputs = [ From 955cf497adbc6a95284e07c2747af7458addc667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 6 May 2021 15:32:55 +0200 Subject: [PATCH 015/213] python3Packages.graphite-web: fix build --- pkgs/development/python-modules/graphite-web/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index d2d6a78436a..08125bfc71a 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -28,6 +28,12 @@ buildPythonPackage rec { ./update-django-tagging.patch ]; + postPatch = '' + # https://github.com/graphite-project/graphite-web/pull/2701 + substituteInPlace setup.py \ + --replace "'scandir'" "'scandir; python_version < \"3.5\"'" + ''; + propagatedBuildInputs = [ django memcached From af3425becafe22b0d8bbef476246fb3a519664e6 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 6 May 2021 14:14:27 +0200 Subject: [PATCH 016/213] openttd: 1.11.1 -> 1.11.2 --- pkgs/games/openttd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 34de043a658..5c77e8a2c18 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - sha256 = "sha256-qZGeLkKbsI+in+jme6m8dckOnvb6ZCSOs0IjoyXUAKM="; + sha256 = "sha256-D7qTWiqBX0/ozW3C4q4z9ydpU4cxIo+EimOzpulILm0="; }; nativeBuildInputs = [ cmake makeWrapper ]; From 01fc878bed62acdb38101e1404459ce64a5945f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 May 2021 15:14:14 +0200 Subject: [PATCH 017/213] python3Packages.python-miio: 0.5.5.2 -> 0.5.6 --- pkgs/development/python-modules/python-miio/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 1d9025a035f..2374c6797f2 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -24,20 +24,19 @@ buildPythonPackage rec { pname = "python-miio"; - version = "0.5.5.2"; + version = "0.5.6"; disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lk7egCyj+vSsaXmxuWxlQuom8n3JEs/RIWwCuwTOXeI="; + sha256 = "sha256-tmGt50xBDV++/pqyXsuxHdrwv+XbkjvtrzsYBzQh7zE="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace 'croniter = "^0"' 'croniter = "*"' \ - --replace 'defusedxml = "^0.6"' 'defusedxml = "*"' \ - --replace 'zeroconf = "^0.28"' 'zeroconf = "*"' + --replace 'defusedxml = "^0.6"' 'defusedxml = "*"' ''; nativeBuildInputs = [ From 1537fef2ab5b0529be722a0de3eeb880e845dc40 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 May 2021 15:16:09 +0200 Subject: [PATCH 018/213] home-assistant: enable xiaomi_miio tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c836d85ac9b..5969ddc6a61 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -409,6 +409,7 @@ in with py.pkgs; buildPythonApplication rec { "wled" "workday" "worldclock" + "xiaomi_miio" "yeelight" "zeroconf" "zha" From 9af1ed8888f49135935e132d29018bf039488617 Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Fri, 7 May 2021 22:11:59 +0530 Subject: [PATCH 019/213] google-cloud-sdk: 336.0.0 -> 339.0.0 --- pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index f89e02c8593..ac4d2799e49 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "0fb0bw16idj810si32fxqx1nl057bdsjk3pvkgzpf7j96v2lkw71"; + sha256 = "1xb6s78q0fba45595d868vmbxdb41060jbygypfa5hvvcz8d8ayk"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "0gnnp8whcx6ada8a4xs8kxrbza97zivk57r9qzv0q5arg4xslagr"; + sha256 = "19ywvp7nm91rc32r7dzb6yf3ss74m3s01fh2xqnmdg382jjlzdby"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "336.0.0"; + version = "339.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); From acb7b55d925c81648674eab9efe5fb55548fe6b3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 7 May 2021 19:32:10 +0200 Subject: [PATCH 020/213] maintainers/check-hydra-by-maintainer: use `pkgs.hydra-check` from package set itself --- maintainers/scripts/check-hydra-by-maintainer.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/scripts/check-hydra-by-maintainer.nix b/maintainers/scripts/check-hydra-by-maintainer.nix index cecf65ec66d..326aae47f8c 100644 --- a/maintainers/scripts/check-hydra-by-maintainer.nix +++ b/maintainers/scripts/check-hydra-by-maintainer.nix @@ -48,6 +48,7 @@ let in pkgs.stdenv.mkDerivation { name = "nixpkgs-update-script"; + buildInputs = [ pkgs.hydra-check ]; buildCommand = '' echo "" echo "----------------------------------------------------------------" From 3e44834779f3d296a069774a58ab4459ca824e33 Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Sat, 8 May 2021 00:06:37 +0530 Subject: [PATCH 021/213] vimPlugins.vim-deus: init at 2021-03-28 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 7eb81d54d84..1c560376ab2 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5666,6 +5666,18 @@ let meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; + vim-deus = buildVimPluginFrom2Nix { + pname = "vim-deus"; + version = "2021-03-28"; + src = fetchFromGitHub { + owner = "ajmwagar"; + repo = "vim-deus"; + rev = "1be965e7bc1c01e7db5e46dcd0e50d32d4eef434"; + sha256 = "1h0imrxhxw81hkh9xl75rcnx7ll5fry6hcf7flx84n6nawvfzyvm"; + }; + meta.homepage = "https://github.com/ajmwagar/vim-deus"; + }; + vim-diminactive = buildVimPluginFrom2Nix { pname = "vim-diminactive"; version = "2017-08-27"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c5e9deeb0ab..44660d2184b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -4,6 +4,7 @@ AckslD/nvim-whichkey-setup.lua@main ackyshake/Spacegray.vim@main airblade/vim-gitgutter airblade/vim-rooter +ajmwagar/vim-deus akinsho/nvim-bufferline.lua akinsho/nvim-toggleterm.lua aklt/plantuml-syntax From 43c68b0aa17d0e0be3cd6cd3da08c95d14158b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Tue, 4 May 2021 00:34:55 -0300 Subject: [PATCH 022/213] python3Packages.pytest-regressions: init at 2.2.0 --- .../pytest-regressions/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-regressions/default.nix diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix new file mode 100644 index 00000000000..90b72c886ea --- /dev/null +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, pythonOlder +, matplotlib +, numpy +, pandas +, pillow +, pytest +, pytest-datadir +, pytestCheckHook +, pyyaml +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pytest-regressions"; + version = "2.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "15a71f77cb266dd4ca94331abe4c339ad056b2b2175e47442711c98cf6d65716"; + }; + + patches = [ + # Make pytest-regressions compatible with NumPy 1.20. + # Should be part of the next release. + (fetchpatch { + url = "https://github.com/ESSS/pytest-regressions/commit/ffad2c7fd1d110f420f4e3ca3d39d90cae18a972.patch"; + sha256 = "sha256-bUna7MnMV6u9oEaZMsFnr4gE28rz/c0O2+Hyk291+l0="; + }) + ]; + + nativeBuildInputs = [ setuptools-scm ]; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ numpy pandas pillow pytest-datadir pyyaml ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + checkInputs = [ pytestCheckHook matplotlib ]; + pythonImportsCheck = [ "pytest_regressions" "pytest_regressions.plugin" ]; + + meta = with lib; { + description = "Pytest fixtures to write regression tests"; + longDescription = '' + pytest-regressions makes it simple to test general data, images, + files, and numeric tables by saving expected data in a data + directory (courtesy of pytest-datadir) that can be used to verify + that future runs produce the same data. + ''; + homepage = "https://github.com/ESSS/pytest-regressions"; + license = licenses.mit; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ec810b84ac..d5fe7e62271 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6387,6 +6387,8 @@ in { pytest-random-order = callPackage ../development/python-modules/pytest-random-order { }; + pytest-regressions = callPackage ../development/python-modules/pytest-regressions { }; + pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { }; pytest-remotedata = callPackage ../development/python-modules/pytest-remotedata { }; From 8ffb2a668524bf8caad5ad47b6e4f588964114a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Tue, 4 May 2021 00:35:34 -0300 Subject: [PATCH 023/213] python3Packages.uc-micro-py: init at 1.0.1 --- .../python-modules/uc-micro-py/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/uc-micro-py/default.nix diff --git a/pkgs/development/python-modules/uc-micro-py/default.nix b/pkgs/development/python-modules/uc-micro-py/default.nix new file mode 100644 index 00000000000..9b20e225116 --- /dev/null +++ b/pkgs/development/python-modules/uc-micro-py/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "uc-micro-py"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "tsutsu3"; + repo = "uc.micro-py"; + rev = "v${version}"; + hash = "sha256-23mKwoRGjtxpCOC26V8bAN5QEHLDOoSqPeTlUuIrxZ0="; + }; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "uc_micro" ]; + + meta = with lib; { + description = "Micro subset of unicode data files for linkify-it-py"; + homepage = "https://github.com/tsutsu3/uc.micro-py"; + license = licenses.mit; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d5fe7e62271..fde3a4b721d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8302,6 +8302,8 @@ in { uarray = callPackage ../development/python-modules/uarray { }; + uc-micro-py = callPackage ../development/python-modules/uc-micro-py { }; + ueberzug = callPackage ../development/python-modules/ueberzug { inherit (pkgs.xorg) libX11 libXext; }; From 8b94f860442297eafeab81f49df2ac0db6243712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Tue, 4 May 2021 00:35:58 -0300 Subject: [PATCH 024/213] python3Packages.linkify-it-py: init at 1.0.1 --- .../python-modules/linkify-it-py/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/linkify-it-py/default.nix diff --git a/pkgs/development/python-modules/linkify-it-py/default.nix b/pkgs/development/python-modules/linkify-it-py/default.nix new file mode 100644 index 00000000000..b9511bd5f35 --- /dev/null +++ b/pkgs/development/python-modules/linkify-it-py/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, uc-micro-py +}: + +buildPythonPackage rec { + pname = "linkify-it-py"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "tsutsu3"; + repo = pname; + rev = "v${version}"; + hash = "sha256-gd51no6VqvIiW9fbCdp30zHG/us6by7FLHV2ul/XJAM="; + }; + + propagatedBuildInputs = [ uc-micro-py ]; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "linkify_it" ]; + + meta = with lib; { + description = "Links recognition library with full unicode support"; + homepage = "https://github.com/tsutsu3/linkify-it-py"; + license = licenses.mit; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fde3a4b721d..baec06f5553 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3888,6 +3888,8 @@ in { line_profiler = callPackage ../development/python-modules/line_profiler { }; + linkify-it-py = callPackage ../development/python-modules/linkify-it-py { }; + linode-api = callPackage ../development/python-modules/linode-api { }; linode = callPackage ../development/python-modules/linode { }; From 66534789b05ac076c68c09a2b6b2e839c654a758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Tue, 4 May 2021 00:36:24 -0300 Subject: [PATCH 025/213] python3Packages.markdown-it-py: 0.6.2 -> 1.0.0 --- .../python-modules/markdown-it-py/default.nix | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index c7a8a3e17f3..322c4ac533d 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -1,41 +1,36 @@ { lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, pythonOlder , attrs -, coverage +, linkify-it-py , psutil , pytest-benchmark +, pytest-regressions +, typing-extensions }: buildPythonPackage rec { pname = "markdown-it-py"; - version = "0.6.2"; + version = "1.0.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "executablebooks"; - repo = "markdown-it-py"; + repo = pname; rev = "v${version}"; - sha256 = "1g9p8pdnvjya436lii63r5gjajhmbhmyh9ngbjqf9dqny05nagz1"; + hash = "sha256-GA7P2I8N+i2ISsVgx58zyhrfKMcZ7pL4X9T/trbsr1Y="; }; - propagatedBuildInputs = [ attrs ]; + propagatedBuildInputs = [ attrs linkify-it-py ] + ++ lib.optional (pythonOlder "3.8") typing-extensions; checkInputs = [ - coverage - pytest-benchmark psutil + pytest-benchmark + pytest-regressions pytestCheckHook ]; - - disabledTests = [ - # Requires the unpackaged pytest-regressions fixture plugin - "test_amsmath" - "test_container" - "test_deflist" - "test_dollarmath" - "test_spec" - "test_texmath" - ]; + pytestImportsCheck = [ "markdown_it" ]; meta = with lib; { description = "Markdown parser done right"; From 11c3036bfffe0c5d10f6209eba732e8a8a6d14a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Tue, 4 May 2021 00:36:50 -0300 Subject: [PATCH 026/213] python3Packages.mdit-py-plugins: init at 0.2.8 --- .../mdit-py-plugins/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/mdit-py-plugins/default.nix diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix new file mode 100644 index 00000000000..9c5705dbc40 --- /dev/null +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, markdown-it-py +, pytest-regressions +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mdit-py-plugins"; + version = "0.2.8"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = pname; + rev = "v${version}"; + hash = "sha256-MXQjaVDuguGbmby6BQnrTdpq6Mih3HabXuyFxf9jB18="; + }; + + propagatedBuildInputs = [ markdown-it-py ]; + + checkInputs = [ pytestCheckHook pytest-regressions ]; + pythonImportsCheck = [ "mdit_py_plugins" ]; + + meta = with lib; { + description = "Collection of core plugins for markdown-it-py"; + homepage = "https://github.com/executablebooks/mdit-py-plugins"; + license = licenses.mit; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index baec06f5553..4e8e0310b24 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4110,6 +4110,8 @@ in { md2gemini = callPackage ../development/python-modules/md2gemini { }; + mdit-py-plugins = callPackage ../development/python-modules/mdit-py-plugins { }; + MDP = callPackage ../development/python-modules/mdp { }; measurement = callPackage ../development/python-modules/measurement { }; From e6d1079b9b9901865e5730127698fd29c6668fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Mon, 3 May 2021 23:45:54 -0300 Subject: [PATCH 027/213] python3Packages.jupytext: 1.11.0 -> 1.11.2 --- .../python-modules/jupytext/default.nix | 43 ++++++++++++------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index eedfcfbcb6e..e3de451cfe1 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -1,39 +1,52 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, GitPython +, jupyter-packaging +, jupyter_client +, jupyterlab , markdown-it-py +, mdit-py-plugins , nbformat -, pytest +, notebook +, pytestCheckHook , pyyaml , toml }: buildPythonPackage rec { pname = "jupytext"; - version = "1.11.0"; + version = "1.11.2"; + format = "pyproject"; - disabled = isPy27; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "9062d001baaa32430fbb94a2c9394ac906db0a58da94e7aa4e414b73fd7d51bc"; + src = fetchFromGitHub { + owner = "mwouts"; + repo = pname; + rev = "v${version}"; + hash = "sha256-S2SKAC2oT4VIVMMDbu/Puo87noAgnQs1hh88JphutA8="; }; + buildInputs = [ jupyter-packaging jupyterlab ]; propagatedBuildInputs = [ markdown-it-py + mdit-py-plugins nbformat pyyaml toml ]; checkInputs = [ - pytest + pytestCheckHook + GitPython + jupyter_client + notebook ]; - - # requires test notebooks which are not shipped with the pypi release - # also, pypi no longer includes tests - doCheck = false; - checkPhase = '' - pytest - ''; + # pre-commit tests require a Git repository. + pytestFlagsArray = [ "--ignore-glob='tests/test_pre_commit_*.py'" ]; + pythonImportsCheck = [ "jupytext" "jupytext.cli" ]; meta = with lib; { description = "Jupyter notebooks as Markdown documents, Julia, Python or R scripts"; From cfdeaa13f23d8a2c52deff4ca876586724f534c1 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 7 May 2021 22:37:14 +0200 Subject: [PATCH 028/213] maintainers/scripts/haskell/update-stackage.sh: Fix wrong variable --- maintainers/scripts/haskell/update-stackage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index 3d51ddc4338..db336bf12da 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -59,7 +59,7 @@ sed -r \ < "${tmpfile}.new" >> $stackage_config if [[ "${1:-}" == "--do-commit" ]]; then -git add $config_file +git add $stackage_config git commit -F - << EOF Stackage Nightly: $old_version -> $version From f995974b7160007128a6e5cc81cf73f56468a5c0 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 7 May 2021 22:41:27 +0200 Subject: [PATCH 029/213] Stackage Nightly: 2021-05-03 -> 2021-05-07 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 460bfe28b61..cdae5528cc2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,5 +1,7 @@ +# Stackage Nightly 2021-05-07 +# This file is auto-generated by +# maintainers/scripts/haskell/update-stackage.sh default-package-overrides: - # Stackage Nightly 2021-05-03 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -479,7 +481,7 @@ default-package-overrides: - convertible ==1.1.1.0 - cookie ==0.4.5 - core-data ==0.2.1.9 - - core-program ==0.2.6.0 + - core-program ==0.2.7.1 - core-text ==0.3.0.0 - countable ==1.0 - country ==0.2.1 @@ -882,7 +884,7 @@ default-package-overrides: - ghc-byteorder ==4.11.0.0.10 - ghc-check ==0.5.0.4 - ghc-core ==0.5.6 - - ghc-events ==0.16.0 + - ghc-events ==0.17.0 - ghc-exactprint ==0.6.4 - ghcid ==0.8.7 - ghci-hexcalc ==0.1.1.0 @@ -1104,7 +1106,7 @@ default-package-overrides: - hspec-expectations-json ==1.0.0.3 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.5 - - hspec-golden ==0.1.0.3 + - hspec-golden ==0.2.0.0 - hspec-golden-aeson ==0.7.0.0 - hspec-hedgehog ==0.0.1.2 - hspec-junit-formatter ==1.0.0.2 @@ -1260,13 +1262,13 @@ default-package-overrides: - io-streams ==1.5.2.0 - io-streams-haproxy ==1.0.1.0 - ip6addr ==1.0.2 - - ipa ==0.3 + - ipa ==0.3.1 - iproute ==1.7.11 - IPv6Addr ==2.0.2 - ipynb ==0.1.0.1 - ipython-kernel ==0.10.2.1 - irc ==0.6.1.0 - - irc-client ==1.1.2.0 + - irc-client ==1.1.2.1 - irc-conduit ==0.3.0.4 - irc-ctcp ==0.1.3.0 - isbn ==1.1.0.2 @@ -1328,7 +1330,7 @@ default-package-overrides: - language-bash ==0.9.2 - language-c ==0.8.3 - language-c-quote ==0.13 - - language-docker ==9.3.0 + - language-docker ==10.0.0 - language-java ==0.2.9 - language-javascript ==0.7.1.0 - language-protobuf ==1.0.1 @@ -1687,7 +1689,7 @@ default-package-overrides: - pagure-cli ==0.2 - pandoc ==2.13 - pandoc-dhall-decoder ==0.1.0.1 - - pandoc-plot ==1.1.1 + - pandoc-plot ==1.2.0 - pandoc-throw ==0.1.0.0 - pandoc-types ==1.22 - pantry ==0.5.1.5 @@ -2177,6 +2179,7 @@ default-package-overrides: - splint ==1.0.1.4 - split ==0.2.3.4 - splitmix ==0.1.0.3 + - splitmix-distributions ==0.7.0.0 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - sqlcli ==0.2.2.0 @@ -2506,8 +2509,8 @@ default-package-overrides: - utf8-string ==1.0.2 - util ==0.1.17.1 - utility-ht ==0.0.16 - - uuid ==1.3.14 - - uuid-types ==1.0.4 + - uuid ==1.3.15 + - uuid-types ==1.0.5 - validation ==1.1.1 - validation-selective ==0.1.0.1 - validity ==0.11.0.0 From 000a0985f19e697a0d6a7739d08925f8d0d4ba04 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 7 May 2021 22:41:41 +0200 Subject: [PATCH 030/213] all-cabal-hashes: 2021-05-03T20:39:01Z -> 2021-05-07T19:29:19Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 8370470ee17..5b720404385 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "95e79fb1492c7f34c2454dcb783ac8b46c0f5c8c", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/95e79fb1492c7f34c2454dcb783ac8b46c0f5c8c.tar.gz", - "sha256": "1wp7m8j6z2j6h8z14cnzg223jmkcgpsafraxiirbih3h4wqq2nhr", - "msg": "Update from Hackage at 2021-05-03T20:39:01Z" + "commit": "3d54acea35f6f709fa96c87696b845b3044dcab5", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3d54acea35f6f709fa96c87696b845b3044dcab5.tar.gz", + "sha256": "1zlkjs9d8r5k803wbsz5fmsrs76150chcnz2jaapmq32riyvm21g", + "msg": "Update from Hackage at 2021-05-07T19:29:19Z" } From 76d2dc403e2ecb708feb5606b0c0b603766e7f64 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 7 May 2021 23:53:34 +0200 Subject: [PATCH 031/213] hackage2nix configuration: remove duplicate entries --- .../haskell-modules/configuration-hackage2nix/main.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index edc4fa3ac56..b7076b0ac3f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -259,7 +259,6 @@ unsupported-platforms: gnome-keyring: [ x86_64-darwin ] gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] gtk-sni-tray: [ x86_64-darwin ] - gtk-sni-tray: [ x86_64-darwin ] haskell-snake: [ x86_64-darwin ] hcwiid: [ x86_64-darwin ] HFuse: [ x86_64-darwin ] @@ -269,7 +268,6 @@ unsupported-platforms: iwlib: [ x86_64-darwin ] libmodbus: [ x86_64-darwin ] libsystemd-journal: [ x86_64-darwin ] - libsystemd-journal: [ x86_64-darwin ] libtelnet: [ x86_64-darwin ] libzfs: [ x86_64-darwin ] linearEqSolver: [ aarch64-linux ] @@ -302,8 +300,7 @@ unsupported-platforms: udev: [ x86_64-darwin ] vrpn: [ x86_64-darwin ] vulkan: [ i686-linux, armv7l-linux, x86_64-darwin ] - VulkanMemoryAllocator: [ i686-linux, armv7l-linux ] - VulkanMemoryAllocator: [ x86_64-darwin ] + VulkanMemoryAllocator: [ i686-linux, armv7l-linux, x86_64-darwin ] vulkan-utils: [ x86_64-darwin ] webkit2gtk3-javascriptcore: [ x86_64-darwin ] Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] From 6b43d3d8f62266a6d0d8fc71e8b0259877439b8f Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 7 May 2021 23:56:19 +0200 Subject: [PATCH 032/213] haskellPackages.haskell-language-server: Fix build --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- .../haskell-modules/configuration-hackage2nix/main.yaml | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f84e4d04873..a84c34df7b0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1452,7 +1452,7 @@ self: super: { }); # 2021-03-09: Overrides because nightly is to old for hls 1.0.0 - lsp-test = doDistribute (dontCheck self.lsp-test_0_13_0_0); + lsp-test = doDistribute (dontCheck self.lsp-test_0_14_0_0); # 2021-03-21 Test hangs # https://github.com/haskell/haskell-language-server/issues/1562 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index b7076b0ac3f..fe22ee7ea6d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -77,13 +77,6 @@ default-package-overrides: - gi-javascriptcore < 4.0.23 # - gi-soup < 2.4.24 # - gi-webkit2 < 4.0.27 # - # To stay hls 1.0 compatible - - ghcide < 1.1 - - hls-retrie-plugin < 1.0.0.1 - - lsp < 1.2 - - lsp-types < 1.2 - - hls-plugin-api < 1.1.0.0 - - hls-explicit-imports-plugin < 1.0.0.1 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. @@ -102,7 +95,6 @@ extra-packages: - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hlint < 3.3 # We don‘t have ghc-lib-parser 9.0.X yet. - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 - - lsp-test < 0.14 # needed for hls 1.0.0 - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - optparse-applicative < 0.16 # needed for niv-0.2.19 From 6c424a7e4191dead420bd7bf18bda524f8f98312 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 7 May 2021 23:57:07 +0200 Subject: [PATCH 033/213] hackage-packages.nix: Regenerate based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 1291 +++++++++-------- 1 file changed, 725 insertions(+), 566 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 86afed3a600..d06922f0534 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -20954,9 +20954,7 @@ self: { ]; description = "Bindings to the VulkanMemoryAllocator library"; license = lib.licenses.bsd3; - platforms = [ - "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" - ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; }) {}; "WAVE" = callPackage @@ -25718,20 +25716,20 @@ self: { "agda-unused" = callPackage ({ mkDerivation, aeson, Agda, base, containers, directory, filepath - , hspec, megaparsec, mtl, optparse-applicative, text + , hspec, mtl, optparse-applicative, text }: mkDerivation { pname = "agda-unused"; - version = "0.1.0"; - sha256 = "1g0iyv9x46ql8j9ggb6nw58274vqb6z850x26glaqcdwa3wvn1i1"; + version = "0.2.0"; + sha256 = "0fxrmcc0kn3jyjbij2fv72pw0r1l2rvg8wglj1i8d438jqpffigw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - Agda base containers directory filepath megaparsec mtl text + Agda base containers directory filepath mtl text ]; executableHaskellDepends = [ - aeson base directory filepath mtl optparse-applicative text + aeson base directory mtl optparse-applicative text ]; testHaskellDepends = [ base containers filepath hspec text ]; description = "Check for unused code in an Agda project"; @@ -33168,16 +33166,14 @@ self: { "armor" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, hspec, HUnit, lens, text + , filepath, hashable, hspec, HUnit, lens, text }: mkDerivation { pname = "armor"; - version = "0.1"; - sha256 = "0jmq6lhi1byhjzgkvnn4p481z8wik93angx7sf6cjfj5j0kqzv71"; - revision = "4"; - editedCabalFile = "1vnjq91pawr4r7parg2kxs01d47b3lp8jpsji270bbmimqa0nql9"; + version = "0.2"; + sha256 = "1flidqihfgb1vwikm3q4dyjdjzrc5z2955ph6h30q0dyv4707s94"; libraryHaskellDepends = [ - base bytestring containers directory filepath HUnit lens + base bytestring containers directory filepath hashable HUnit lens ]; testHaskellDepends = [ aeson base bytestring containers directory hspec HUnit lens text @@ -47539,6 +47535,17 @@ self: { broken = true; }) {}; + "bv-sized-lens" = callPackage + ({ mkDerivation, base, bv-sized, lens, parameterized-utils }: + mkDerivation { + pname = "bv-sized-lens"; + version = "0.1.0.0"; + sha256 = "1njwizsxpmlpb3vm460ciw2x7byfz4y0g8bhsnfiimmyn7yazdr6"; + libraryHaskellDepends = [ base bv-sized lens parameterized-utils ]; + description = "Well-typed lenses for bv-sized bitvectors"; + license = lib.licenses.bsd3; + }) {}; + "byline" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, colour , exceptions, free, haskeline, mtl, optparse-applicative, relude @@ -48415,6 +48422,17 @@ self: { broken = true; }) {}; + "c-enum" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "c-enum"; + version = "0.1.0.0"; + sha256 = "02jxhscf8ibzqkhyvsgb04wxl3a02n2qipi3gmdppi6jffk2a1sj"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base template-haskell ]; + license = lib.licenses.bsd3; + }) {}; + "c-io" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -50470,8 +50488,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.28.5"; - sha256 = "09ja2imqhz7kr97fhfskj1g7s7q88yrpa0p2s1n55fwkn1f2d3bs"; + version = "0.1.29.0"; + sha256 = "05i8364x6d5kh4vimg8xp5cwskbzayk71kb6r4gg95xdi6vhgnjx"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core @@ -50494,8 +50512,8 @@ self: { }: mkDerivation { pname = "calamity-commands"; - version = "0.1.0.0"; - sha256 = "0l2x65w7inib5bdfw0gzffm3pdlsylnivnjc8y82x7fi6jha8jcp"; + version = "0.1.1.0"; + sha256 = "0sx0pcxh9f7r4nlhii5i3vwxpbhngzprp4h3yvp2xvkr8mp6pyk2"; libraryHaskellDepends = [ base generic-lens lens megaparsec polysemy polysemy-plugin text text-show unordered-containers @@ -54261,27 +54279,38 @@ self: { }) {}; "chiasma" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, directory - , either, filepath, free, HTF, lens, mtl, parsec, posix-pty - , process, resourcet, split, transformers, typed-process, unix - , unliftio + ({ mkDerivation, aeson, attoparsec, base, bytestring, composition + , composition-extra, conduit, conduit-extra, containers, cornea + , data-default, deepseq, directory, either, exceptions, filepath + , free, hedgehog, lens, mtl, parsec, parsers, posix-pty + , prettyprinter, prettyprinter-ansi-terminal, process, random + , relude, resourcet, split, stm-chans, stm-conduit, tasty + , tasty-hedgehog, text, transformers, typed-process, unix, unliftio + , unliftio-core, uuid }: mkDerivation { pname = "chiasma"; - version = "0.1.0.0"; - sha256 = "140p3qrrdh3im5qj43swl9cvljgyc39zy7ci5048j42h8x9q7glg"; + version = "0.2.0.0"; + sha256 = "11pbg9mlmp15hs2wdca0qyhbc94d91xkl75jlcaksla8l1qnnz9m"; libraryHaskellDepends = [ - base bytestring data-default-class directory either filepath free - lens mtl parsec posix-pty process resourcet split transformers - typed-process unix unliftio + aeson attoparsec base bytestring composition composition-extra + conduit conduit-extra containers cornea data-default deepseq + directory either exceptions filepath free lens mtl parsec parsers + posix-pty prettyprinter prettyprinter-ansi-terminal process random + relude resourcet split stm-chans stm-conduit text transformers + typed-process unix unliftio unliftio-core uuid ]; testHaskellDepends = [ - base bytestring data-default-class directory either filepath free - HTF lens mtl parsec posix-pty process resourcet split transformers - typed-process unix unliftio + aeson attoparsec base bytestring composition composition-extra + conduit conduit-extra containers cornea data-default deepseq + directory either exceptions filepath free hedgehog lens mtl parsec + parsers posix-pty prettyprinter prettyprinter-ansi-terminal process + random relude resourcet split stm-chans stm-conduit tasty + tasty-hedgehog text transformers typed-process unix unliftio + unliftio-core uuid ]; description = "tmux api"; - license = lib.licenses.mit; + license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58185,8 +58214,8 @@ self: { }: mkDerivation { pname = "code-conjure"; - version = "0.1.2"; - sha256 = "14xgpax596wd66kan1nj043n9f4wwn34rr77hgj6wir9aygx9sla"; + version = "0.2.2"; + sha256 = "1rf9d6mwg965r4bnjxbcw2dzcf4fxqn9hnysxzyqxnyhrr8q4149"; libraryHaskellDepends = [ base express leancheck speculate template-haskell ]; @@ -64519,8 +64548,8 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.2.6.0"; - sha256 = "1qyl7kcdqxfl2inx66n7pa1z2pqjxrz1bpg3jjknjj0kpw9rlhf3"; + version = "0.2.7.1"; + sha256 = "1bm75bdmcrjizmrspl52qqs4vq9hlyh7fjv5y5lfpkmqrs45045b"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-text directory exceptions filepath fsnotify hashable hourglass mtl prettyprinter @@ -64616,25 +64645,24 @@ self: { }) {inherit (pkgs) rocksdb;}; "cornea" = callPackage - ({ mkDerivation, base-noprelude, either, HTF, lens, lifted-base - , monad-control, mtl, relude, template-haskell, th-abstraction - , transformers + ({ mkDerivation, base, either, hedgehog, lens, lifted-base + , monad-control, mtl, relude, tasty, tasty-hedgehog + , template-haskell, th-abstraction, transformers }: mkDerivation { pname = "cornea"; - version = "0.3.1.2"; - sha256 = "04iika5r5w3347w87b8whwrxym5nzvgl5pr76fpxw78fwvi1nvzk"; + version = "0.4.0.0"; + sha256 = "0hm17g350gnklvgi5nsx03lgbx2zs9h4q11y2gi9zjnm6gv6gjrn"; libraryHaskellDepends = [ - base-noprelude either lens lifted-base monad-control mtl relude + base either lens lifted-base monad-control mtl relude template-haskell th-abstraction transformers ]; testHaskellDepends = [ - base-noprelude either HTF lens lifted-base monad-control mtl relude - template-haskell th-abstraction transformers + base either hedgehog lens lifted-base monad-control mtl relude + tasty tasty-hedgehog template-haskell th-abstraction transformers ]; description = "classy optical monadic state"; - license = "unknown"; - hydraPlatforms = lib.platforms.none; + license = "BSD-2-Clause-Patent"; }) {}; "coroutine-enumerator" = callPackage @@ -78301,6 +78329,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "do-spaces" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring + , case-insensitive, conduit, conduit-extra, config-ini, containers + , cryptonite, exceptions, extra, filepath, generic-lens, hspec + , http-client-tls, http-conduit, http-types, memory, microlens + , mime-types, mtl, resourcet, text, time, transformers, xml-conduit + }: + mkDerivation { + pname = "do-spaces"; + version = "0.1.0"; + sha256 = "1xj0n2pmmwkm4ss5gvsbvw8m545w4890a3hhk1ns1vbbm06zmvsi"; + libraryHaskellDepends = [ + base base16-bytestring bytestring case-insensitive conduit + conduit-extra config-ini containers cryptonite exceptions extra + filepath generic-lens http-client-tls http-conduit http-types + memory microlens mime-types mtl text time transformers xml-conduit + ]; + testHaskellDepends = [ + base bytestring case-insensitive conduit conduit-extra containers + generic-lens hspec http-client-tls http-conduit http-types + microlens mtl resourcet text time + ]; + description = "DigitalOcean Spaces API bindings"; + license = lib.licenses.bsd3; + }) {}; + "dobutok" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -85923,6 +85977,8 @@ self: { pname = "esqueleto"; version = "3.4.1.1"; sha256 = "15355vc3ysqr4yd149xz7zm7iba7pb04p3yxgp1n6dxczwldjf43"; + revision = "1"; + editedCabalFile = "0rwj2cg7pkn4nwapyk9syb64f0qycq7kqwbpciwwq9xdviwcvqzk"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -85939,7 +85995,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "esqueleto_3_4_2_0" = callPackage + "esqueleto_3_4_2_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql , mysql-simple, persistent, persistent-mysql, persistent-postgresql @@ -85949,8 +86005,10 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.4.2.0"; - sha256 = "1gmh96a0vqvxizgs2k66p06jhjcgqrm5phbvahs7b2iavaralpr3"; + version = "3.4.2.1"; + sha256 = "0yh2fgk5rjphszn2prww190nsvw84j68js7wnd6p5iwynrw6ahxh"; + revision = "1"; + editedCabalFile = "0nsm17spkhsykizmpr29x8zq16ha6j0325r08ms675jn574ni2g1"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -89100,17 +89158,17 @@ self: { }) {}; "fake" = callPackage - ({ mkDerivation, base, containers, generics-sop, hspec, random - , text, time + ({ mkDerivation, base, containers, generics-sop, hspec, lens + , random, text, time }: mkDerivation { pname = "fake"; - version = "0.1.1.3"; - sha256 = "07ciaxbfvhajjdj5sidvy9cxpjfssjkxykrbgnghihrla78pwq1n"; + version = "0.1.2"; + sha256 = "03v224sag70w1ibymw1cmi3lwby25wl0254p2gzy7s330fmlbymr"; libraryHaskellDepends = [ base containers generics-sop random text time ]; - testHaskellDepends = [ base hspec random text time ]; + testHaskellDepends = [ base hspec lens random text time ]; description = "Randomly generated fake data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -101623,8 +101681,8 @@ self: { }: mkDerivation { pname = "ghc-events"; - version = "0.16.0"; - sha256 = "0cr6aj4v9j2fadwhhifjlbg4anyc05phfmy3pvd9h7gn12a2ydr9"; + version = "0.17.0"; + sha256 = "059csl9j391iqbxaia9kawsksgbiy3ffdk9pqabb68gqrn0b7icc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102874,69 +102932,6 @@ self: { }) {}; "ghcide" = callPackage - ({ mkDerivation, aeson, array, async, base, base16-bytestring - , binary, bytestring, bytestring-encoding, case-insensitive - , containers, cryptohash-sha1, data-default, deepseq, dependent-map - , dependent-sum, Diff, directory, dlist, extra, filepath - , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check - , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob - , haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb - , hls-plugin-api, hp2pretty, hslogger, implicit-hie - , implicit-hie-cradle, lens, lsp, lsp-test, lsp-types, mtl - , network-uri, opentelemetry, optparse-applicative, parallel - , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck - , quickcheck-instances, record-dot-preprocessor, record-hasfield - , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions - , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , tasty-rerun, text, time, transformers, unix, unliftio - , unliftio-core, unordered-containers, utf8-string, vector, yaml - }: - mkDerivation { - pname = "ghcide"; - version = "1.0.0.0"; - sha256 = "15hz49d68229bnp8g7q1ac60ryd4zbyc1rbxsfaq5lb586ps82k8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array async base base16-bytestring binary bytestring - bytestring-encoding case-insensitive containers cryptohash-sha1 - data-default deepseq dependent-map dependent-sum Diff directory - dlist extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th - ghc-check ghc-exactprint ghc-paths Glob haddock-library hashable - heapsize hie-bios hie-compat hiedb hls-plugin-api hslogger - implicit-hie-cradle lens lsp lsp-types mtl network-uri - opentelemetry parallel prettyprinter prettyprinter-ansi-terminal - regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake - sorted-list sqlite-simple stm syb text time transformers unix - unliftio unliftio-core unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ - aeson base bytestring containers data-default directory extra - filepath ghc gitrev hashable heapsize hie-bios hiedb hls-plugin-api - lens lsp lsp-test lsp-types optparse-applicative process - safe-exceptions shake text unordered-containers - ]; - testHaskellDepends = [ - aeson base binary bytestring containers data-default directory - extra filepath ghc ghc-typelits-knownnat haddock-library - hls-plugin-api lens lsp lsp-test lsp-types network-uri - optparse-applicative process QuickCheck quickcheck-instances - record-dot-preprocessor record-hasfield rope-utf16-splay safe - safe-exceptions shake tasty tasty-expected-failure tasty-hunit - tasty-quickcheck tasty-rerun text - ]; - testToolDepends = [ implicit-hie ]; - benchmarkHaskellDepends = [ - aeson base directory extra filepath optparse-applicative shake - shake-bench text yaml - ]; - benchmarkToolDepends = [ hp2pretty implicit-hie ]; - description = "The core of an IDE"; - license = lib.licenses.asl20; - }) {}; - - "ghcide_1_2_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, binary, bytestring, bytestring-encoding , case-insensitive, containers, cryptohash-sha1, data-default @@ -103000,7 +102995,6 @@ self: { benchmarkToolDepends = [ hp2pretty implicit-hie ]; description = "The core of an IDE"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ghcjs-ajax" = callPackage @@ -115502,8 +115496,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "2.3.0"; - sha256 = "03cz3inkkqbdnwwvsf7dhclp9svi8c0lpjmcp81ff9vxr1v6x73x"; + version = "2.4.0"; + sha256 = "1b24hc695v18gpj276wmzpbns6bfn0qjhj30nq6yiqbiq04md1h5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115675,8 +115669,8 @@ self: { }: mkDerivation { pname = "haggle"; - version = "0.1.0.0"; - sha256 = "0fpbmllp0p23c258gam7xm0dvwphw0zpmydmg9ygl4yl1kiav470"; + version = "0.1.0.1"; + sha256 = "1j598hcjw0p9iac4h91w47k4rh9k0h2r9gk3rrfkklvw84aznkrz"; libraryHaskellDepends = [ base containers deepseq hashable monad-primitive primitive ref-tf vector @@ -118533,8 +118527,8 @@ self: { }: mkDerivation { pname = "hascard"; - version = "0.5.0.1"; - sha256 = "08j3bi6a04pkkf99ghw2h7z1bdisby0d3hyqv559a1pxwpbi7k22"; + version = "0.5.0.2"; + sha256 = "1sh4903x05fwci7nmlqd0f2wjjs5b9bqckmgrkjpnawcnsbby1ds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120074,53 +120068,49 @@ self: { }) {}; "haskell-language-server" = callPackage - ({ mkDerivation, aeson, async, base, base16-bytestring, binary - , blaze-markup, brittany, bytestring, containers, cryptohash-sha1 - , data-default, deepseq, directory, extra, filepath, floskell - , fourmolu, fuzzy, ghc, ghc-boot-th, ghc-paths, ghcide, gitrev - , hashable, hie-bios, hiedb, hls-class-plugin, hls-eval-plugin - , hls-explicit-imports-plugin, hls-haddock-comments-plugin - , hls-hlint-plugin, hls-plugin-api, hls-retrie-plugin - , hls-splice-plugin, hls-tactics-plugin, hslogger, hspec - , hspec-core, hspec-expectations, lens, lsp, lsp-test, megaparsec - , mtl, optparse-applicative, optparse-simple, ormolu, process - , regex-tdfa, safe-exceptions, shake, sqlite-simple, stm - , stylish-haskell, tasty, tasty-ant-xml, tasty-expected-failure - , tasty-golden, tasty-hunit, tasty-rerun, temporary, text - , transformers, unordered-containers, with-utf8, yaml + ({ mkDerivation, aeson, aeson-pretty, async, base + , base16-bytestring, binary, bytestring, containers + , cryptohash-sha1, data-default, deepseq, directory, extra + , filepath, floskell, fourmolu, fuzzy, ghc, ghc-boot-th, ghc-paths + , ghcide, gitrev, hashable, hie-bios, hiedb, hls-brittany-plugin + , hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin + , hls-haddock-comments-plugin, hls-hlint-plugin, hls-plugin-api + , hls-retrie-plugin, hls-splice-plugin, hls-stylish-haskell-plugin + , hls-tactics-plugin, hls-test-utils, hslogger, hspec-expectations + , lens, lsp, lsp-test, lsp-types, mtl, optparse-applicative + , optparse-simple, ormolu, process, regex-tdfa, safe-exceptions + , shake, sqlite-simple, temporary, text, transformers + , unordered-containers }: mkDerivation { pname = "haskell-language-server"; - version = "1.0.0.0"; - sha256 = "0jchps7rwsbfq1fsyyf4jgxb4b11d8c3iaq2p4c5vz7vz2d6w1s3"; + version = "1.1.0.0"; + sha256 = "0zbr8qr097mjcsbgdkm6a8ala1ifdajmllr8basvrndn28zgi5cg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base base16-bytestring bytestring containers cryptohash-sha1 - data-default directory extra filepath ghc ghcide gitrev hie-bios - hiedb hls-plugin-api hslogger lsp optparse-applicative - optparse-simple process safe-exceptions shake sqlite-simple text - unordered-containers + aeson-pretty async base base16-bytestring bytestring containers + cryptohash-sha1 data-default directory extra filepath ghc ghcide + gitrev hie-bios hiedb hls-plugin-api hslogger lsp + optparse-applicative optparse-simple process safe-exceptions shake + sqlite-simple text unordered-containers ]; executableHaskellDepends = [ - aeson async base base16-bytestring binary brittany bytestring - containers cryptohash-sha1 data-default deepseq directory extra - filepath floskell fourmolu fuzzy ghc ghc-boot-th ghc-paths ghcide - gitrev hashable hie-bios hiedb hls-class-plugin hls-eval-plugin - hls-explicit-imports-plugin hls-haddock-comments-plugin - hls-hlint-plugin hls-plugin-api hls-retrie-plugin hls-splice-plugin + aeson async base base16-bytestring binary bytestring containers + cryptohash-sha1 data-default deepseq directory extra filepath + floskell fourmolu fuzzy ghc ghc-boot-th ghc-paths ghcide gitrev + hashable hie-bios hiedb hls-brittany-plugin hls-class-plugin + hls-eval-plugin hls-explicit-imports-plugin + hls-haddock-comments-plugin hls-hlint-plugin hls-plugin-api + hls-retrie-plugin hls-splice-plugin hls-stylish-haskell-plugin hls-tactics-plugin hslogger lens lsp mtl optparse-applicative optparse-simple ormolu process regex-tdfa safe-exceptions shake - sqlite-simple stylish-haskell temporary text transformers - unordered-containers with-utf8 + sqlite-simple temporary text transformers unordered-containers ]; testHaskellDepends = [ - aeson base blaze-markup bytestring containers data-default deepseq - directory extra filepath ghcide hie-bios hls-plugin-api hslogger - hspec hspec-core hspec-expectations lens lsp lsp-test megaparsec - process stm tasty tasty-ant-xml tasty-expected-failure tasty-golden - tasty-hunit tasty-rerun temporary text transformers - unordered-containers yaml + aeson base bytestring containers data-default directory extra + filepath ghcide hls-plugin-api hls-test-utils hspec-expectations + lens lsp-test lsp-types process text unordered-containers ]; testToolDepends = [ ghcide ]; description = "LSP server for GHC"; @@ -124763,29 +124753,31 @@ self: { "hcheckers" = callPackage ({ mkDerivation, aeson, array, base, binary, bits, bytes , bytestring, clock, concurrent-extra, containers, data-default - , directory, ekg, ekg-core, exceptions, fast-logger, filepath - , hashable, hashtables, heavy-logger, hsyslog, http-types - , megaparsec, microlens, monad-metrics, mtl, mwc-random, network - , optparse-applicative, psqueues, random, random-access-file - , random-shuffle, scotty, stm, stm-containers, store - , template-haskell, text, text-format-heavy, unix, unix-bytestring - , unordered-containers, vector, wai, warp, yaml + , directory, ekg, ekg-core, exceptions, fast-logger, filepath, Glob + , hashable, hashtables, heavy-logger, hsyslog, http-types, list-t + , megaparsec, microlens, modern-uri, monad-metrics, mtl, mwc-random + , network, optparse-applicative, psqueues, random + , random-access-file, random-shuffle, req, scotty, stm + , stm-containers, store, template-haskell, text, text-format-heavy + , unix, unix-bytestring, unordered-containers, vector, wai, warp + , yaml }: mkDerivation { pname = "hcheckers"; - version = "0.1.0.1"; - sha256 = "1l4cj7v4scnz5cq05294ym4gyv163ry09bpxp1vg1m1v88ww5i2w"; + version = "0.1.0.2"; + sha256 = "1v4hnqvi47kn10c1rjgsggxmajy7xnl462ghb2fs61ksbmrdi5b8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson array base binary bits bytes bytestring clock concurrent-extra containers data-default directory ekg ekg-core - exceptions fast-logger filepath hashable hashtables heavy-logger - hsyslog http-types megaparsec microlens monad-metrics mtl - mwc-random network optparse-applicative psqueues random - random-access-file random-shuffle scotty stm stm-containers store - template-haskell text text-format-heavy unix unix-bytestring - unordered-containers vector wai warp yaml + exceptions fast-logger filepath Glob hashable hashtables + heavy-logger hsyslog http-types list-t megaparsec microlens + modern-uri monad-metrics mtl mwc-random network + optparse-applicative psqueues random random-access-file + random-shuffle req scotty stm stm-containers store template-haskell + text text-format-heavy unix unix-bytestring unordered-containers + vector wai warp yaml ]; description = "Implementation of checkers (\"draughts\") board game - server application"; license = lib.licenses.bsd3; @@ -130655,6 +130647,26 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "hkgr_0_3" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, filepath + , simple-cabal, simple-cmd-args, typed-process, xdg-basedir + }: + mkDerivation { + pname = "hkgr"; + version = "0.3"; + sha256 = "1w8ww2dkskdfs0lh6wbn5byhnrf6mwih7n5yp81fr6awdc0k1qrm"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base bytestring directory extra filepath simple-cabal + simple-cmd-args typed-process xdg-basedir + ]; + description = "Simple Hackage release workflow for package maintainers"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "hkt" = callPackage ({ mkDerivation, base, hspec, inspection-testing, protolude, text }: @@ -131402,23 +131414,26 @@ self: { testHaskellDepends = [ base bytestring hls-test-utils text ]; description = "Integration with the Brittany code formatter"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {hls-test-utils = null;}; + }) {}; "hls-class-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, ghc, ghc-exactprint - , ghcide, hls-plugin-api, lens, lsp, shake, text, transformers + ({ mkDerivation, aeson, base, bytestring, containers, filepath, ghc + , ghc-exactprint, ghcide, hls-plugin-api, hls-test-utils, lens, lsp + , lsp-test, lsp-types, shake, text, transformers , unordered-containers }: mkDerivation { pname = "hls-class-plugin"; - version = "1.0.0.0"; - sha256 = "103rswyrbs35q6mmv19bnj4cp4r1n5mx6aazcabfakh1cix0fn60"; + version = "1.0.0.1"; + sha256 = "0s9pkdcgvfb9qhj9qjy6bygdyshanczcn9apq3qcw8yznl1zqilc"; libraryHaskellDepends = [ aeson base containers ghc ghc-exactprint ghcide hls-plugin-api lens lsp shake text transformers unordered-containers ]; + testHaskellDepends = [ + base bytestring filepath hls-test-utils lens lsp-test lsp-types + text + ]; description = "Class/instance management plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; @@ -131426,15 +131441,15 @@ self: { "hls-eval-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, Diff, directory , dlist, extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide - , hashable, hls-plugin-api, lens, lsp, lsp-types, megaparsec, mtl - , parser-combinators, pretty-simple, QuickCheck, safe-exceptions - , shake, temporary, text, time, transformers, unliftio - , unordered-containers + , hashable, hls-plugin-api, hls-test-utils, lens, lsp, lsp-test + , lsp-types, megaparsec, mtl, parser-combinators, pretty-simple + , QuickCheck, safe-exceptions, shake, temporary, text, time + , transformers, unliftio, unordered-containers }: mkDerivation { pname = "hls-eval-plugin"; - version = "1.0.0.0"; - sha256 = "0pslyhgvs6xrwijkyf4jdh873mnsb8iijmkbc9aq3dljdy080fdg"; + version = "1.1.0.0"; + sha256 = "138l49a8y0g7yk29xdjs0jv0xmz3y8lvig45g944spj3xi8snpfx"; libraryHaskellDepends = [ aeson base containers deepseq Diff directory dlist extra filepath ghc ghc-boot-th ghc-paths ghcide hashable hls-plugin-api lens lsp @@ -131442,6 +131457,10 @@ self: { QuickCheck safe-exceptions shake temporary text time transformers unliftio unordered-containers ]; + testHaskellDepends = [ + aeson base directory extra filepath hls-test-utils lens lsp-test + lsp-types text + ]; description = "Eval plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; @@ -131466,24 +131485,6 @@ self: { }) {}; "hls-explicit-imports-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide - , hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers - }: - mkDerivation { - pname = "hls-explicit-imports-plugin"; - version = "1.0.0.0"; - sha256 = "14j89l8pkxrffllg06fj6215xqdswrbndyv5xa22f0g00acmwi6w"; - revision = "1"; - editedCabalFile = "0gch9wkz1h4g06xc48jhvs06jji9d0npa2zrj2gv1cbf6hjs0s92"; - libraryHaskellDepends = [ - aeson base containers deepseq ghc ghcide hls-plugin-api lsp - lsp-types shake text unordered-containers - ]; - description = "Explicit imports plugin for Haskell Language Server"; - license = lib.licenses.asl20; - }) {}; - - "hls-explicit-imports-plugin_1_0_0_1" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide , hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers }: @@ -131497,21 +131498,24 @@ self: { ]; description = "Explicit imports plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hls-haddock-comments-plugin" = callPackage - ({ mkDerivation, base, containers, ghc, ghc-exactprint, ghcide - , hls-plugin-api, lsp-types, text, unordered-containers + ({ mkDerivation, base, bytestring, containers, filepath, ghc + , ghc-exactprint, ghcide, hls-plugin-api, hls-test-utils, lsp-types + , text, unordered-containers }: mkDerivation { pname = "hls-haddock-comments-plugin"; - version = "1.0.0.0"; - sha256 = "1azy3rrbdi465c65f603ycj14mz1cvc9h92rrf0b0frs90hs66r3"; + version = "1.0.0.1"; + sha256 = "1qny8y52myd3ic893wxapbqhfdcdbil8acky91lfcylr9141154i"; libraryHaskellDepends = [ base containers ghc ghc-exactprint ghcide hls-plugin-api lsp-types text unordered-containers ]; + testHaskellDepends = [ + base bytestring filepath hls-test-utils text + ]; description = "Haddock comments plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; @@ -131525,8 +131529,8 @@ self: { }: mkDerivation { pname = "hls-hlint-plugin"; - version = "1.0.0.1"; - sha256 = "0hnfh6x8l20nrj54hpkkq2yj8xkgw15xcba27hagapam2yxi1xga"; + version = "1.0.0.2"; + sha256 = "1qi654azf4l24sc7zaimbxm7z59xfvdvn33fsa5d8y7910w17d73"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default deepseq Diff directory extra filepath ghc ghc-exactprint ghcide @@ -131538,25 +131542,6 @@ self: { }) {}; "hls-plugin-api" = callPackage - ({ mkDerivation, aeson, base, containers, data-default - , dependent-map, dependent-sum, Diff, dlist, hashable, hslogger - , lens, lsp, opentelemetry, process, regex-tdfa, shake, text, unix - , unordered-containers - }: - mkDerivation { - pname = "hls-plugin-api"; - version = "1.0.0.0"; - sha256 = "03pj0irgf9p84jn5kfd4cfyqk4xyfdf9pfrwqhb0c1ipnm4l7wal"; - libraryHaskellDepends = [ - aeson base containers data-default dependent-map dependent-sum Diff - dlist hashable hslogger lens lsp opentelemetry process regex-tdfa - shake text unix unordered-containers - ]; - description = "Haskell Language Server API for plugin communication"; - license = lib.licenses.asl20; - }) {}; - - "hls-plugin-api_1_1_0_0" = callPackage ({ mkDerivation, aeson, base, containers, data-default , dependent-map, dependent-sum, Diff, dlist, hashable, hslogger , lens, lsp, opentelemetry, process, regex-tdfa, shake, text, unix @@ -131573,28 +131558,9 @@ self: { ]; description = "Haskell Language Server API for plugin communication"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hls-retrie-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, directory, extra - , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie - , safe-exceptions, shake, text, transformers, unordered-containers - }: - mkDerivation { - pname = "hls-retrie-plugin"; - version = "1.0.0.0"; - sha256 = "1m4r6nxbq1lvjkl6g1i0lbxdx4zimw6g478alnqv8n208q6fiw26"; - libraryHaskellDepends = [ - aeson base containers deepseq directory extra ghc ghcide hashable - hls-plugin-api lsp lsp-types retrie safe-exceptions shake text - transformers unordered-containers - ]; - description = "Retrie integration plugin for Haskell Language Server"; - license = lib.licenses.asl20; - }) {}; - - "hls-retrie-plugin_1_0_0_2" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, directory, extra , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie , safe-exceptions, shake, text, transformers, unordered-containers @@ -131610,64 +131576,99 @@ self: { ]; description = "Retrie integration plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hls-splice-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, dlist, extra, foldl, ghc - , ghc-exactprint, ghcide, hls-plugin-api, lens, lsp, retrie, shake - , syb, text, transformers, unliftio-core, unordered-containers + ({ mkDerivation, aeson, base, containers, directory, dlist, extra + , filepath, foldl, ghc, ghc-exactprint, ghcide, hls-plugin-api + , hls-test-utils, lens, lsp, retrie, shake, syb, text, transformers + , unliftio-core, unordered-containers }: mkDerivation { pname = "hls-splice-plugin"; - version = "1.0.0.0"; - sha256 = "1xm9ji64g89fn4b81gd5g0ijv88b2zhyn303hr3jxhydqpfcipjb"; + version = "1.0.0.1"; + sha256 = "0fyc2z1bh64plqf831f19nqkgkhryklgrrql2cn25jhfg55gf95q"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide hls-plugin-api lens lsp retrie shake syb text transformers unliftio-core unordered-containers ]; + testHaskellDepends = [ + base directory extra filepath hls-test-utils text + ]; description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes"; license = lib.licenses.asl20; }) {}; + "hls-stylish-haskell-plugin" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, ghc + , ghc-boot-th, ghcide, hls-plugin-api, hls-test-utils, lsp-types + , mtl, stylish-haskell, text + }: + mkDerivation { + pname = "hls-stylish-haskell-plugin"; + version = "1.0.0.0"; + sha256 = "1f2banm7lbl2grqrm0d9dnhk5fimxqan3xlsl4hjyqgy42xqqai2"; + libraryHaskellDepends = [ + base directory filepath ghc ghc-boot-th ghcide hls-plugin-api + lsp-types mtl stylish-haskell text + ]; + testHaskellDepends = [ base bytestring hls-test-utils text ]; + description = "Integration with the Stylish Haskell code formatter"; + license = lib.licenses.asl20; + }) {}; + "hls-tactics-plugin" = callPackage - ({ mkDerivation, aeson, base, bytestring, checkers, containers - , data-default, deepseq, directory, extra, filepath, fingertree - , generic-lens, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen - , ghcide, hie-bios, hls-plugin-api, hspec, hspec-discover - , hspec-expectations, lens, lsp, lsp-test, lsp-types, megaparsec - , mtl, QuickCheck, refinery, retrie, shake, syb, tasty - , tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit - , tasty-rerun, text, transformers + ({ mkDerivation, aeson, base, containers, deepseq, directory, extra + , filepath, fingertree, generic-lens, ghc, ghc-boot-th + , ghc-exactprint, ghc-source-gen, ghcide, hls-plugin-api + , hls-test-utils, hspec, hspec-discover, hspec-expectations, lens + , lsp, lsp-types, mtl, QuickCheck, refinery, retrie, shake, syb + , tasty-hspec, tasty-hunit, text, transformers + , unordered-containers }: mkDerivation { pname = "hls-tactics-plugin"; - version = "1.0.0.0"; - sha256 = "0cd6d3m3w1n7x22k5xndjl9r440s5nx6q2fg3wcmdsbd3s3pg1qa"; - isLibrary = true; - isExecutable = true; + version = "1.1.0.0"; + sha256 = "13qysl6dwrn15kn310r04g1yv7jj9xhar659lrc8h230c4khn2qv"; libraryHaskellDepends = [ aeson base containers deepseq directory extra filepath fingertree generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide hls-plugin-api lens lsp mtl refinery retrie shake syb text - transformers - ]; - executableHaskellDepends = [ - base data-default ghcide hls-plugin-api shake + transformers unordered-containers ]; testHaskellDepends = [ - aeson base bytestring checkers containers data-default deepseq - directory filepath ghc ghcide hie-bios hls-plugin-api hspec - hspec-expectations lens lsp-test lsp-types megaparsec mtl - QuickCheck tasty tasty-ant-xml tasty-expected-failure tasty-golden - tasty-hunit tasty-rerun text + aeson base containers deepseq directory filepath ghc ghcide + hls-plugin-api hls-test-utils hspec hspec-expectations lens + lsp-types mtl QuickCheck tasty-hspec tasty-hunit text ]; testToolDepends = [ hspec-discover ]; description = "Wingman plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; + "hls-test-utils" = callPackage + ({ mkDerivation, aeson, async, base, blaze-markup, bytestring + , containers, data-default, directory, extra, filepath, ghcide + , hls-plugin-api, hspec, hspec-core, lens, lsp, lsp-test, lsp-types + , shake, tasty, tasty-expected-failure, tasty-golden, tasty-hunit + , tasty-rerun, temporary, text, unordered-containers + }: + mkDerivation { + pname = "hls-test-utils"; + version = "1.0.0.0"; + sha256 = "18n7vb9fa39jkgr0gvsrjfc0nh09w2xlniifb25bn6z3qc3w0h6i"; + libraryHaskellDepends = [ + aeson async base blaze-markup bytestring containers data-default + directory extra filepath ghcide hls-plugin-api hspec hspec-core + lens lsp lsp-test lsp-types shake tasty tasty-expected-failure + tasty-golden tasty-hunit tasty-rerun temporary text + unordered-containers + ]; + description = "Utilities used in the tests of Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + "hlwm" = callPackage ({ mkDerivation, base, stm, transformers, unix, X11 }: mkDerivation { @@ -138863,23 +138864,6 @@ self: { }) {}; "hspec-golden" = callPackage - ({ mkDerivation, base, directory, hspec, hspec-core - , optparse-applicative, silently - }: - mkDerivation { - pname = "hspec-golden"; - version = "0.1.0.3"; - sha256 = "1d5ab34n0f1wk1q86qlb7x2b49abzzh08jh7j52nbrvnxld2j64l"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory hspec-core ]; - executableHaskellDepends = [ base directory optparse-applicative ]; - testHaskellDepends = [ base directory hspec hspec-core silently ]; - description = "Golden tests for hspec"; - license = lib.licenses.mit; - }) {}; - - "hspec-golden_0_2_0_0" = callPackage ({ mkDerivation, base, directory, filepath, hspec, hspec-core , optparse-applicative, silently }: @@ -138894,7 +138878,6 @@ self: { testHaskellDepends = [ base directory hspec hspec-core silently ]; description = "Golden tests for hspec"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hspec-golden-aeson" = callPackage @@ -147220,8 +147203,8 @@ self: { }: mkDerivation { pname = "imm"; - version = "2.1.0.0"; - sha256 = "01jpwxqp2c5ih9cw38w4j7x1dff0z7z1d43yx1rri83w8shpjbl3"; + version = "2.1.1.0"; + sha256 = "1w3kypakf8zqz8r44r9bx0z5v4wxvhnf446jzarawn9fg7yigcqn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -148704,6 +148687,8 @@ self: { pname = "inline-java"; version = "0.10.0"; sha256 = "0rs2rw21y0yc0h4c1rz25qblk39flkg19fwjz87s6l0ly1hvcrm5"; + revision = "1"; + editedCabalFile = "07qpgqy66zpmg1yz38y1w5gbbcc0nvidmlg2z4anj0k5rifzgdv6"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ghc jni jvm language-java mtl process template-haskell temporary text @@ -149767,8 +149752,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "0.5.0"; - sha256 = "1zjqyhcdi058gkq8pyhwfnn2zlzj8iifsl2c1z2ngvmpgxivq0qc"; + version = "0.6.2"; + sha256 = "0rfx5li74s160i64rjzl1p8gjj3aqxc1hml2n0c1jrair7l1g2iy"; libraryHaskellDepends = [ base containers QuickCheck time witherable ]; @@ -150509,16 +150494,15 @@ self: { }) {}; "ipa" = callPackage - ({ mkDerivation, attoparsec, base, hspec, text, unicode-transforms + ({ mkDerivation, attoparsec, base, hspec, template-haskell, text + , unicode-transforms }: mkDerivation { pname = "ipa"; - version = "0.3"; - sha256 = "0cm9ahqaf2kdqny6nmk9ff1h413v0iqbfsf6glrr5vkhmx60h9qm"; - revision = "2"; - editedCabalFile = "1jafvzz7vdbkcwywdhx49g2q1f0gah0bz921kia6lbi5jnyaail1"; + version = "0.3.1"; + sha256 = "1l658qnqfs63dwarmiaw7vf6v2xl8hhvzlb95w168rpa7wfkrh5n"; libraryHaskellDepends = [ - attoparsec base text unicode-transforms + attoparsec base template-haskell text unicode-transforms ]; testHaskellDepends = [ base hspec text ]; description = "Internal Phonetic Alphabet (IPA)"; @@ -150821,26 +150805,6 @@ self: { }) {}; "irc-client" = callPackage - ({ mkDerivation, base, bytestring, conduit, connection, containers - , contravariant, exceptions, irc-conduit, irc-ctcp, mtl - , network-conduit-tls, old-locale, profunctors, stm, stm-chans - , text, time, tls, transformers, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "irc-client"; - version = "1.1.2.0"; - sha256 = "0gd7ww2cmnh7im0gicsj1617540kl97780860hzf8nkixn71hwqr"; - libraryHaskellDepends = [ - base bytestring conduit connection containers contravariant - exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale - profunctors stm stm-chans text time tls transformers x509 - x509-store x509-validation - ]; - description = "An IRC client library"; - license = lib.licenses.mit; - }) {}; - - "irc-client_1_1_2_1" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, containers , contravariant, exceptions, irc-conduit, irc-ctcp, mtl , network-conduit-tls, old-locale, profunctors, stm, stm-chans @@ -150858,7 +150822,6 @@ self: { ]; description = "An IRC client library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "irc-colors" = callPackage @@ -153068,6 +153031,8 @@ self: { pname = "jni"; version = "0.8.0"; sha256 = "0m94p2zx877snh3imwcdnwa8ajfb76cg2rjgjx3pan508ham1h5i"; + revision = "2"; + editedCabalFile = "1ql65nfmd5mhn7y2xdifx240mk5my5z8w3pn85497hzk27qllybi"; libraryHaskellDepends = [ async base bytestring choice constraints containers deepseq inline-c singletons stm text @@ -155052,6 +155017,8 @@ self: { pname = "jvm"; version = "0.6.0"; sha256 = "119davscv5mrw2mnlrklx8hbjrc7lhf5a9jphdnnxs6bywi8i2zm"; + revision = "2"; + editedCabalFile = "1p0p50w0zjf79a3p5wiwg1wfnsgvqf2n04ydpacrfwm96id667kp"; libraryHaskellDepends = [ base bytestring choice constraints distributed-closure exceptions jni singletons template-haskell text vector @@ -155077,6 +155044,8 @@ self: { pname = "jvm-batching"; version = "0.2.0"; sha256 = "19z0db10y181n4adkz23cmly0q4zp953zh6f3r7rmxcd78758pbk"; + revision = "1"; + editedCabalFile = "1ni0gnww6r18dg2pm1hmdkfzaghq5ssirpp737i1c81ya1k95m2n"; setupHaskellDepends = [ base Cabal inline-java ]; libraryHaskellDepends = [ base bytestring distributed-closure inline-java jni jvm singletons @@ -155155,6 +155124,8 @@ self: { pname = "jvm-streaming"; version = "0.4.0"; sha256 = "0k8y6kvbymmjlr3bvgcws0z2hwdznyr3b3alkwsjag49lsgp21sd"; + revision = "1"; + editedCabalFile = "01f3j02qzqi7ls876vwzl2db3621xr7psmzm3cx9pk414bhj5f56"; setupHaskellDepends = [ base Cabal inline-java jvm-batching ]; libraryHaskellDepends = [ base distributed-closure inline-java jni jvm jvm-batching @@ -157431,6 +157402,18 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "koji_0_0_2" = callPackage + ({ mkDerivation, base, haxr, mtl }: + mkDerivation { + pname = "koji"; + version = "0.0.2"; + sha256 = "1ypr552453r0b9s5xlsw0gllka2jaf9xwphlnx55fn05f17zh7qd"; + libraryHaskellDepends = [ base haxr mtl ]; + description = "Koji buildsystem XML-RPC API bindings"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "kontra-config" = callPackage ({ mkDerivation, base, bytestring, data-default, exceptions, text , transformers-base, unjson, utf8-string, yaml @@ -159403,8 +159386,8 @@ self: { }: mkDerivation { pname = "language-docker"; - version = "9.3.0"; - sha256 = "1n9v0b6lwr528b6919y11a8d27mhsp0mm870rx0rjg9l5j4mnbvn"; + version = "10.0.0"; + sha256 = "0h2jq15niz77h2vpqyq7gblgbsrrvsr3qjw1cmjvr474zgzxmrv7"; libraryHaskellDepends = [ base bytestring containers data-default-class megaparsec prettyprinter split text time @@ -168662,36 +168645,6 @@ self: { }) {}; "lsp" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , containers, data-default, dependent-map, directory, filepath - , hashable, hslogger, hspec, hspec-discover, lens, lsp-types, mtl - , network-uri, QuickCheck, quickcheck-instances, random - , rope-utf16-splay, scientific, sorted-list, stm, text, time - , transformers, unliftio-core, unordered-containers, uuid - }: - mkDerivation { - pname = "lsp"; - version = "1.1.1.0"; - sha256 = "04ndz4v1mwga13qndmnaaj145y5zqw7zv64px7ak26qvd1m26h9r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async attoparsec base bytestring containers data-default - dependent-map directory filepath hashable hslogger lens lsp-types - mtl network-uri random scientific sorted-list stm text time - transformers unliftio-core unordered-containers uuid - ]; - testHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hashable hspec lens network-uri QuickCheck quickcheck-instances - rope-utf16-splay sorted-list stm text unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = lib.licenses.mit; - }) {}; - - "lsp_1_2_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, dependent-map, directory, filepath , hashable, hslogger, hspec, hspec-discover, lens, lsp-types, mtl @@ -168719,7 +168672,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lsp-test" = callPackage @@ -168749,34 +168701,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "lsp-test_0_13_0_0" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base - , bytestring, conduit, conduit-parse, containers, data-default - , Diff, directory, filepath, Glob, hspec, lens, lsp-types, mtl - , parser-combinators, process, some, text, time, transformers, unix - , unordered-containers - }: - mkDerivation { - pname = "lsp-test"; - version = "0.13.0.0"; - sha256 = "1xyxmzcd6r56jj1k11lz1g6yld5q3k6cgb0bsf45px120dsf1dpy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal async base bytestring conduit - conduit-parse containers data-default Diff directory filepath Glob - lens lsp-types mtl parser-combinators process some text time - transformers unix unordered-containers - ]; - testHaskellDepends = [ - aeson base data-default directory filepath hspec lens lsp-types - text unordered-containers - ]; - description = "Functional test framework for LSP servers"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "lsp-test_0_14_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default @@ -168806,29 +168730,6 @@ self: { }) {}; "lsp-types" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , data-default, deepseq, dependent-sum, dependent-sum-template - , directory, filepath, hashable, hslogger, lens, network-uri - , rope-utf16-splay, scientific, some, template-haskell, temporary - , text, unordered-containers - }: - mkDerivation { - pname = "lsp-types"; - version = "1.1.0.0"; - sha256 = "19lkdqwh9a5rsx5nby37v54zhwyja306z0dyslsmdmwqw92qxx54"; - revision = "1"; - editedCabalFile = "0iifws4r1h9v1mbsrmbvssvm0gmvzm9yh9h85izly0s51869bbq4"; - libraryHaskellDepends = [ - aeson base binary bytestring containers data-default deepseq - dependent-sum dependent-sum-template directory filepath hashable - hslogger lens network-uri rope-utf16-splay scientific some - template-haskell temporary text unordered-containers - ]; - description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = lib.licenses.mit; - }) {}; - - "lsp-types_1_2_0_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , data-default, deepseq, dependent-sum, dependent-sum-template , directory, filepath, hashable, hslogger, lens, network-uri @@ -168847,7 +168748,6 @@ self: { ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lss" = callPackage @@ -174677,13 +174577,20 @@ self: { }) {}; "method" = callPackage - ({ mkDerivation, base, hspec, hspec-discover, rio, transformers }: + ({ mkDerivation, base, containers, hspec, hspec-discover, rio + , template-haskell, th-abstraction, transformers + }: mkDerivation { pname = "method"; - version = "0.3.1.0"; - sha256 = "0a96av07vbh3mvyczh2jiziqb098q81jx6q0c5kgn7pmlxijw1ba"; - libraryHaskellDepends = [ base rio transformers ]; - testHaskellDepends = [ base hspec rio transformers ]; + version = "0.4.0.0"; + sha256 = "0ca7xfy5yb8d68l530q6h82843i5yvp9grr9r23s7rfbisbysfpb"; + libraryHaskellDepends = [ + base containers rio template-haskell th-abstraction transformers + ]; + testHaskellDepends = [ + base containers hspec rio template-haskell th-abstraction + transformers + ]; testToolDepends = [ hspec-discover ]; description = "rebindable methods for improving testability"; license = lib.licenses.bsd3; @@ -176804,6 +176711,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "mixed-types-num_0_5_0_0" = callPackage + ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl + , QuickCheck, smallcheck, template-haskell + }: + mkDerivation { + pname = "mixed-types-num"; + version = "0.5.0.0"; + sha256 = "17jfrhlcc86qw0zg997hsd11dc97vrqfkylhwb5ii9ls14j5qxfl"; + libraryHaskellDepends = [ + base collect-errors hspec hspec-smallcheck mtl QuickCheck + smallcheck template-haskell + ]; + testHaskellDepends = [ + base collect-errors hspec hspec-smallcheck QuickCheck smallcheck + ]; + description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mixpanel-client" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec , hspec-discover, http-client, http-client-tls, markdown-unlit @@ -195236,6 +195163,24 @@ self: { broken = true; }) {}; + "pact-time" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal, clock + , Decimal, deepseq, microlens, mtl, tasty, tasty-hunit, text + , vector, vector-space + }: + mkDerivation { + pname = "pact-time"; + version = "0.2.0.0"; + sha256 = "04d8hd4hnbsjvzjjvnyabc68srhyp8k9459pp0y1sdc7z6c0qq1m"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring cereal clock Decimal deepseq + microlens mtl text vector vector-space + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Time Library for Pact"; + license = lib.licenses.bsd3; + }) {}; + "padKONTROL" = callPackage ({ mkDerivation, base, containers, hmidi, minioperational , transformers @@ -195985,40 +195930,6 @@ self: { }) {}; "pandoc-plot" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , data-default, directory, filepath, githash, hashable, hspec - , hspec-expectations, lifted-async, lifted-base, mtl - , optparse-applicative, pandoc, pandoc-types, shakespeare, tagsoup - , tasty, tasty-hspec, tasty-hunit, template-haskell, text - , typed-process, yaml - }: - mkDerivation { - pname = "pandoc-plot"; - version = "1.1.1"; - sha256 = "10wwci7p3kphmjxlnpymbnx3cw2l3yfydm29l6k2vakz1pd7zdh0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers data-default directory filepath hashable - lifted-async lifted-base mtl pandoc pandoc-types shakespeare - tagsoup template-haskell text typed-process yaml - ]; - executableHaskellDepends = [ - base containers directory filepath githash optparse-applicative - pandoc pandoc-types template-haskell text typed-process - ]; - testHaskellDepends = [ - base containers directory filepath hspec hspec-expectations - pandoc-types tasty tasty-hspec tasty-hunit text - ]; - benchmarkHaskellDepends = [ - base criterion pandoc-types template-haskell text - ]; - description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice"; - license = lib.licenses.gpl2Plus; - }) {}; - - "pandoc-plot_1_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, directory, filepath, githash, hashable, hspec , hspec-expectations, lifted-async, lifted-base, mtl @@ -196050,7 +195961,6 @@ self: { ]; description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice"; license = lib.licenses.gpl2Plus; - hydraPlatforms = lib.platforms.none; }) {}; "pandoc-pyplot" = callPackage @@ -200431,32 +200341,36 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; - "persistent_2_12_1_1" = callPackage + "persistent_2_13_0_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , deepseq-generics, fast-logger, file-embed, hspec, http-api-data - , monad-logger, mtl, path-pieces, QuickCheck, resource-pool - , resourcet, scientific, shakespeare, silently, template-haskell - , text, th-lift-instances, time, transformers, unliftio - , unliftio-core, unordered-containers, vector + , lift-type, monad-logger, mtl, path-pieces, QuickCheck + , quickcheck-instances, resource-pool, resourcet, scientific + , shakespeare, silently, template-haskell, text, th-lift-instances + , time, transformers, unliftio, unliftio-core, unordered-containers + , vector }: mkDerivation { pname = "persistent"; - version = "2.12.1.1"; - sha256 = "00n463mvfnjpi7dz4i3lz379cf4gprsiv57j4jb7wh5a8xr2vfhz"; + version = "2.13.0.0"; + sha256 = "1addkfiaixk076qkdlhjmx97f8bgfmxwna9dv0h7hfvnq8v35bkf"; + revision = "2"; + editedCabalFile = "12ylw4rzrjlk2m0qfgqx481k0ifhv5i8z0vy70knjrkgx8d9sfvx"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger http-api-data monad-logger mtl - path-pieces resource-pool resourcet scientific silently + conduit containers fast-logger http-api-data lift-type monad-logger + mtl path-pieces resource-pool resourcet scientific silently template-haskell text th-lift-instances time transformers unliftio unliftio-core unordered-containers vector ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger hspec http-api-data monad-logger mtl - path-pieces QuickCheck resource-pool resourcet scientific - shakespeare silently template-haskell text th-lift-instances time - transformers unliftio unliftio-core unordered-containers vector + path-pieces QuickCheck quickcheck-instances resource-pool resourcet + scientific shakespeare silently template-haskell text + th-lift-instances time transformers unliftio unliftio-core + unordered-containers vector ]; benchmarkHaskellDepends = [ base criterion deepseq deepseq-generics file-embed template-haskell @@ -200533,6 +200447,33 @@ self: { broken = true; }) {}; + "persistent-discover" = callPackage + ({ mkDerivation, base, directory, dlist, file-embed, filepath + , hspec, hspec-discover, mtl, persistent, template-haskell + }: + mkDerivation { + pname = "persistent-discover"; + version = "0.1.0.0"; + sha256 = "1cpjbks5cmh2w3370xnmm29rk8j3xdxmry04fyi0aqyg5f91hrdi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory dlist file-embed filepath mtl persistent + template-haskell + ]; + executableHaskellDepends = [ + base directory dlist file-embed filepath mtl persistent + template-haskell + ]; + testHaskellDepends = [ + base directory dlist file-embed filepath hspec hspec-discover mtl + persistent template-haskell + ]; + testToolDepends = [ hspec-discover ]; + description = "Persistent module discover utilities"; + license = lib.licenses.bsd3; + }) {}; + "persistent-documentation" = callPackage ({ mkDerivation, base, containers, hspec, hspec-discover, mtl , persistent, persistent-template, template-haskell, text @@ -200649,8 +200590,8 @@ self: { }: mkDerivation { pname = "persistent-migration"; - version = "0.1.0"; - sha256 = "025hrjm95klj4b7wqlzwkcwra5yj37ilirr06hxxw6d3g668rllm"; + version = "0.2.0"; + sha256 = "0xqzgfzxv8xskyaivar6mnb9qp9s3fq0lh17sajrxa59fi7h8xjw"; libraryHaskellDepends = [ base containers fgl mtl persistent text time unordered-containers ]; @@ -200677,6 +200618,8 @@ self: { pname = "persistent-mongoDB"; version = "2.12.0.0"; sha256 = "1s49d4c4kiqcblkap96wcrp3nc0179vpzbqp4fdibljq9ylzxmzg"; + revision = "1"; + editedCabalFile = "047riy3grn68jw99095qgqxvfs5bvxmcvmnz170nrqflrlr4l4dd"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -200746,26 +200689,27 @@ self: { license = lib.licenses.mit; }) {}; - "persistent-mysql_2_12_1_0" = callPackage + "persistent-mysql_2_13_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, fast-logger, hspec, HUnit, monad-logger, mysql - , mysql-simple, persistent, persistent-qq, persistent-test - , QuickCheck, quickcheck-instances, resource-pool, resourcet, text - , time, transformers, unliftio-core + , containers, fast-logger, hspec, http-api-data, HUnit + , monad-logger, mysql, mysql-simple, path-pieces, persistent + , persistent-qq, persistent-test, QuickCheck, quickcheck-instances + , resource-pool, resourcet, text, time, transformers, unliftio-core }: mkDerivation { pname = "persistent-mysql"; - version = "2.12.1.0"; - sha256 = "08494wc935gfr3007w2x9lvqcp8y2jvapgwjxz1l0mnl120vh8hw"; + version = "2.13.0.0"; + sha256 = "1lqd1j9r973081yzvvz9c65csqjd8bzapb4dayzwbhwjq2p0sxiz"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text transformers unliftio-core ]; testHaskellDepends = [ - base bytestring containers fast-logger hspec HUnit monad-logger - mysql persistent persistent-qq persistent-test QuickCheck - quickcheck-instances resourcet text time transformers unliftio-core + aeson base bytestring containers fast-logger hspec http-api-data + HUnit monad-logger mysql path-pieces persistent persistent-qq + persistent-test QuickCheck quickcheck-instances resourcet text time + transformers unliftio-core ]; description = "Backend for the persistent library using MySQL database server"; license = lib.licenses.mit; @@ -200891,20 +200835,20 @@ self: { license = lib.licenses.mit; }) {}; - "persistent-postgresql_2_12_1_1" = callPackage + "persistent-postgresql_2_13_0_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , conduit, containers, fast-logger, hspec, hspec-expectations - , hspec-expectations-lifted, HUnit, monad-logger, mtl, persistent - , persistent-qq, persistent-test, postgresql-libpq - , postgresql-simple, QuickCheck, quickcheck-instances - , resource-pool, resourcet, string-conversions, text, time - , transformers, unliftio, unliftio-core, unordered-containers - , vector + , hspec-expectations-lifted, http-api-data, HUnit, monad-logger + , mtl, path-pieces, persistent, persistent-qq, persistent-test + , postgresql-libpq, postgresql-simple, QuickCheck + , quickcheck-instances, resource-pool, resourcet + , string-conversions, text, time, transformers, unliftio + , unliftio-core, unordered-containers, vector }: mkDerivation { pname = "persistent-postgresql"; - version = "2.12.1.1"; - sha256 = "1zyh40490r3vjr5qyr8hp2ih1pjqjwbmwm1ashdm1b1n9y5ary53"; + version = "2.13.0.0"; + sha256 = "0a18h7ib01if2dspq8f3vwb02cwi74c12i0n3ax4aq6819qy12gb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200915,10 +200859,10 @@ self: { ]; testHaskellDepends = [ aeson base bytestring containers fast-logger hspec - hspec-expectations hspec-expectations-lifted HUnit monad-logger - persistent persistent-qq persistent-test QuickCheck - quickcheck-instances resourcet text time transformers unliftio - unliftio-core unordered-containers vector + hspec-expectations hspec-expectations-lifted http-api-data HUnit + monad-logger path-pieces persistent persistent-qq persistent-test + QuickCheck quickcheck-instances resourcet text time transformers + unliftio unliftio-core unordered-containers vector ]; description = "Backend for the persistent library using postgresql"; license = lib.licenses.mit; @@ -201007,8 +200951,8 @@ self: { }: mkDerivation { pname = "persistent-redis"; - version = "2.12.0.0"; - sha256 = "0zibmgvlpkx4knh23jnz2vam1la6w57x2cibrdn17h0zd3s872p5"; + version = "2.13.0.0"; + sha256 = "1d43rlcx0islf7gn14kpxi922zaz6k5x6s4k4xc947l2r1zx40qs"; libraryHaskellDepends = [ aeson base binary bytestring hedis http-api-data mtl path-pieces persistent scientific text time transformers utf8-string @@ -201114,7 +201058,7 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; - "persistent-sqlite_2_12_0_0" = callPackage + "persistent-sqlite_2_13_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th , monad-logger, mtl, persistent, persistent-test, QuickCheck @@ -201124,8 +201068,10 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.12.0.0"; - sha256 = "0qwh2zrg1dqrv7i752jkqgqfxwjbdvkxmdgnzhcfzhgn6bq1018m"; + version = "2.13.0.0"; + sha256 = "1xbf22cnvhjs59wqml0n5flk1fhrhjw3flm3lnhh1nik3scfny0w"; + revision = "1"; + editedCabalFile = "0y21azb1cvaxwlypprh3wqxr0w0hchf3r509vqxvywqymckqc71i"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -201238,24 +201184,26 @@ self: { broken = true; }) {}; - "persistent-test_2_12_0_0" = callPackage + "persistent-test_2_13_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit - , containers, exceptions, hspec, hspec-expectations, HUnit - , monad-control, monad-logger, mtl, path-pieces, persistent + , containers, exceptions, hspec, hspec-expectations, http-api-data + , HUnit, monad-control, monad-logger, mtl, path-pieces, persistent , QuickCheck, quickcheck-instances, random, resourcet, text, time , transformers, transformers-base, unliftio, unliftio-core , unordered-containers }: mkDerivation { pname = "persistent-test"; - version = "2.12.0.0"; - sha256 = "0vn6f8wmax68qg27ifw2sfr3d0zk12p6gaax5xshwmb5ypamrc50"; + version = "2.13.0.0"; + sha256 = "1fyahnnx9f3dg36kqviah5l9410d0x819dz3afxapcq27myccdw7"; + revision = "1"; + editedCabalFile = "16yzpsy11bcglipgcy0x8mcxlx7w00gfvnw5fhjkbj99lxdwwgm0"; libraryHaskellDepends = [ aeson base blaze-html bytestring conduit containers exceptions - hspec hspec-expectations HUnit monad-control monad-logger mtl - path-pieces persistent QuickCheck quickcheck-instances random - resourcet text time transformers transformers-base unliftio - unliftio-core unordered-containers + hspec hspec-expectations http-api-data HUnit monad-control + monad-logger mtl path-pieces persistent QuickCheck + quickcheck-instances random resourcet text time transformers + transformers-base unliftio unliftio-core unordered-containers ]; description = "Tests for Persistent"; license = lib.licenses.mit; @@ -201661,8 +201609,8 @@ self: { ({ mkDerivation, base, containers, gu, pgf, pretty }: mkDerivation { pname = "pgf2"; - version = "1.2.1"; - sha256 = "10nbwhdirhlsh68f14z8y75wlbs9f9xcn8cbgkf47m74x71jqqb3"; + version = "1.3.0"; + sha256 = "1sd21p6f9m9l6xnf853v7lxj6j6sbsrd7i09y0w0lsysp86p8h7m"; libraryHaskellDepends = [ base containers pretty ]; librarySystemDepends = [ gu pgf ]; description = "Bindings to the C version of the PGF runtime"; @@ -202065,8 +202013,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.5.1.0"; - sha256 = "1pqc16llr1ar7z6lfbniinxx7q09qpamajmbl3d9njhk4pwdl6b8"; + version = "0.6.1.0"; + sha256 = "0pa55mkw70f20bw90qc8lballa89zgk6b185038i4p3piipsymrn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202220,6 +202168,38 @@ self: { license = lib.licenses.mit; }) {}; + "phonetic-languages-simplified-generalized-examples-common" = callPackage + ({ mkDerivation, base, heaps, phonetic-languages-phonetics-basics + , subG + }: + mkDerivation { + pname = "phonetic-languages-simplified-generalized-examples-common"; + version = "0.1.0.1"; + sha256 = "07rqfnz2rkx6rwfgrv97yiww2d1086av60pri5qcp5l44xwlqdy5"; + libraryHaskellDepends = [ + base heaps phonetic-languages-phonetics-basics subG + ]; + description = "Some common code for phonetic languages generalized functionality"; + license = lib.licenses.mit; + }) {}; + + "phonetic-languages-simplified-generalized-properties-array" = callPackage + ({ mkDerivation, base, phonetic-languages-phonetics-basics + , phonetic-languages-rhythmicity + , phonetic-languages-simplified-base + }: + mkDerivation { + pname = "phonetic-languages-simplified-generalized-properties-array"; + version = "0.1.0.2"; + sha256 = "1hm9yz0ibfrzmmm70qff0bsghiscigp9843i9nhk41yfxlrmbsp3"; + libraryHaskellDepends = [ + base phonetic-languages-phonetics-basics + phonetic-languages-rhythmicity phonetic-languages-simplified-base + ]; + description = "Generalization of the functionality of the phonetic-languages-simplified-properties-array"; + license = lib.licenses.mit; + }) {}; + "phonetic-languages-simplified-lists-examples" = callPackage ({ mkDerivation, base, heaps, mmsyn2, parallel , phonetic-languages-constraints, phonetic-languages-permutations @@ -203152,6 +203132,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "pipes_4_3_16" = callPackage + ({ mkDerivation, base, criterion, exceptions, mmorph, mtl + , optparse-applicative, QuickCheck, test-framework + , test-framework-quickcheck2, transformers, void + }: + mkDerivation { + pname = "pipes"; + version = "4.3.16"; + sha256 = "163lx5sf68zx5kik5h1fjsyckwr9shdsn5k2dsjq3mhg077nxqgl"; + libraryHaskellDepends = [ + base exceptions mmorph mtl transformers void + ]; + testHaskellDepends = [ + base mtl QuickCheck test-framework test-framework-quickcheck2 + transformers + ]; + benchmarkHaskellDepends = [ + base criterion mtl optparse-applicative transformers + ]; + description = "Compositional pipelines"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pipes-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers @@ -213143,26 +213147,25 @@ self: { "publish" = callPackage ({ mkDerivation, base, bytestring, chronologique, core-data - , core-program, core-text, deepseq, directory, filepath, hinotify - , hspec, megaparsec, pandoc, pandoc-types, template-haskell, text + , core-program, core-text, deepseq, directory, filepath, hspec + , megaparsec, pandoc, pandoc-types, template-haskell, text , typed-process, unix, unordered-containers }: mkDerivation { pname = "publish"; - version = "2.1.5"; - sha256 = "1ncz9bijln0xmkmy5x6lv4w6xiqr08crgqiyb8cchc88dqacddhi"; + version = "2.1.6"; + sha256 = "1clb9sxrsskklzany9q5600v77qywdszgzxjxrvsihrirf0akry2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring chronologique core-data core-program core-text - deepseq directory filepath hinotify megaparsec pandoc pandoc-types + deepseq directory filepath megaparsec pandoc pandoc-types template-haskell text typed-process unix unordered-containers ]; testHaskellDepends = [ base bytestring chronologique core-data core-program core-text - deepseq directory filepath hinotify hspec megaparsec pandoc - pandoc-types template-haskell text typed-process unix - unordered-containers + deepseq directory filepath hspec megaparsec pandoc pandoc-types + template-haskell text typed-process unix unordered-containers ]; description = "Publishing tools for papers, books, and presentations"; license = lib.licenses.mit; @@ -233673,19 +233676,19 @@ self: { "servant-benchmark" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, hspec, http-media, http-types, QuickCheck - , servant, text, yaml + , servant, text, utf8-string, yaml }: mkDerivation { pname = "servant-benchmark"; - version = "0.1.1.1"; - sha256 = "1rsj819kg17p31ky5ad28hydrkh39nsfwkq3f9zdkqm2j924idhx"; + version = "0.1.2.0"; + sha256 = "0lqqk410nx48g895pfxkbbk85b1ijs4bfl9zr2li2p7wwwc4gyi9"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive http-media http-types QuickCheck servant text yaml ]; testHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive hspec - http-media http-types QuickCheck servant text yaml + http-media http-types QuickCheck servant text utf8-string yaml ]; description = "Generate benchmark files from a Servant API"; license = lib.licenses.bsd3; @@ -244991,6 +244994,8 @@ self: { pname = "sparkle"; version = "0.7.4"; sha256 = "174rs21fgj43rq3nshzgff6mydi93n26nkcq9cadq0bzcasc2n3q"; + revision = "1"; + editedCabalFile = "1jwg12rmsa1il8y53ip535bjf02z7jnrnws1qi9y0xfpqblzmw6r"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal inline-java jvm-streaming ]; @@ -246573,6 +246578,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "squeather_0_8_0_0" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hedgehog + , lifted-base, temporary, text + }: + mkDerivation { + pname = "squeather"; + version = "0.8.0.0"; + sha256 = "1pjiq97gq8rjp4v7cx2bhj7zcwkswc593fxdwqajssi1i39679r6"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base bytestring directory filepath hedgehog lifted-base temporary + text + ]; + description = "Use databases with the version 3 series of the SQLite C library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "squeeze" = callPackage ({ mkDerivation, base, Cabal, data-default, directory, extra , factory, filepath, mtl, QuickCheck, random, toolshed @@ -257125,6 +257148,21 @@ self: { license = lib.licenses.mpl20; }) {}; + "tasty-inspection-testing" = callPackage + ({ mkDerivation, base, ghc, inspection-testing, tasty + , template-haskell + }: + mkDerivation { + pname = "tasty-inspection-testing"; + version = "0.1"; + sha256 = "18awafrclxg8lfw8gg4ndzfwwpaz8qmad23fi24rhpdj9c7xdyhw"; + libraryHaskellDepends = [ + base ghc inspection-testing tasty template-haskell + ]; + description = "Inspection testing support for tasty"; + license = lib.licenses.mit; + }) {}; + "tasty-integrate" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, containers , deepseq, directory, either, haskell-src-exts @@ -262949,6 +262987,26 @@ self: { broken = true; }) {}; + "tikzsd" = callPackage + ({ mkDerivation, array, base, containers, lens, mtl, parsec + , transformers + }: + mkDerivation { + pname = "tikzsd"; + version = "1.0.0"; + sha256 = "1y2pxbmm22dmrvgsqv2gvy3nf8vh3ln5pinrfsbim8qk1qfayina"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers lens mtl parsec transformers + ]; + executableHaskellDepends = [ + array base containers lens mtl parsec transformers + ]; + description = "A program for generating LaTeX code of string diagrams"; + license = lib.licenses.mit; + }) {}; + "tile" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { @@ -267512,8 +267570,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "trivial-constraint"; - version = "0.6.0.0"; - sha256 = "0y0iyll7ml5qz271cqa0dc3w2j3w1d8jjaxwaf2flcidigws69z5"; + version = "0.7.0.0"; + sha256 = "0kyjifqfjf4lmrba4fb65m82s8qqv2nld9lj0qvh2qxc8bfw4hj7"; libraryHaskellDepends = [ base ]; description = "Constraints that any type, resp. no type fulfills"; license = lib.licenses.gpl3Only; @@ -271833,6 +271891,53 @@ self: { license = lib.licenses.bsd3; }) {}; + "uniform-algebras" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "uniform-algebras"; + version = "0.1.0"; + sha256 = "19grz10hagzi8x9am59i6jifm1zjf31698k8r4l7bbhyww4w6p91"; + libraryHaskellDepends = [ base ]; + description = "Pointless functions and a simplistic zero and monoid"; + license = lib.licenses.gpl2Only; + }) {}; + + "uniform-error" = callPackage + ({ mkDerivation, base, monads-tf, safe, uniform-strings }: + mkDerivation { + pname = "uniform-error"; + version = "0.1.0"; + sha256 = "1ap8wrnh08yvv9hwd92mp1g5fz4g7l0aij1h0hfl3j7ijd028pmx"; + libraryHaskellDepends = [ base monads-tf safe uniform-strings ]; + description = "Handling errors in the uniform framework"; + license = lib.licenses.gpl2Only; + }) {}; + + "uniform-fileio" = callPackage + ({ mkDerivation, base, bytestring, deepseq, directory, exceptions + , filepath, HTF, monads-tf, path, path-io, pipes, pureMD5 + , quickcheck-text, safe, test-invariant, text, uniform-algebras + , uniform-error, uniform-strings, uniform-time, unix, zlib + }: + mkDerivation { + pname = "uniform-fileio"; + version = "0.1.0"; + sha256 = "0rxhjn4qv2dbdycdfqblymyfj3wax586ar77zwdgkyld7v7s12ya"; + libraryHaskellDepends = [ + base bytestring deepseq directory exceptions filepath monads-tf + path path-io pipes pureMD5 safe text uniform-algebras uniform-error + uniform-strings uniform-time unix zlib + ]; + testHaskellDepends = [ + base bytestring deepseq directory exceptions filepath HTF monads-tf + path path-io pipes pureMD5 quickcheck-text safe test-invariant text + uniform-algebras uniform-error uniform-strings uniform-time unix + zlib + ]; + description = "Uniform file handling operations"; + license = lib.licenses.gpl2Only; + }) {}; + "uniform-io" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal , data-default-class, interruptible, iproute, monad-control @@ -271870,6 +271975,55 @@ self: { license = lib.licenses.bsd3; }) {}; + "uniform-strings" = callPackage + ({ mkDerivation, base, bytestring, MissingH, monads-tf, network-uri + , pretty-show, safe, snap-core, split, text, text-icu + , uniform-algebras + }: + mkDerivation { + pname = "uniform-strings"; + version = "0.1.0"; + sha256 = "17w04fxx81gk02xl7ca64amc0hb06i77fbanhykp3qd70nd2k8ix"; + libraryHaskellDepends = [ + base bytestring MissingH monads-tf network-uri pretty-show safe + snap-core split text text-icu uniform-algebras + ]; + description = "Manipulate and convert strings of characters uniformly and consistently"; + license = lib.licenses.gpl2Only; + }) {}; + + "uniform-time" = callPackage + ({ mkDerivation, base, convertible, monads-tf, time + , uniform-algebras, uniform-error, uniform-strings + }: + mkDerivation { + pname = "uniform-time"; + version = "0.1.0"; + sha256 = "08p40xl4zzswhax3i6j4ps0zy2m9qsbcpj4b00xvizc3g9fxnzsh"; + libraryHaskellDepends = [ + base convertible monads-tf time uniform-algebras uniform-error + uniform-strings + ]; + description = "Time in the uniform framework"; + license = lib.licenses.gpl2Only; + }) {}; + + "uniformBase" = callPackage + ({ mkDerivation, base, uniform-algebras, uniform-error + , uniform-fileio, uniform-strings, uniform-time + }: + mkDerivation { + pname = "uniformBase"; + version = "0.1.0"; + sha256 = "1ya87jzfmzldd66rwxrccidkrpknqws5rslq9zdsjcdngn2w0sa9"; + libraryHaskellDepends = [ + base uniform-algebras uniform-error uniform-fileio uniform-strings + uniform-time + ]; + description = "A uniform base to build apps on"; + license = lib.licenses.gpl2Only; + }) {}; + "union" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, lens , profunctors, tagged, vinyl @@ -272849,6 +273003,32 @@ self: { license = lib.licenses.mit; }) {}; + "unliftio_0_2_15" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, gauge, hspec, process, QuickCheck, stm, time + , transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.15"; + sha256 = "08yclgvk6slaisqc08b8bblh4fl77qicj0w90l46q419ya3drixd"; + libraryHaskellDepends = [ + async base bytestring deepseq directory filepath process stm time + transformers unix unliftio-core + ]; + testHaskellDepends = [ + async base bytestring containers deepseq directory filepath hspec + process QuickCheck stm time transformers unix unliftio-core + ]; + benchmarkHaskellDepends = [ + async base bytestring deepseq directory filepath gauge process stm + time transformers unix unliftio-core + ]; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -274726,27 +274906,6 @@ self: { }) {}; "uuid" = callPackage - ({ mkDerivation, base, binary, bytestring, cryptohash-md5 - , cryptohash-sha1, entropy, network-info, QuickCheck, random, tasty - , tasty-hunit, tasty-quickcheck, text, time, uuid-types - }: - mkDerivation { - pname = "uuid"; - version = "1.3.14"; - sha256 = "1msj296faldr9fiwjqi9ixx3xl638mg6ffk7axic14wf8b9zw73a"; - libraryHaskellDepends = [ - base binary bytestring cryptohash-md5 cryptohash-sha1 entropy - network-info random text time uuid-types - ]; - testHaskellDepends = [ - base bytestring QuickCheck random tasty tasty-hunit - tasty-quickcheck - ]; - description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; - license = lib.licenses.bsd3; - }) {}; - - "uuid_1_3_15" = callPackage ({ mkDerivation, base, binary, bytestring, cryptohash-md5 , cryptohash-sha1, entropy, network-info, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, text, time, uuid-types @@ -274765,7 +274924,6 @@ self: { ]; description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "uuid-aeson" = callPackage @@ -274863,26 +275021,6 @@ self: { }) {}; "uuid-types" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, ghc-byteorder - , hashable, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "uuid-types"; - version = "1.0.4"; - sha256 = "01pc93z6in6g717mxkhl111qc842fz1c2z7ml6n5jhm7lg52ran2"; - libraryHaskellDepends = [ - base binary bytestring deepseq hashable random text - ]; - testHaskellDepends = [ - base binary bytestring ghc-byteorder QuickCheck tasty tasty-hunit - tasty-quickcheck - ]; - description = "Type definitions for Universally Unique Identifiers"; - license = lib.licenses.bsd3; - }) {}; - - "uuid-types_1_0_5" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, ghc-byteorder , hashable, QuickCheck, random, tasty, tasty-hunit , tasty-quickcheck, template-haskell, text @@ -274901,7 +275039,6 @@ self: { ]; description = "Type definitions for Universally Unique Identifiers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "uulib" = callPackage @@ -279548,8 +279685,8 @@ self: { }: mkDerivation { pname = "wai-middleware-validation"; - version = "0.1.0.0"; - sha256 = "0cbp32j31xkmniml56gnh278g94zhhfc8xlp842n8lll5hh13bf4"; + version = "0.1.0.2"; + sha256 = "1qrkfy31slmlbiw9gkz96yd9q6mrw72rjyjl0a5pnjif5ps12vpq"; libraryHaskellDepends = [ aeson base bytestring containers filepath http-types insert-ordered-containers lens openapi3 text wai @@ -289833,6 +289970,28 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-persistent_1_6_0_7" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent + , persistent-sqlite, persistent-template, resource-pool, resourcet + , text, transformers, wai-extra, yesod-core + }: + mkDerivation { + pname = "yesod-persistent"; + version = "1.6.0.7"; + sha256 = "102xmp7n08sk1g5rv31jpln2v9kqf1zsqsnmi83mnhmgggcbj1k4"; + libraryHaskellDepends = [ + base blaze-builder conduit persistent persistent-template + resource-pool resourcet transformers yesod-core + ]; + testHaskellDepends = [ + base blaze-builder conduit hspec persistent persistent-sqlite text + wai-extra yesod-core + ]; + description = "Some helpers for using Persistent from Yesod"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-platform" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, asn1-encoding , asn1-parse, asn1-types, attoparsec-conduit, authenticate From 4b137c9418d881532e06c0851e2e9448d20ef5a9 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 7 May 2021 13:08:31 +0200 Subject: [PATCH 034/213] haskellPackages.hsignal: restrict platforms to x86 SSE(2) is an intel instruction set --- pkgs/development/haskell-modules/configuration-nix.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6f38c89088c..a463401a8a8 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -867,4 +867,9 @@ self: super: builtins.intersectAttrs super { # Pass the correct libarchive into the package. streamly-archive = super.streamly-archive.override { archive = pkgs.libarchive; }; + + # passes the -msse2 flag which only works on x86 platforms + hsignal = overrideCabal super.hsignal { + platforms = pkgs.lib.platforms.x86; + }; } From e4633b8a6808d8ecfd03d5f566ff05188f775ba0 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 8 May 2021 00:29:32 +0200 Subject: [PATCH 035/213] haskellPackages.haggle: remove unnecessary override Upstream was very quick about relaxing the bound on ref-tf. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a84c34df7b0..2ddce1a5514 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1881,8 +1881,4 @@ self: super: { sha256 = "10npa8nh2413n6p6qld795qfkbld08icm02bspmk93y0kabpgmgm"; }); - # Too strict bounds on ref-tf - # https://github.com/travitch/haggle/issues/4 - haggle = doJailbreak super.haggle; - } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 1ea8fdd6ae73f2da8ed2eccb92f9484a41cbc400 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 7 May 2021 18:50:25 -0400 Subject: [PATCH 036/213] kodi.packages.netflix: 1.15.0 -> 1.15.1 --- pkgs/applications/video/kodi-packages/netflix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi-packages/netflix/default.nix b/pkgs/applications/video/kodi-packages/netflix/default.nix index e258270dad6..1aac5f8e9b2 100644 --- a/pkgs/applications/video/kodi-packages/netflix/default.nix +++ b/pkgs/applications/video/kodi-packages/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - sha256 = "1jibzzm8viqpanby6lqxpb95gw5hw3lfsw4jasjskiinbf8n469k"; + sha256 = "0c5cdi6s76vg2gyxzf0ylisxai1ii8vi6h4q4mznpfmplfdp667v"; }; propagatedBuildInputs = [ From 58f8338e61c2cfe8ef0e15c0dbb95df0d5c49897 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 8 May 2021 01:04:00 +0200 Subject: [PATCH 037/213] haskell-language-server: Fix build of multiple plugins --- .../haskell-modules/configuration-common.nix | 6 +++++ .../haskell-modules/configuration-nix.nix | 26 +++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2ddce1a5514..24dc90365b8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1424,6 +1424,12 @@ self: super: { # https://github.com/haskell/haskell-language-server/issues/611 haskell-language-server = dontCheck super.haskell-language-server; + # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1808 + hls-splice-plugin = dontCheck super.hls-splice-plugin; + + # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809 + hls-eval-plugin = dontCheck super.hls-eval-plugin; + # 2021-03-19: Too restrictive upper bound on optparse-applicative stylish-haskell = doJailbreak super.stylish-haskell; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a463401a8a8..3979c464ad9 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -872,4 +872,30 @@ self: super: builtins.intersectAttrs super { hsignal = overrideCabal super.hsignal { platforms = pkgs.lib.platforms.x86; }; + + hls-brittany-plugin = overrideCabal super.hls-brittany-plugin (drv: { + testToolDepends = [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); + hls-class-plugin = overrideCabal super.hls-class-plugin (drv: { + testToolDepends = [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); + # Tests have file permissions expections that don‘t work with the nix store. + hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin; + hls-haddock-comments-plugin = overrideCabal super.hls-haddock-comments-plugin (drv: { + testToolDepends = [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); + hls-eval-plugin = overrideCabal super.hls-eval-plugin (drv: { + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); } From 3452368788df9d106847f88c459185f6c0cb03c1 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 8 May 2021 01:15:31 +0200 Subject: [PATCH 038/213] hackage-packages.nix: Regenerate based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../configuration-hackage2nix/transitive-broken.yaml | 7 ++++--- pkgs/development/haskell-modules/hackage-packages.nix | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 7a68332fc8f..a8ccc4f3851 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -22,6 +22,7 @@ dont-distribute-packages: - approx-rand-test - barley - bson-mapping + - bv-sized-lens - clash-prelude-quickcheck - click-clack - cloudyfs @@ -79,9 +80,9 @@ dont-distribute-packages: - openpgp-crypto-api - patch-image - perdure - - persistent-mysql_2_12_1_0 - - persistent-postgresql_2_12_1_1 - - persistent-sqlite_2_12_0_0 + - persistent-mysql_2_13_0_0 + - persistent-postgresql_2_13_0_0 + - persistent-sqlite_2_13_0_0 - pontarius-mediaserver - pontarius-xmpp-extras - pontarius-xpmn diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d06922f0534..ada435b2c8a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -47544,6 +47544,7 @@ self: { libraryHaskellDepends = [ base bv-sized lens parameterized-utils ]; description = "Well-typed lenses for bv-sized bitvectors"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "byline" = callPackage @@ -64749,7 +64750,7 @@ self: { description = "A modern, lightweight, complete client for CouchDB"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) couchdb;}; + }) {couchdb = null;}; "couchdb-conduit" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base From 765b9672e1597b0227eb6aef141d675e76de1f30 Mon Sep 17 00:00:00 2001 From: ymeister <47071325+ymeister@users.noreply.github.com> Date: Fri, 7 May 2021 12:27:09 +0000 Subject: [PATCH 039/213] rss-bridge: 2020-11-10 -> 2021-04-25 --- pkgs/servers/web-apps/rss-bridge/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/web-apps/rss-bridge/default.nix b/pkgs/servers/web-apps/rss-bridge/default.nix index 13ad9d69ad6..649b76f871c 100644 --- a/pkgs/servers/web-apps/rss-bridge/default.nix +++ b/pkgs/servers/web-apps/rss-bridge/default.nix @@ -1,17 +1,17 @@ -{ config, lib, pkgs, fetchFromGitHub, stdenv, ... }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "rss-bridge"; - version = "2020-11-10"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "RSS-Bridge"; repo = "rss-bridge"; rev = version; - sha256 = "00cp61lqvhi7b7j0rglsqg3l7cg8s9b8vq098bgvg5dygyi44hyv"; + sha256 = "0dkw8xq710q0wclyr003357gk0vgb5pmpcx75k13pv56c3mrg9vm"; }; - patchPhase = '' + postPatch = '' substituteInPlace lib/rssbridge.php \ --replace "define('PATH_CACHE', PATH_ROOT . 'cache/');" "define('PATH_CACHE', getenv('RSSBRIDGE_DATA') . '/cache/');" \ --replace "define('FILE_CONFIG', PATH_ROOT . 'config.ini.php');" "define('FILE_CONFIG', getenv('RSSBRIDGE_DATA') . '/config.ini.php');" \ From 4083cd9046deccff98c3ed2e0328564086ae5194 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Sat, 8 May 2021 10:38:47 +1000 Subject: [PATCH 040/213] navidrome: 0.40.0 -> 0.42.1 --- pkgs/servers/misc/navidrome/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index b4dfc4791b7..532f7734acb 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -4,11 +4,11 @@ with lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.40.0"; + version = "0.42.1"; src = fetchurl { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "sha256-sBITCHyji55OnopNlDCNypSf/j8LKtarSGPYz5fQZys="; + sha256 = "1bndqs689rc7pf1l08rlph8h3f86kr1c7i96szs4wkycfy9w8vsv"; }; nativeBuildInputs = [ makeWrapper ]; @@ -18,8 +18,12 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp navidrome $out/bin + + runHook postInstall ''; postFixup = '' @@ -30,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Navidrome Music Server and Streamer compatible with Subsonic/Airsonic"; homepage = "https://www.navidrome.org/"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ aciceri ]; }; From 65adcafac7a4330d9dd935647e2f2a91713554d0 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Sat, 8 May 2021 11:58:45 +0200 Subject: [PATCH 041/213] victoriametrics: 1.54.1 -> 1.59.0 --- pkgs/servers/nosql/victoriametrics/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index d7612d30764..12ad7037512 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.54.1"; + version = "1.59.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-nZSNn1vLk3y6s4ie1AkSkGmKUiIrcBr3yKW5uAEtRt0="; + sha256 = "sha256-2i9rmk9aAnjTJY+w/NKJOaLX+tpkt3vG07iLCsSGzdU="; }; vendorSha256 = null; @@ -22,5 +22,7 @@ buildGoModule rec { description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus"; license = licenses.asl20; maintainers = [ maintainers.yorickvp ]; + changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}"; + platforms = [ "x86_64-linux" ]; }; } From a3830da1aa47ad302f1d89d69aec8eaa0c9e3175 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 7 Nov 2020 16:29:10 +0800 Subject: [PATCH 042/213] haskell: default name to "" when root isn't a path in developPackage See https://github.com/NixOS/nixpkgs/issues/103062 --- pkgs/development/haskell-modules/make-package-set.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 2641892672a..5d178e3b5a1 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -249,7 +249,7 @@ in package-set { inherit pkgs lib callPackage; } self // { # a cabal flag with '--flag=myflag'. developPackage = { root - , name ? builtins.baseNameOf root + , name ? if builtins.typeOf root == "path" then builtins.baseNameOf root else "" , source-overrides ? {} , overrides ? self: super: {} , modifier ? drv: drv From 223b503ca4e7090e3e442b071ae515bdac8c42b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 8 May 2021 15:07:06 +0200 Subject: [PATCH 043/213] libxlsxwriter: 1.0.3 -> 1.0.4 https://github.com/jmcnamara/libxlsxwriter/releases/tag/RELEASE_1.0.4 --- pkgs/development/libraries/libxlsxwriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index 849ebcf3c86..7f1b583284b 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "14c5rgx87nhzasr0j7mcfr1w7ifz0gmdiqy2xq59di5xvcdrpxpv"; + sha256 = "0k0km5d4xs6z98nqczvdkqwhhc5izqs82ciifx2l5wcbcdxb4r0k"; }; nativeBuildInputs = [ From 2ff258a80afe13a2968a73e1a566d7bc16d49adf Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sat, 8 May 2021 14:37:12 +0100 Subject: [PATCH 044/213] conftest: 0.24.0 -> 0.25.0 --- pkgs/development/tools/conftest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 4c6cbbbe6b0..833f2f84b05 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "conftest"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "sha256-iFxRZq/8TW7Df+aAc5IN+FAXU4kvbDiHWiFOlWMmCY0="; + sha256 = "sha256-pxPqBUOsXbP9giaV5NS3a6Z6auN4vUTIrIKcNh8xURU="; }; - vendorSha256 = "sha256-LvaSs1y1CEP+cJc0vqTh/8MezmtuFAbfMgqloAjLZl8="; + vendorSha256 = "sha256-y8DRrthaUzMKxFbdbASvqsRMT+jex7jMJA6g7YF/VxI="; doCheck = false; From ccde7caf974ad93e9f8e8eb2b11af924781371e2 Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Sat, 8 May 2021 16:32:24 +0200 Subject: [PATCH 045/213] haskellPackages.science-constants-dimensional: patch dependency requirements dimensional<=1.3 -> 1.4 https://hackage.haskell.org/package/dimensional-1.4/changelog Looks safe to loosen package dependency requirements https://github.com/enomsg/science-constants-dimensional/pull/1 ZHF: #122042 --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 05687771243..3a9f697a1fd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1901,4 +1901,12 @@ self: super: { sha256 = "10npa8nh2413n6p6qld795qfkbld08icm02bspmk93y0kabpgmgm"; }); + # Too strict bounds on ref-tf + # https://github.com/travitch/haggle/issues/4 + haggle = doJailbreak super.haggle; + + # Too strict bounds on dimensional + # https://github.com/enomsg/science-constants-dimensional/pull/1 + science-constants-dimensional = doJailbreak super.science-constants-dimensional; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 632c9c3b3a17972632eb59c4b9b453d11489d606 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 8 May 2021 18:11:58 +0200 Subject: [PATCH 046/213] haskellPackages.haggle: remove unnecessary override again Accidentally reintroduced it when merging ccde7caf974ad93e9f8e8eb2b11af924781371e2. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3a9f697a1fd..de2df666ed1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1901,10 +1901,6 @@ self: super: { sha256 = "10npa8nh2413n6p6qld795qfkbld08icm02bspmk93y0kabpgmgm"; }); - # Too strict bounds on ref-tf - # https://github.com/travitch/haggle/issues/4 - haggle = doJailbreak super.haggle; - # Too strict bounds on dimensional # https://github.com/enomsg/science-constants-dimensional/pull/1 science-constants-dimensional = doJailbreak super.science-constants-dimensional; From df5b6c61ec6494d6488b9ceba7e44f1b50a503ad Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 8 May 2021 18:27:47 +0200 Subject: [PATCH 047/213] top-level/release-haskell.nix: merge jobs using lib.recursiveUpdate We have different attribute sets defining jobs: The list of base jobs, the ones generated by versionedCompilerJobs and our added aggregate jobs. During this we define `haskell` twice: Once for `haskell.compiler` and once for `haskell.packages.*`. The `//` operator throws a way the former which is fixed by using lib.recursiveUpdate. Unfortunately makes the expression less pretty, but at least we have our compiler jobs back. --- pkgs/top-level/release-haskell.nix | 370 +++++++++++++++-------------- 1 file changed, 188 insertions(+), 182 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 1c3389c24d1..0fe5f730dc2 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -75,191 +75,197 @@ let _: v: builtins.length (v.meta.maintainers or []) > 0 ) set); - jobs = mapTestOn { - haskellPackages = packagePlatforms pkgs.haskellPackages; - haskell.compiler = packagePlatforms pkgs.haskell.compiler; + recursiveUpdateMany = builtins.foldl' lib.recursiveUpdate {}; - tests = let - testPlatforms = packagePlatforms pkgs.tests; - in { - haskell = testPlatforms.haskell; - writers = testPlatforms.writers; - }; + jobs = mapTestOn (recursiveUpdateMany [ + { + haskellPackages = packagePlatforms pkgs.haskellPackages; + haskell.compiler = packagePlatforms pkgs.haskell.compiler; - # top-level packages that depend on haskellPackages - inherit (pkgsPlatforms) - agda - arion - bench - bustle - blucontrol - cabal-install - cabal2nix - cachix - carp - cedille - client-ip-echo - darcs - dconf2nix - dhall - dhall-bash - dhall-docs - dhall-lsp-server - dhall-json - dhall-nix - dhall-text - diagrams-builder - elm2nix - fffuu - futhark - ghcid - git-annex - git-brunch - gitit - glirc - hadolint - haskell-ci - haskell-language-server - hasura-graphql-engine - hci - hercules-ci-agent - hinit - hedgewars - hledger - hledger-iadd - hledger-interest - hledger-ui - hledger-web - hlint - hpack - hyper-haskell - hyper-haskell-server-with-packages - icepeak - idris - ihaskell - jl - koka - krank - lambdabot - ldgallery - madlang - matterhorn - mueval - neuron-notes - niv - nix-delegate - nix-deploy - nix-diff - nix-linter - nix-output-monitor - nix-script - nix-tree - nixfmt - nota - ormolu - pandoc - pakcs - petrinizer - place-cursor-at - pinboard-notes-backup - pretty-simple - shake - shellcheck - sourceAndTags - spacecookie - spago - splot - stack - stack2nix - stutter - stylish-haskell - taffybar - tamarin-prover - taskell - termonad-with-packages - tldr-hs - tweet-hs - update-nix-fetchgit - uqm - uuagc - vaultenv - wstunnel - xmobar - xmonad-with-packages - yi - zsh-git-prompt - ; - - elmPackages.elm = pkgsPlatforms.elmPackages.elm; - } // versionedCompilerJobs { - # Packages which should be checked on more than the - # default GHC version. This list can be used to test - # the state of the package set with newer compilers - # and to confirm that critical packages for the - # package sets (like Cabal, jailbreak-cabal) are - # working as expected. - cabal-install = all; - Cabal_3_4_0_0 = with compilerNames; [ ghc884 ghc8104 ]; - funcmp = all; - haskell-language-server = all; - hoogle = all; - hsdns = all; - jailbreak-cabal = all; - language-nix = all; - nix-paths = all; - titlecase = all; - } // { - mergeable = pkgs.releaseTools.aggregate { - name = "haskell-updates-mergeable"; - meta = { - description = '' - Critical haskell packages that should work at all times, - serves as minimum requirement for an update merge - ''; - maintainers = lib.teams.haskell.members; + tests = let + testPlatforms = packagePlatforms pkgs.tests; + in { + haskell = testPlatforms.haskell; + writers = testPlatforms.writers; }; - constituents = accumulateDerivations [ - # haskell specific tests - jobs.tests.haskell - jobs.tests.writers # writeHaskell{,Bin} - # important top-level packages - jobs.cabal-install - jobs.cabal2nix - jobs.cachix - jobs.darcs - jobs.haskell-language-server - jobs.hledger - jobs.hledger-ui - jobs.hpack - jobs.niv - jobs.pandoc - jobs.stack - jobs.stylish-haskell - # important haskell (library) packages - jobs.haskellPackages.cabal-plan - jobs.haskellPackages.distribution-nixpkgs - jobs.haskellPackages.hackage-db - jobs.haskellPackages.policeman - jobs.haskellPackages.xmonad - jobs.haskellPackages.xmonad-contrib - # haskell packages maintained by @peti - # imported from the old hydra jobset - jobs.haskellPackages.hopenssl - jobs.haskellPackages.hsemail - jobs.haskellPackages.hsyslog - ]; - }; - maintained = pkgs.releaseTools.aggregate { - name = "maintained-haskell-packages"; - meta = { - description = "Aggregate jobset of all haskell packages with a maintainer"; - maintainers = lib.teams.haskell.members; + + # top-level packages that depend on haskellPackages + inherit (pkgsPlatforms) + agda + arion + bench + bustle + blucontrol + cabal-install + cabal2nix + cachix + carp + cedille + client-ip-echo + darcs + dconf2nix + dhall + dhall-bash + dhall-docs + dhall-lsp-server + dhall-json + dhall-nix + dhall-text + diagrams-builder + elm2nix + fffuu + futhark + ghcid + git-annex + git-brunch + gitit + glirc + hadolint + haskell-ci + haskell-language-server + hasura-graphql-engine + hci + hercules-ci-agent + hinit + hedgewars + hledger + hledger-iadd + hledger-interest + hledger-ui + hledger-web + hlint + hpack + hyper-haskell + hyper-haskell-server-with-packages + icepeak + idris + ihaskell + jl + koka + krank + lambdabot + ldgallery + madlang + matterhorn + mueval + neuron-notes + niv + nix-delegate + nix-deploy + nix-diff + nix-linter + nix-output-monitor + nix-script + nix-tree + nixfmt + nota + ormolu + pandoc + pakcs + petrinizer + place-cursor-at + pinboard-notes-backup + pretty-simple + shake + shellcheck + sourceAndTags + spacecookie + spago + splot + stack + stack2nix + stutter + stylish-haskell + taffybar + tamarin-prover + taskell + termonad-with-packages + tldr-hs + tweet-hs + update-nix-fetchgit + uqm + uuagc + vaultenv + wstunnel + xmobar + xmonad-with-packages + yi + zsh-git-prompt + ; + + elmPackages.elm = pkgsPlatforms.elmPackages.elm; + } + (versionedCompilerJobs { + # Packages which should be checked on more than the + # default GHC version. This list can be used to test + # the state of the package set with newer compilers + # and to confirm that critical packages for the + # package sets (like Cabal, jailbreak-cabal) are + # working as expected. + cabal-install = all; + Cabal_3_4_0_0 = with compilerNames; [ ghc884 ghc8104 ]; + funcmp = all; + haskell-language-server = all; + hoogle = all; + hsdns = all; + jailbreak-cabal = all; + language-nix = all; + nix-paths = all; + titlecase = all; + }) + { + mergeable = pkgs.releaseTools.aggregate { + name = "haskell-updates-mergeable"; + meta = { + description = '' + Critical haskell packages that should work at all times, + serves as minimum requirement for an update merge + ''; + maintainers = lib.teams.haskell.members; + }; + constituents = accumulateDerivations [ + # haskell specific tests + jobs.tests.haskell + jobs.tests.writers # writeHaskell{,Bin} + # important top-level packages + jobs.cabal-install + jobs.cabal2nix + jobs.cachix + jobs.darcs + jobs.haskell-language-server + jobs.hledger + jobs.hledger-ui + jobs.hpack + jobs.niv + jobs.pandoc + jobs.stack + jobs.stylish-haskell + # important haskell (library) packages + jobs.haskellPackages.cabal-plan + jobs.haskellPackages.distribution-nixpkgs + jobs.haskellPackages.hackage-db + jobs.haskellPackages.policeman + jobs.haskellPackages.xmonad + jobs.haskellPackages.xmonad-contrib + # haskell packages maintained by @peti + # imported from the old hydra jobset + jobs.haskellPackages.hopenssl + jobs.haskellPackages.hsemail + jobs.haskellPackages.hsyslog + ]; }; - constituents = accumulateDerivations - (builtins.map - (name: jobs.haskellPackages."${name}") - (maintainedPkgNames pkgs.haskellPackages)); - }; - }; + maintained = pkgs.releaseTools.aggregate { + name = "maintained-haskell-packages"; + meta = { + description = "Aggregate jobset of all haskell packages with a maintainer"; + maintainers = lib.teams.haskell.members; + }; + constituents = accumulateDerivations + (builtins.map + (name: jobs.haskellPackages."${name}") + (maintainedPkgNames pkgs.haskellPackages)); + }; + } + ]); in jobs From 9c2024ce48b43a5e4a011fd9800441e35cf78629 Mon Sep 17 00:00:00 2001 From: Andy Tockman Date: Sat, 8 May 2021 12:32:17 -0400 Subject: [PATCH 048/213] ipbt: 20190601.d1519e0 -> 20210215.5a9cb02 --- pkgs/tools/misc/ipbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ipbt/default.nix b/pkgs/tools/misc/ipbt/default.nix index 8ee6bb5addb..25dad59c9fe 100644 --- a/pkgs/tools/misc/ipbt/default.nix +++ b/pkgs/tools/misc/ipbt/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, perl, ncurses }: stdenv.mkDerivation rec { - version = "20190601.d1519e0"; + version = "20210215.5a9cb02"; pname = "ipbt"; src = fetchurl { url = "https://www.chiark.greenend.org.uk/~sgtatham/ipbt/ipbt-${version}.tar.gz"; - sha256 = "1aj8pajdd81vq2qw6vzfm27i0aj8vfz9m7k3sda30pnsrizm06d5"; + sha256 = "0w6blpv22jjivzr58y440zv6djvi5iccdmj4y2md52fbpjngmsha"; }; nativeBuildInputs = [ perl ]; From a7c7169aea1bdd08e5a6309be0a5d6babf4debd0 Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Sat, 8 May 2021 20:35:47 +0530 Subject: [PATCH 049/213] xplr: 0.5.12 -> 0.7.2 --- pkgs/applications/misc/xplr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index bcb5beff287..8a8d2b071d0 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -1,17 +1,17 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "xplr"; - version = "0.5.12"; + pname = "xplr"; + version = "0.7.2"; src = fetchFromGitHub { owner = "sayanarijit"; - repo = name; + repo = pname; rev = "v${version}"; - sha256 = "0dmqa56sxyvrq03rpf9yczp75zk44s79ilz6kbykdghp0d9lyldf"; + sha256 = "1mqxnahhbf394niyc8i6gk2y3i7lj9cj71k460r58cmir5fch82m"; }; - cargoSha256 = "1mb1rfax91cbi2wvshl8jsfykx9kfwff8fkqa7rc4plqxnz0qxkx"; + cargoSha256 = "1dfcmkfclkq5b103jl98yalcl3mnvsq8xpkdasf72d3wgzarih16"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; From b71c393841998fc35d4a7281ad6885642c599c62 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 8 May 2021 13:45:21 +0200 Subject: [PATCH 050/213] haskellPackages.hashable: remove arm override The linked issue has been fixed upstream and has been released in 1.3.0.0 which we have in haskellPackages at the moment. --- pkgs/development/haskell-modules/configuration-common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index de2df666ed1..f6d66c960a3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -854,7 +854,6 @@ self: super: { # aarch64 and armv7l fixes. happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 - hashable = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 servant-docs = let f = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) From e155ff4a7fa924138f59f49ecae1f11e75cb7fb2 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 8 May 2021 00:35:26 +0200 Subject: [PATCH 051/213] haskellPackages: disable more failing doctests on aarch64 --- .../haskell-modules/configuration-common.nix | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f6d66c960a3..8637de9495f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1885,6 +1885,48 @@ self: super: { vinyl = overrideCabal super.vinyl { doCheck = !pkgs.stdenv.hostPlatform.isAarch64; }; + BNFC = overrideCabal super.BNFC { + doCheck = !pkgs.stdenv.hostPlatform.isAarch64; + }; + C-structs = overrideCabal super.C-structs { + doCheck = !pkgs.stdenv.hostPlatform.isAarch64; + }; + accelerate = overrideCabal super.accelerate { + doCheck = !pkgs.stdenv.hostPlatform.isAarch64; + }; + focuslist = overrideCabal super.focuslist { + doCheck = !pkgs.stdenv.hostPlatform.isAarch64; + }; + flight-kml = overrideCabal super.flight-kml { + doCheck = !pkgs.stdenv.hostPlatform.isAarch64; + }; + exact-real = overrideCabal super.exact-real { + doCheck = !pkgs.stdenv.hostPlatform.isAarch64; + }; + autoapply = overrideCabal super.autoapply { + doCheck = !pkgs.stdenv.hostPlatform.isAarch64; + }; + hint = overrideCabal super.hint { + doCheck = !pkgs.stdenv.hostPlatform.isAarch64; + }; + hgeometry = overrideCabal super.hgeometry { + doCheck = !pkgs.stdenv.hostPlatform.isAarch64; + }; + headroom = overrideCabal super.headroom { + doCheck = !pkgs.stdenv.hostPlatform.isAarch64; + }; + haskell-time-range = overrideCabal super.haskell-time-range { + doCheck = !pkgs.stdenv.hostPlatform.isAarch64; + }; + hsakamai = overrideCabal super.hsakamai { + doCheck = !pkgs.stdenv.hostPlatform.isAarch64; + }; + hsemail-ns = overrideCabal super.hsemail-ns { + doCheck = !pkgs.stdenv.hostPlatform.isAarch64; + }; + openapi3 = overrideCabal super.openapi3 { + doCheck = !pkgs.stdenv.hostPlatform.isAarch64; + }; # Tests need to lookup target triple x86_64-unknown-linux # https://github.com/llvm-hs/llvm-hs/issues/334 From 0340cd2abe6ff967e563ead467455ffa396ffb62 Mon Sep 17 00:00:00 2001 From: Marc 'risson' Schmitt Date: Thu, 6 May 2021 16:12:55 +0200 Subject: [PATCH 052/213] nixos/unbound: allow list of strings in top-level settings option type Signed-off-by: Marc 'risson' Schmitt --- nixos/modules/services/networking/unbound.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index a8747e244a9..09aef9a1dcf 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -102,8 +102,8 @@ in { freeformType = let validSettingsPrimitiveTypes = oneOf [ int str bool float ]; validSettingsTypes = oneOf [ validSettingsPrimitiveTypes (listOf validSettingsPrimitiveTypes) ]; - settingsType = (attrsOf validSettingsTypes); - in attrsOf (oneOf [ string settingsType (listOf settingsType) ]) + settingsType = oneOf [ str (attrsOf validSettingsTypes) ]; + in attrsOf (oneOf [ settingsType (listOf settingsType) ]) // { description = '' unbound.conf configuration type. The format consist of an attribute set of settings. Each settings can be either one value, a list of From 8cca9b16342885a32a2fa8be4d9412b2e94749bb Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 7 May 2021 19:25:35 +0200 Subject: [PATCH 053/213] haskell.packages: refactor set setup using composeManyExtensions --- pkgs/development/haskell-modules/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index a4f0399cf3c..61c79748866 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -19,17 +19,16 @@ let inherit stdenv haskellLib ghc buildHaskellPackages extensible-self all-cabal-hashes; }; - commonConfiguration = configurationCommon { inherit pkgs haskellLib; }; - nixConfiguration = configurationNix { inherit pkgs haskellLib; }; + extensions = lib.composeManyExtensions [ + nonHackagePackages + (configurationNix { inherit pkgs haskellLib; }) + (configurationCommon { inherit pkgs haskellLib; }) + compilerConfig + packageSetConfig + overrides + ]; - extensible-self = makeExtensible - (extends overrides - (extends packageSetConfig - (extends compilerConfig - (extends commonConfiguration - (extends nixConfiguration - (extends nonHackagePackages - haskellPackages)))))); + extensible-self = makeExtensible (extends extensions haskellPackages); in From b47b2f5ab791d99eebdd8e88352575b52aebb80c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 8 May 2021 13:55:59 +0200 Subject: [PATCH 054/213] haskell.packages: move arm specific overrides into dedicated config This should clean up configuration-common.nix of a lot of conditional which were a pain to write and maintain. --- .../haskell-modules/configuration-arm.nix | 71 +++++++++++++++++++ .../haskell-modules/configuration-common.nix | 69 +----------------- pkgs/development/haskell-modules/default.nix | 11 ++- 3 files changed, 82 insertions(+), 69 deletions(-) create mode 100644 pkgs/development/haskell-modules/configuration-arm.nix diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix new file mode 100644 index 00000000000..bcbf3254053 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -0,0 +1,71 @@ +# ARM-SPECIFIC OVERRIDES FOR THE HASKELL PACKAGE SET IN NIXPKGS +# +# This extension is applied to all haskell package sets in nixpkgs +# if `stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64` +# to apply arm specific workarounds or fixes. +# +# The file is split into three parts: +# +# * Overrides that are applied for all arm platforms +# * Overrides for aarch32 platforms +# * Overrides for aarch64 platforms +# +# This may be extended in the future to also include compiler- +# specific sections as compiler and linker related bugs may +# get fixed subsequently. +# +# When adding new overrides, try to research which section they +# belong into. Most likely we'll be favouring aarch64 overrides +# in practice since that is the only platform we can test on +# Hydra. Also take care to group overrides by the issue they +# solve, so refactors and updates to this file are less tedious. +{ pkgs, haskellLib }: + +let + inherit (pkgs) lib; +in + +with haskellLib; + +self: super: { + # COMMON ARM OVERRIDES + + # moved here from configuration-common.nix, no reason given. + servant-docs = dontCheck super.servant-docs; + swagger2 = dontHaddock (dontCheck super.swagger2); + + # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 + happy = dontCheck super.happy; + +} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 { + # AARCH64-SPECIFIC OVERRIDES + + # Doctests fail on aarch64 due to a GHCi linking bug + # https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295437 + # TODO: figure out if needed on aarch32 as well + language-nix = dontCheck super.language-nix; + trifecta = dontCheck super.trifecta; + ad = dontCheck super.ad; + vinyl = dontCheck super.vinyl; + BNFC = dontCheck super.BNFC; + C-structs = dontCheck super.C-structs; + accelerate = dontCheck super.accelerate; + focuslist = dontCheck super.focuslist; + flight-kml = dontCheck super.flight-kml; + exact-real = dontCheck super.exact-real; + autoapply = dontCheck super.autoapply; + hint = dontCheck super.hint; + hgeometry = dontCheck super.hgeometry; + headroom = dontCheck super.headroom; + haskell-time-range = dontCheck super.haskell-time-range; + hsakamai = dontCheck super.hsakamai; + hsemail-ns = dontCheck super.hsemail-ns; + openapi3 = dontCheck super.openapi3; + + # https://github.com/ekmett/half/issues/35 + half = dontCheck super.half; + +} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch32 { + # AARCH32-SPECIFIC OVERRIDES + +} diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8637de9495f..9c60be7d64e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -307,7 +307,6 @@ self: super: { integer-roots = dontCheck super.integer-roots; # requires an old version of smallcheck, will be fixed in > 1.0 itanium-abi = dontCheck super.itanium-abi; katt = dontCheck super.katt; - language-nix = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.hostPlatform.isi686) then dontCheck super.language-nix else super.language-nix; # aarch64: https://ghc.haskell.org/trac/ghc/ticket/15275 language-slice = dontCheck super.language-slice; ldap-client = dontCheck super.ldap-client; lensref = dontCheck super.lensref; @@ -852,16 +851,9 @@ self: super: { configureFlags = ["--ghc-option=-DU_DEFINE_FALSE_AND_TRUE=1"]; # https://github.com/haskell/text-icu/issues/49 }); - # aarch64 and armv7l fixes. - happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 - servant-docs = - let - f = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) - then dontCheck - else pkgs.lib.id; - in doJailbreak (f super.servant-docs); # jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage. + # jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage. + servant-docs = doJailbreak super.servant-docs; snap-templates = doJailbreak super.snap-templates; # https://github.com/snapframework/snap-templates/issues/22 - swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; # hledger-lib requires the latest version of pretty-simple hledger-lib = appendPatch super.hledger-lib @@ -1526,11 +1518,6 @@ self: super: { # Due to tests restricting base in 0.8.0.0 release http-media = doJailbreak super.http-media; - # https://github.com/ekmett/half/issues/35 - half = if pkgs.stdenv.isAarch64 - then dontCheck super.half - else super.half; - # 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124 heist = doJailbreak super.heist; @@ -1876,58 +1863,6 @@ self: super: { '' + (drv.postPatch or ""); }); - # Doctests fail on aarch64 due to a GHCi linking bug - # https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295437 - ad = overrideCabal super.ad { - doCheck = !pkgs.stdenv.hostPlatform.isAarch64; - }; - trifecta = if pkgs.stdenv.hostPlatform.isAarch64 then dontCheck super.trifecta else super.trifecta; - vinyl = overrideCabal super.vinyl { - doCheck = !pkgs.stdenv.hostPlatform.isAarch64; - }; - BNFC = overrideCabal super.BNFC { - doCheck = !pkgs.stdenv.hostPlatform.isAarch64; - }; - C-structs = overrideCabal super.C-structs { - doCheck = !pkgs.stdenv.hostPlatform.isAarch64; - }; - accelerate = overrideCabal super.accelerate { - doCheck = !pkgs.stdenv.hostPlatform.isAarch64; - }; - focuslist = overrideCabal super.focuslist { - doCheck = !pkgs.stdenv.hostPlatform.isAarch64; - }; - flight-kml = overrideCabal super.flight-kml { - doCheck = !pkgs.stdenv.hostPlatform.isAarch64; - }; - exact-real = overrideCabal super.exact-real { - doCheck = !pkgs.stdenv.hostPlatform.isAarch64; - }; - autoapply = overrideCabal super.autoapply { - doCheck = !pkgs.stdenv.hostPlatform.isAarch64; - }; - hint = overrideCabal super.hint { - doCheck = !pkgs.stdenv.hostPlatform.isAarch64; - }; - hgeometry = overrideCabal super.hgeometry { - doCheck = !pkgs.stdenv.hostPlatform.isAarch64; - }; - headroom = overrideCabal super.headroom { - doCheck = !pkgs.stdenv.hostPlatform.isAarch64; - }; - haskell-time-range = overrideCabal super.haskell-time-range { - doCheck = !pkgs.stdenv.hostPlatform.isAarch64; - }; - hsakamai = overrideCabal super.hsakamai { - doCheck = !pkgs.stdenv.hostPlatform.isAarch64; - }; - hsemail-ns = overrideCabal super.hsemail-ns { - doCheck = !pkgs.stdenv.hostPlatform.isAarch64; - }; - openapi3 = overrideCabal super.openapi3 { - doCheck = !pkgs.stdenv.hostPlatform.isAarch64; - }; - # Tests need to lookup target triple x86_64-unknown-linux # https://github.com/llvm-hs/llvm-hs/issues/334 llvm-hs = overrideCabal super.llvm-hs { diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 61c79748866..d4430f7a9f1 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -7,6 +7,7 @@ , nonHackagePackages ? import ./non-hackage-packages.nix , configurationCommon ? import ./configuration-common.nix , configurationNix ? import ./configuration-nix.nix +, configurationArm ? import ./configuration-arm.nix }: let @@ -19,14 +20,20 @@ let inherit stdenv haskellLib ghc buildHaskellPackages extensible-self all-cabal-hashes; }; - extensions = lib.composeManyExtensions [ + isArm = with stdenv.hostPlatform; isAarch64 || isAarch32; + platformConfigurations = lib.optionals isArm [ + (configurationArm { inherit pkgs haskellLib; }) + ]; + + extensions = lib.composeManyExtensions ([ nonHackagePackages (configurationNix { inherit pkgs haskellLib; }) (configurationCommon { inherit pkgs haskellLib; }) + ] ++ platformConfigurations ++ [ compilerConfig packageSetConfig overrides - ]; + ]); extensible-self = makeExtensible (extends extensions haskellPackages); From 312d3bf74b2c76bb3c20a2a00bc4f0abfd014938 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 8 May 2021 17:32:54 +0200 Subject: [PATCH 055/213] haskell.packages: move darwin-specific overrides into their own config --- .../haskell-modules/configuration-common.nix | 47 +---- .../haskell-modules/configuration-darwin.nix | 164 ++++++++++++++++++ .../haskell-modules/configuration-nix.nix | 135 +------------- pkgs/development/haskell-modules/default.nix | 3 + 4 files changed, 173 insertions(+), 176 deletions(-) create mode 100644 pkgs/development/haskell-modules/configuration-darwin.nix diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9c60be7d64e..53c2097b060 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -75,10 +75,6 @@ self: super: { # Fix test trying to access /home directory shell-conduit = overrideCabal super.shell-conduit (drv: { postPatch = "sed -i s/home/tmp/ test/Spec.hs"; - - # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo - # see: https://github.com/psibi/shell-conduit/issues/12 - doCheck = !pkgs.stdenv.isDarwin; }); # https://github.com/froozen/kademlia/issues/2 @@ -117,15 +113,6 @@ self: super: { # Jailbreak is necessary for QuickCheck dependency. vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector); - conduit-extra = if pkgs.stdenv.isDarwin - then super.conduit-extra.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; }) - else super.conduit-extra; - - # Fix Darwin build. - halive = if pkgs.stdenv.isDarwin - then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit - else super.halive; - # Test suite fails due golden tests checking text representation # of normalized dhall expressions, and newer dhall versions format # differently. @@ -134,19 +121,6 @@ self: super: { then throw "Drop dontCheck override for hpack-dhall > 0.5.2" else dontCheck super.hpack-dhall; - barbly = addBuildDepend super.barbly pkgs.darwin.apple_sdk.frameworks.AppKit; - - # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux - hakyll = if pkgs.stdenv.isDarwin - then dontCheck (overrideCabal super.hakyll (drv: { - testToolDepends = []; - })) - else super.hakyll; - - double-conversion = if !pkgs.stdenv.isDarwin - then super.double-conversion - else addExtraLibrary super.double-conversion pkgs.libcxx; - inline-c-cpp = overrideCabal super.inline-c-cpp (drv: { postPatch = (drv.postPatch or "") + '' substituteInPlace inline-c-cpp.cabal --replace "-optc-std=c++11" "" @@ -311,18 +285,12 @@ self: super: { ldap-client = dontCheck super.ldap-client; lensref = dontCheck super.lensref; lvmrun = disableHardening (dontCheck super.lvmrun) ["format"]; - math-functions = if pkgs.stdenv.isDarwin - then dontCheck super.math-functions # "erf table" test fails on Darwin https://github.com/bos/math-functions/issues/63 - else super.math-functions; matplotlib = dontCheck super.matplotlib; # https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage matterhorn = doJailbreak super.matterhorn; # this is needed until the end of time :') memcache = dontCheck super.memcache; metrics = dontCheck super.metrics; milena = dontCheck super.milena; - mockery = if pkgs.stdenv.isDarwin - then overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; }) # darwin doesn't have sub-second resolution https://github.com/hspec/mockery/issues/11 - else super.mockery; modular-arithmetic = dontCheck super.modular-arithmetic; # tests require a very old Glob (0.7.*) nats-queue = dontCheck super.nats-queue; netpbm = dontCheck super.netpbm; @@ -463,9 +431,8 @@ self: super: { # https://github.com/andrewthad/haskell-ip/issues/67 ip = dontCheck super.ip; - # https://github.com/ndmitchell/shake/issues/206 - # https://github.com/ndmitchell/shake/issues/267 - shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin && false; }); + # https://github.com/ndmitchell/shake/issues/804 + shake = dontCheck super.shake; # https://github.com/nushio3/doctest-prop/issues/1 doctest-prop = dontCheck super.doctest-prop; @@ -840,7 +807,6 @@ self: super: { # With ghc-8.2.x haddock would time out for unknown reason # See https://github.com/haskell/haddock/issues/679 language-puppet = dontHaddock super.language-puppet; - filecache = overrideCabal super.filecache (drv: { doCheck = !pkgs.stdenv.isDarwin; }); # https://github.com/alphaHeavy/protobuf/issues/34 protobuf = dontCheck super.protobuf; @@ -1155,11 +1121,6 @@ self: super: { ''; }); - # gtk/gtk3 needs to be told on Darwin to use the Quartz - # rather than X11 backend (see eg https://github.com/gtk2hs/gtk2hs/issues/249). - gtk3 = appendConfigureFlags super.gtk3 (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk"); - gtk = appendConfigureFlags super.gtk (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk"); - # Chart-tests needs and compiles some modules from Chart itself Chart-tests = (addExtraLibrary super.Chart-tests self.QuickCheck).overrideAttrs (old: { preCheck = old.postPatch or "" + '' @@ -1572,10 +1533,6 @@ self: super: { # https://github.com/yesodweb/yesod/issues/1714 yesod-core = dontCheck super.yesod-core; - # Add ApplicationServices on darwin - apecs-physics = addPkgconfigDepends super.apecs-physics - (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.ApplicationServices); - # Break out of overspecified constraint on QuickCheck. algebraic-graphs = dontCheck super.algebraic-graphs; attoparsec = doJailbreak super.attoparsec; # https://github.com/haskell/attoparsec/pull/168 diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix new file mode 100644 index 00000000000..6768bc5d6b4 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -0,0 +1,164 @@ +# DARWIN-SPECIFIC OVERRIDES FOR THE HASKELL PACKAGE SET IN NIXPKGS + +{ pkgs, haskellLib }: + +let + inherit (pkgs) lib darwin; +in + +with haskellLib; + +self: super: { + + # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo + # see: https://github.com/psibi/shell-conduit/issues/12 + shell-conduit = dontCheck super.shell-conduit; + + conduit-extra = super.conduit-extra.overrideAttrs (drv: { + __darwinAllowLocalNetworking = true; + }); + + halive = addBuildDepend super.halive darwin.apple_sdk.frameworks.AppKit; + + # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux + hakyll = overrideCabal super.hakyll { + testToolDepends = []; + doCheck = false; + }; + + barbly = addBuildDepend super.barbly darwin.apple_sdk.frameworks.AppKit; + + double-conversion = addExtraLibrary super.double-conversion pkgs.libcxx; + + apecs-physics = addPkgconfigDepends super.apecs-physics [ + darwin.apple_sdk.frameworks.ApplicationServices + ]; + + # "erf table" test fails on Darwin + # https://github.com/bos/math-functions/issues/63 + math-functions = dontCheck super.math-functions; + + # darwin doesn't have sub-second resolution + # https://github.com/hspec/mockery/issues/11 + mockery = overrideCabal super.mockery (drv: { + preCheck = '' + export TRAVIS=true + '' + (drv.preCheck or ""); + }); + + # https://github.com/ndmitchell/shake/issues/206 + shake = dontCheck super.shake; + + filecache = dontCheck super.filecache; + + # gtk/gtk3 needs to be told on Darwin to use the Quartz + # rather than X11 backend (see eg https://github.com/gtk2hs/gtk2hs/issues/249). + gtk3 = appendConfigureFlag super.gtk3 "-f have-quartz-gtk"; + gtk = appendConfigureFlag super.gtk "-f have-quartz-gtk"; + + OpenAL = addExtraLibrary super.OpenAL darwin.apple_sdk.frameworks.OpenAL; + + proteaaudio = addExtraLibrary super.proteaaudio darwin.apple_sdk.frameworks.AudioToolbox; + + # the system-fileio tests use canonicalizePath, which fails in the sandbox + system-fileio = dontCheck super.system-fileio; + + # Prevents needing to add `security_tool` as a run-time dependency for + # everything using x509-system to give access to the `security` executable. + # + # darwin.security_tool is broken in Mojave (#45042) + # + # We will use the system provided security for now. + # Beware this WILL break in sandboxes! + # + # TODO(matthewbauer): If someone really needs this to work in sandboxes, + # I think we can add a propagatedImpureHost dep here, but I’m hoping to + # get a proper fix available soonish. + x509-system = overrideCabal super.x509-system (drv: + lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) { + postPatch = '' + substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security + '' + (drv.postPatch or ""); + }); + + # https://github.com/haskell-foundation/foundation/pull/412 + foundation = dontCheck super.foundation; + + llvm-hs = overrideCabal super.llvm-hs (oldAttrs: { + # One test fails on darwin. + doCheck = false; + # llvm-hs's Setup.hs file tries to add the lib/ directory from LLVM8 to + # the DYLD_LIBRARY_PATH environment variable. This messes up clang + # when called from GHC, probably because clang is version 7, but we are + # using LLVM8. + preCompileBuildDriver = '' + substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()" + '' + (oldAttrs.preCompileBuildDriver or ""); + }); + + yesod-bin = addBuildDepend super.yesod-bin darwin.apple_sdk.frameworks.Cocoa; + + hmatrix = addBuildDepend super.hmatrix darwin.apple_sdk.frameworks.Accelerate; + + # Ensure the necessary frameworks are propagatedBuildInputs on darwin + OpenGLRaw = overrideCabal super.OpenGLRaw (drv: { + librarySystemDepends = []; + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ + darwin.apple_sdk.frameworks.OpenGL + ]; + preConfigure = '' + frameworkPaths=($(for i in $nativeBuildInputs; do if [ -d "$i"/Library/Frameworks ]; then echo "-F$i/Library/Frameworks"; fi done)) + frameworkPaths=$(IFS=, ; echo "''${frameworkPaths[@]}") + configureFlags+=$(if [ -n "$frameworkPaths" ]; then echo -n "--ghc-options=-optl=$frameworkPaths"; fi) + '' + (drv.preConfigure or ""); + }); + GLURaw = overrideCabal super.GLURaw (drv: { + librarySystemDepends = []; + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ + darwin.apple_sdk.frameworks.OpenGL + ]; + }); + bindings-GLFW = overrideCabal super.bindings-GLFW (drv: { + librarySystemDepends = []; + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ + darwin.apple_sdk.frameworks.AGL + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.OpenGL + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.Kernel + darwin.apple_sdk.frameworks.CoreVideo + darwin.CF + ]; + }); + OpenCL = overrideCabal super.OpenCL (drv: { + librarySystemDepends = []; + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ + darwin.apple_sdk.frameworks.OpenCL + ]; + }); + + # cabal2nix likes to generate dependencies on hinotify when hfsevents is + # really required on darwin: https://github.com/NixOS/cabal2nix/issues/146. + hinotify = self.hfsevents; + + # FSEvents API is very buggy and tests are unreliable. See + # http://openradar.appspot.com/10207999 and similar issues. + fsnotify = addBuildDepend (dontCheck super.fsnotify) + darwin.apple_sdk.frameworks.Cocoa; + + FractalArt = overrideCabal super.FractalArt (drv: { + librarySystemDepends = [ + darwin.libobjc + darwin.apple_sdk.frameworks.AppKit + ] ++ (drv.librarySystemDepends or []); + }); + + arbtt = overrideCabal super.arbtt (drv: { + librarySystemDepends = [ + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.Carbon + darwin.apple_sdk.frameworks.IOKit + ] ++ (drv.librarySystemDepends or []); + }); + +} diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index d29105ac6a3..f804b8288bd 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -101,17 +101,6 @@ self: super: builtins.intersectAttrs super { ormolu = enableSeparateBinOutput super.ormolu; ghcid = enableSeparateBinOutput super.ghcid; - # Ensure the necessary frameworks for Darwin. - OpenAL = if pkgs.stdenv.isDarwin - then addExtraLibrary super.OpenAL pkgs.darwin.apple_sdk.frameworks.OpenAL - else super.OpenAL; - - # Ensure the necessary frameworks for Darwin. - proteaaudio = if pkgs.stdenv.isDarwin - then addExtraLibrary super.proteaaudio pkgs.darwin.apple_sdk.frameworks.AudioToolbox - else super.proteaaudio; - - hzk = overrideCabal super.hzk (drv: { preConfigure = "sed -i -e /include-dirs/d hzk.cabal"; configureFlags = [ "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper" ]; @@ -131,39 +120,11 @@ self: super: builtins.intersectAttrs super { # Foreign dependency name clashes with another Haskell package. libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; }; - # Fix Darwin build. - halive = if pkgs.stdenv.isDarwin - then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit - else super.halive; - # Heist's test suite requires system pandoc heist = overrideCabal super.heist (drv: { testToolDepends = [pkgs.pandoc]; }); - # the system-fileio tests use canonicalizePath, which fails in the sandbox - system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio; - - # Prevents needing to add `security_tool` as a run-time dependency for - # everything using x509-system to give access to the `security` executable. - x509-system = - if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc - then - # darwin.security_tool is broken in Mojave (#45042) - - # We will use the system provided security for now. - # Beware this WILL break in sandboxes! - - # TODO(matthewbauer): If someone really needs this to work in sandboxes, - # I think we can add a propagatedImpureHost dep here, but I’m hoping to - # get a proper fix available soonish. - overrideCabal super.x509-system (drv: { - postPatch = (drv.postPatch or "") + '' - substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security - ''; - }) - else super.x509-system; - # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216 gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"]; glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"]; @@ -266,12 +227,6 @@ self: super: builtins.intersectAttrs super { # /homeless-shelter. Disabled. purescript = dontCheck super.purescript; - # https://github.com/haskell-foundation/foundation/pull/412 - foundation = - if pkgs.stdenv.isDarwin - then dontCheck super.foundation - else super.foundation; - # Hardcoded include path poppler = overrideCabal super.poppler (drv: { postPatch = '' @@ -283,23 +238,7 @@ self: super: builtins.intersectAttrs super { # Uses OpenGL in testing caramia = dontCheck super.caramia; - llvm-hs = - let llvmHsWithLlvm9 = super.llvm-hs.override { llvm-config = pkgs.llvm_9; }; - in - if pkgs.stdenv.isDarwin - then - overrideCabal llvmHsWithLlvm9 (oldAttrs: { - # One test fails on darwin. - doCheck = false; - # llvm-hs's Setup.hs file tries to add the lib/ directory from LLVM8 to - # the DYLD_LIBRARY_PATH environment variable. This messes up clang - # when called from GHC, probably because clang is version 7, but we are - # using LLVM8. - preCompileBuildDriver = oldAttrs.preCompileBuildDriver or "" + '' - substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()" - ''; - }) - else llvmHsWithLlvm9; + llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_9; }; # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; @@ -322,14 +261,6 @@ self: super: builtins.intersectAttrs super { # Patch to consider NIX_GHC just like xmonad does dyre = appendPatch super.dyre ./patches/dyre-nix.patch; - yesod-bin = if pkgs.stdenv.isDarwin - then addBuildDepend super.yesod-bin pkgs.darwin.apple_sdk.frameworks.Cocoa - else super.yesod-bin; - - hmatrix = if pkgs.stdenv.isDarwin - then addBuildDepend super.hmatrix pkgs.darwin.apple_sdk.frameworks.Accelerate - else super.hmatrix; - # https://github.com/edwinb/EpiVM/issues/13 # https://github.com/edwinb/EpiVM/issues/14 epic = addExtraLibraries (addBuildTool super.epic self.buildHaskellPackages.happy) [pkgs.boehmgc pkgs.gmp]; @@ -405,43 +336,8 @@ self: super: builtins.intersectAttrs super { # Looks like Avahi provides the missing library dnssd = super.dnssd.override { dns_sd = pkgs.avahi.override { withLibdnssdCompat = true; }; }; - # Ensure the necessary frameworks are propagatedBuildInputs on darwin - OpenGLRaw = overrideCabal super.OpenGLRaw (drv: { - librarySystemDepends = - pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; - libraryHaskellDepends = drv.libraryHaskellDepends - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]; - preConfigure = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' - frameworkPaths=($(for i in $nativeBuildInputs; do if [ -d "$i"/Library/Frameworks ]; then echo "-F$i/Library/Frameworks"; fi done)) - frameworkPaths=$(IFS=, ; echo "''${frameworkPaths[@]}") - configureFlags+=$(if [ -n "$frameworkPaths" ]; then echo -n "--ghc-options=-optl=$frameworkPaths"; fi) - ''; - }); - GLURaw = overrideCabal super.GLURaw (drv: { - librarySystemDepends = - pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; - libraryHaskellDepends = drv.libraryHaskellDepends - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]; - }); - bindings-GLFW = overrideCabal super.bindings-GLFW (drv: { - doCheck = false; # requires an active X11 display - librarySystemDepends = - pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; - libraryHaskellDepends = drv.libraryHaskellDepends - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - (with pkgs.darwin.apple_sdk.frameworks; - [ AGL Cocoa OpenGL IOKit Kernel CoreVideo - pkgs.darwin.CF ]); - }); - OpenCL = overrideCabal super.OpenCL (drv: { - librarySystemDepends = - pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; - libraryHaskellDepends = drv.libraryHaskellDepends - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]; - }); + # requires an X11 display + bindings-GLFW = dontCheck super.bindings-GLFW; # requires an X11 display in test suite gi-gtk-declarative = dontCheck super.gi-gtk-declarative; @@ -474,16 +370,8 @@ self: super: builtins.intersectAttrs super { testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ]; }); - # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required - # on darwin: https://github.com/NixOS/cabal2nix/issues/146. - hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify; - - # FSEvents API is very buggy and tests are unreliable. See - # http://openradar.appspot.com/10207999 and similar issues. # https://github.com/haskell-fswatch/hfsnotify/issues/62 - fsnotify = if pkgs.stdenv.isDarwin - then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa - else dontCheck super.fsnotify; + fsnotify = dontCheck super.fsnotify; hidapi = addExtraLibrary super.hidapi pkgs.udev; @@ -844,21 +732,6 @@ self: super: builtins.intersectAttrs super { '' + (drv.postInstall or ""); }); - FractalArt = overrideCabal super.FractalArt (drv: { - librarySystemDepends = pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin [ - pkgs.darwin.libobjc - pkgs.darwin.apple_sdk.frameworks.AppKit - ] ++ (drv.librarySystemDepends or []); - }); - - arbtt = overrideCabal super.arbtt (drv: { - librarySystemDepends = pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin [ - pkgs.darwin.apple_sdk.frameworks.Foundation - pkgs.darwin.apple_sdk.frameworks.Carbon - pkgs.darwin.apple_sdk.frameworks.IOKit - ] ++ (drv.librarySystemDepends or []); - }); - # set more accurate set of platforms instead of maintaining # an ever growing list of platforms to exclude via unsupported-platforms cpuid = overrideCabal super.cpuid { diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index d4430f7a9f1..8392e751da2 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -8,6 +8,7 @@ , configurationCommon ? import ./configuration-common.nix , configurationNix ? import ./configuration-nix.nix , configurationArm ? import ./configuration-arm.nix +, configurationDarwin ? import ./configuration-darwin.nix }: let @@ -23,6 +24,8 @@ let isArm = with stdenv.hostPlatform; isAarch64 || isAarch32; platformConfigurations = lib.optionals isArm [ (configurationArm { inherit pkgs haskellLib; }) + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (configurationDarwin { inherit pkgs haskellLib; }) ]; extensions = lib.composeManyExtensions ([ From 9232dcb0e5e09b001be7a71638417ec344303a81 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 8 May 2021 17:36:40 +0200 Subject: [PATCH 056/213] haskellPackages.llvm-hs: note reason for llvm 9 pin --- pkgs/development/haskell-modules/configuration-nix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index f804b8288bd..c5d8b418b51 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -238,6 +238,7 @@ self: super: builtins.intersectAttrs super { # Uses OpenGL in testing caramia = dontCheck super.caramia; + # requires llvm 9 specifically https://github.com/llvm-hs/llvm-hs/#building-from-source llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_9; }; # Needs help finding LLVM. From 3b49d49bd2ee33d90cba888947a190871c0a7175 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 May 2021 20:20:41 +0200 Subject: [PATCH 057/213] python3Packages.python-vlc: 3.0.11115 -> 3.0.12118 --- .../python-modules/python-vlc/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/python-vlc/default.nix b/pkgs/development/python-modules/python-vlc/default.nix index 6f83f587f58..2690f8ea7eb 100644 --- a/pkgs/development/python-modules/python-vlc/default.nix +++ b/pkgs/development/python-modules/python-vlc/default.nix @@ -8,30 +8,33 @@ buildPythonPackage rec { pname = "python-vlc"; - version = "3.0.11115"; + version = "3.0.12118"; src = fetchPypi { inherit pname version; - sha256 = "a4d3bdddfce84a8fb1b2d5447193a0239c55c16ca246e5194d48efd59c4e236b"; + hash = "sha256-Vm8vfDA/aACFHKzAFt8cbu7AlK1j4KSdh9udaYCU8fs="; }; - propagatedBuildInputs = [ - setuptools - ]; - patches = [ + # Patch path for VLC (substituteAll { src = ./vlc-paths.patch; libvlcPath="${libvlc}/lib/libvlc.so.5"; }) ]; + propagatedBuildInputs = [ + setuptools + ]; + doCheck = false; # no tests + pythonImportsCheck = [ "vlc" ]; + meta = with lib; { - homepage = "https://wiki.videolan.org/PythonBinding"; - maintainers = with maintainers; [ tbenst ]; description = "Python bindings for VLC, the cross-platform multimedia player and framework"; + homepage = "https://wiki.videolan.org/PythonBinding"; license = licenses.lgpl21Plus; + maintainers = with maintainers; [ tbenst ]; }; } From 2ceafcc27ea25cf0904d10af69ba4bef5845dcdb Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Sat, 8 May 2021 19:21:11 +0200 Subject: [PATCH 058/213] filebot: fix source by using web archive --- pkgs/applications/video/filebot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index a9d56cc9108..92c15fea9a3 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { version = "4.9.3"; src = fetchurl { - url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; - sha256 = "sha256-xgdCjo2RLp+EtUTfSiys7PURhnC00R9IOLPtz3427pA="; + url = "https://web.archive.org/web/20210326102451/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; + sha256 = "sha256-T+y8k757/qFCVOCc/SNc7a+KmyscPlowubNQYzMr8jY="; }; unpackPhase = "tar xvf $src"; From 082acf6044007060e90f1d9d584ed7d97079ba17 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Sat, 8 May 2021 20:31:10 +0200 Subject: [PATCH 059/213] bitcoin-gold: 1.15.2 -> 1.17.3 --- pkgs/applications/blockchains/bitcoin-gold.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-gold.nix b/pkgs/applications/blockchains/bitcoin-gold.nix index 7ff2804ba79..5d6775f729a 100644 --- a/pkgs/applications/blockchains/bitcoin-gold.nix +++ b/pkgs/applications/blockchains/bitcoin-gold.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , openssl , boost +, libb2 , libevent , autoreconfHook , db4 @@ -21,13 +22,13 @@ with lib; stdenv.mkDerivation rec { pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold"; - version = "0.15.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "BTCGPU"; repo = "BTCGPU"; rev = "v${version}"; - sha256 = "0grd1cd8d2nsrxl27la85kcan09z73fn70ncr9km4iccaj5pg12h"; + sha256 = "sha256-1tFoUNsCPJkHSmNRl5gE3n2EQD6RZSry1zIM5hiTzEI="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { db4 zeromq libsodium + libb2 ] ++ optionals withGui [ qtbase qttools From 7e1c185f7b5b8be031ab54b505232cd6af08ff89 Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Sat, 8 May 2021 19:15:31 +0100 Subject: [PATCH 060/213] pythonPackages.eve: events>=0.3,<0.4 -> >=0.3,<0.5 --- pkgs/development/python-modules/eve/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 32f531e4ff5..89db1ccad28 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -27,6 +27,11 @@ buildPythonPackage rec { setuptools ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "events>=0.3,<0.4" "events>=0.3,<0.5" + ''; + pythonImportsCheck = [ "eve" ]; # tests call a running mongodb instance From 33886abdfeef8a9cb44c7b8c1d8b56385529fdc7 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sat, 8 May 2021 10:43:02 +0200 Subject: [PATCH 061/213] python3Packages.tls-parser: add imports check --- pkgs/development/python-modules/tls-parser/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/tls-parser/default.nix b/pkgs/development/python-modules/tls-parser/default.nix index 5b6bfe6a0e2..fa983be1b6f 100644 --- a/pkgs/development/python-modules/tls-parser/default.nix +++ b/pkgs/development/python-modules/tls-parser/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "tls_parser" ]; + meta = with lib; { homepage = "https://github.com/nabla-c0d3/tls_parser"; description = "Small library to parse TLS records"; From ebc050cb5e5d79e8e18a6aa549c539ce72735bf0 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sat, 8 May 2021 10:44:43 +0200 Subject: [PATCH 062/213] python3Packages.tls-parser: disable for Python < 3.7 --- pkgs/development/python-modules/tls-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tls-parser/default.nix b/pkgs/development/python-modules/tls-parser/default.nix index fa983be1b6f..ad35fe50128 100644 --- a/pkgs/development/python-modules/tls-parser/default.nix +++ b/pkgs/development/python-modules/tls-parser/default.nix @@ -1,5 +1,5 @@ { lib -, isPy27 +, pythonOlder , fetchFromGitHub , buildPythonPackage , pytestCheckHook @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "tls-parser"; version = "1.2.2"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; From 165c28d463f23526df3bc9deaf616e29094e32ad Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sat, 8 May 2021 10:56:15 +0200 Subject: [PATCH 063/213] python3Packages.nassl: 3.1.0 -> 4.0.0 --- .../python-modules/nassl/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/nassl/default.nix b/pkgs/development/python-modules/nassl/default.nix index 908ecff8c17..8a290a7b859 100644 --- a/pkgs/development/python-modules/nassl/default.nix +++ b/pkgs/development/python-modules/nassl/default.nix @@ -8,12 +8,15 @@ , tls-parser , cacert , pytestCheckHook +, pythonOlder }: let - zlibStatic = pkgsStatic.zlib.override { + zlibStatic = (pkgsStatic.zlib.override { splitStaticOutput = false; - }; + }).overrideAttrs (oldAttrs: { + NIX_CFLAGS_COMPILE = "${oldAttrs.NIX_CFLAGS_COMPILE} -fPIC"; + }); nasslOpensslArgs = { static = true; enableSSL2 = true; @@ -67,13 +70,14 @@ let in buildPythonPackage rec { pname = "nassl"; - version = "3.1.0"; + version = "4.0.0"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - sha256 = "1x1v0fpb6gcc2r0k2rsy0mc3v25s3qbva78apvi46n08c2l309ci"; + hash = "sha256-6lk2YfI9km10YbJAn38fvo9qa4iXcByL+udCsDe+kvU="; }; postPatch = let @@ -86,7 +90,7 @@ buildPythonPackage rec { ${opensslLegacyStatic.out}/lib/libcrypto.a \ deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include - ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps + ln -s ${opensslLegacyStatic.bin} deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/ cp ${opensslStatic.out}/lib/libssl.a \ @@ -108,18 +112,21 @@ buildPythonPackage rec { invoke package.wheel ''; + doCheck = true; + + pythonImportsCheck = [ "nassl" ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - # Skip online tests - pytest -k 'not Online' - ''; + disabledTests = [ + "Online" + ]; meta = with lib; { homepage = "https://github.com/nabla-c0d3/nassl"; description = "Low-level OpenSSL wrapper for Python 3.7+"; platforms = with platforms; linux ++ darwin; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ veehaitch ]; }; } From f43b4c18d8a8e1ad65a9f363e69468f248b4a7ba Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sat, 8 May 2021 11:00:24 +0200 Subject: [PATCH 064/213] python3Packages.sslyze: 3.1.0 -> 4.1.0 --- .../python-modules/sslyze/default.nix | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix index 991f85c900e..5680b4bd36b 100644 --- a/pkgs/development/python-modules/sslyze/default.nix +++ b/pkgs/development/python-modules/sslyze/default.nix @@ -6,39 +6,44 @@ , typing-extensions , faker , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "sslyze"; - version = "3.1.0"; + version = "4.1.0"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - sha256 = "02p0lgpkfq88dys0dqw0z8bpg9g8pds2lvs9awd9f2w5cb1pwr83"; + hash = "sha256-oSTKNiECczlPAbv5Azc023PcquFbnlC5O+8tVgNcUW0="; }; patchPhase = '' substituteInPlace setup.py \ - --replace "cryptography>=2.6,<3.3" "cryptography>=2.6,<4.0" + --replace "cryptography>=2.6,<3.5" "cryptography>=2.6,<4.0" ''; checkInputs = [ pytestCheckHook ]; - checkPhase = '' - # Most of the tests are online; hence, applicable tests are listed - # explicitly here - pytest \ - tests/test_main.py \ - tests/test_scanner.py \ - tests/cli_tests/test_console_output.py \ - tests/cli_tests/test_json_output.py \ - tests/cli_tests/test_server_string_parser.py \ - tests/plugins_tests/test_scan_commands.py \ - tests/plugins_tests/certificate_info/test_certificate_utils.py \ - -k "not (TestScanner and test_client_certificate_missing)" - ''; + # Most of the tests are online; hence, applicable tests are listed + # explicitly here + pytestFlagsArray = [ + "tests/test_main.py" + "tests/test_scanner.py" + "tests/cli_tests/test_console_output.py" + "tests/cli_tests/test_json_output.py" + "tests/cli_tests/test_server_string_parser.py" + "tests/plugins_tests/test_scan_commands.py" + "tests/plugins_tests/certificate_info/test_certificate_utils.py" + ]; + + disabledTests = [ + "test_error_client_certificate_needed" + ]; + pythonImportsCheck = [ "sslyze" ]; propagatedBuildInputs = [ nassl cryptography typing-extensions faker ]; @@ -47,7 +52,7 @@ buildPythonPackage rec { homepage = "https://github.com/nabla-c0d3/sslyze"; description = "Fast and powerful SSL/TLS scanning library"; platforms = platforms.linux ++ platforms.darwin; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ veehaitch ]; }; } From e47dde2e2e9b18d7047daa77d69aecf7095c9eae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 May 2021 20:50:24 +0200 Subject: [PATCH 065/213] python3Packages.aiopg: init at 1.2.1 --- .../python-modules/aiopg/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/aiopg/default.nix diff --git a/pkgs/development/python-modules/aiopg/default.nix b/pkgs/development/python-modules/aiopg/default.nix new file mode 100644 index 00000000000..cb9cd327e8c --- /dev/null +++ b/pkgs/development/python-modules/aiopg/default.nix @@ -0,0 +1,42 @@ +{ lib +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, psycopg2 +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiopg"; + version = "1.2.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = pname; + rev = "v${version}"; + sha256 = "0c6s2p1fjbdk1ygpl6a1s1rbnsk8gw9kj99pf98nxhb9j3iahas4"; + }; + + propagatedBuildInputs = [ + async-timeout + psycopg2 + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "psycopg2-binary" "psycopg2" + ''; + + # Tests requires a PostgreSQL Docker instance + doCheck = false; + + pythonImportsCheck = [ "aiopg" ]; + + meta = with lib; { + description = "Python library for accessing a PostgreSQL database"; + homepage = "https://aiopg.readthedocs.io/"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc390b22213..ec086cb2c7f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -311,6 +311,8 @@ in { aionotion = callPackage ../development/python-modules/aionotion { }; + aiopg = callPackage ../development/python-modules/aiopg { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; aiopulse = callPackage ../development/python-modules/aiopulse { }; From 2b694f50a945eafa4d2ff5396186ffba97f6ae84 Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Sat, 8 May 2021 19:52:02 +0100 Subject: [PATCH 066/213] python3Packages.pika: add gevent to checkInputs --- pkgs/development/python-modules/pika/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index ef325073216..0851f5c71ef 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, gevent , nose , mock , twisted @@ -16,7 +17,7 @@ buildPythonPackage rec { sha256 = "f023d6ac581086b124190cb3dc81dd581a149d216fa4540ac34f9be1e3970b89"; }; - checkInputs = [ nose mock twisted tornado ]; + checkInputs = [ nose mock twisted tornado gevent ]; meta = with lib; { description = "Pure-Python implementation of the AMQP 0-9-1 protocol"; From 0965ceb28682e3427c4ab2e42b06a8108866baa0 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 8 May 2021 20:53:12 +0200 Subject: [PATCH 067/213] cawbird: 1.4 -> 1.4.1 - hotfix release - changelog: Hotfix to correct "Send" button state issues for direct messages --- pkgs/applications/networking/cawbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix index 5f7fab1816a..517bd1e01cc 100644 --- a/pkgs/applications/networking/cawbird/default.nix +++ b/pkgs/applications/networking/cawbird/default.nix @@ -23,14 +23,14 @@ }: stdenv.mkDerivation rec { - version = "1.4"; + version = "1.4.1"; pname = "cawbird"; src = fetchFromGitHub { owner = "IBBoard"; repo = "cawbird"; rev = "v${version}"; - sha256 = "sha256:1cjhbjbd4w1i7i63ib6h5wvx2s0v1l6b85wp07pvn3hmsrmis265"; + sha256 = "0lmrgcj1ky1vhzynl36k6ba3ws089x4qdrnkjk3lbr334kicx9na"; }; nativeBuildInputs = [ From 2310b565996649d8bd86cc4973a559c80637e6f7 Mon Sep 17 00:00:00 2001 From: Matt Melling Date: Sat, 8 May 2021 20:00:58 +0100 Subject: [PATCH 068/213] pythonPackages.python-binance: added missing ujson dependency --- pkgs/development/python-modules/python-binance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index aea47c7b9e7..a750f02505a 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , pytest, requests-mock, tox -, autobahn, certifi, chardet, cryptography, dateparser, pyopenssl, requests, service-identity, twisted }: +, autobahn, certifi, chardet, cryptography, dateparser, pyopenssl, requests, service-identity, twisted, ujson }: buildPythonPackage rec { version = "0.7.9"; @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; # Tries to test multiple interpreters with tox checkInputs = [ pytest requests-mock tox ]; - propagatedBuildInputs = [ autobahn certifi chardet cryptography dateparser pyopenssl requests service-identity twisted ]; + propagatedBuildInputs = [ autobahn certifi chardet cryptography dateparser pyopenssl requests service-identity twisted ujson ]; meta = { description = "Binance Exchange API python implementation for automated trading"; From c94643ac4de83a0f01281c270b84d13d0c2060b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Fri, 7 May 2021 19:32:20 +0200 Subject: [PATCH 069/213] gnomeExtensions.disable-unredirect: unstable-2021-01-17 -> unstable-2021-04-13 Enables support for GNOME 40 --- .../gnome/extensions/disable-unredirect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix b/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix index 0a9145de3db..166ab61565f 100644 --- a/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix +++ b/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-disable-unredirect"; - version = "unstable-2021-01-17"; + version = "unstable-2021-04-13"; src = fetchFromGitHub { owner = "kazysmaster"; repo = "gnome-shell-extension-disable-unredirect"; - rev = "2ecb2f489ea3316b77d04f03a0c885f322c67e79"; - sha256 = "1rjyrg8qya0asndxr7189a9npww0rcxk02wkxrxjy7fdp5m89p7y"; + rev = "2a4c0e6a7a7a5f1aad9907ee2cf43d0725e10c19"; + sha256 = "06hbyy20xz0bvzg0vs5w4092nyfpg372c86cdm1akcjm72m5sim9"; }; uuid = "unredirect@vaina.lt"; From 8179b811068be041b7b9280416a7a785e493c0fd Mon Sep 17 00:00:00 2001 From: Mica Date: Sat, 8 May 2021 12:34:35 -0700 Subject: [PATCH 070/213] prism: init at 0.1.1 (#121869) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Maciej Krüger Co-authored-by: Sandro --- pkgs/applications/video/prism/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/video/prism/default.nix diff --git a/pkgs/applications/video/prism/default.nix b/pkgs/applications/video/prism/default.nix new file mode 100644 index 00000000000..8cb6153b811 --- /dev/null +++ b/pkgs/applications/video/prism/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "prism"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "muesli"; + repo = pname; + rev = "v${version}"; + sha256 = "0q7q7aj3fm45bnx6hgl9c1ll8na16x6p7qapr0c4a6dhxwd7n511"; + }; + + vendorSha256 = "1mkd1s9zgzy9agy2rjjk8wfdga7nzv9cmwgiarfi4xrqzj4mbaxq"; + + meta = with lib; { + description = "An RTMP stream recaster/splitter"; + homepage = "https://github.com/muesli/prism"; + license = licenses.mit; + maintainers = with maintainers; [ paperdigits ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f122ae918b..da6c96bb2a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7460,6 +7460,8 @@ in pitivi = callPackage ../applications/video/pitivi { }; + prism = callPackage ../applications/video/prism { }; + pulumi-bin = callPackage ../tools/admin/pulumi { }; p0f = callPackage ../tools/security/p0f { }; From f541bfbc929e3d4bfd25993d87d7d83cd6426584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:29:09 +0200 Subject: [PATCH 071/213] bitcoind: add link to nixos test --- pkgs/applications/blockchains/bitcoin.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 1f222477ab2..162a5ddee1a 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -16,6 +16,7 @@ , python3 , qrencode , libevent +, nixosTests , withGui , withWallet ? true }: @@ -81,6 +82,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + smoke-test = nixosTests.bitcoind; + }; + meta = { description = "Peer-to-peer electronic cash system"; longDescription = '' From c10edf91472480e7fc3baf808d03a546388b4977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:29:21 +0200 Subject: [PATCH 072/213] _3proxy: add link to nixos test --- pkgs/applications/networking/3proxy/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/3proxy/default.nix b/pkgs/applications/networking/3proxy/default.nix index 6636691468e..f9221d06d02 100644 --- a/pkgs/applications/networking/3proxy/default.nix +++ b/pkgs/applications/networking/3proxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, coreutils }: +{ lib, stdenv, fetchFromGitHub, coreutils, nixosTests }: stdenv.mkDerivation rec { pname = "3proxy"; @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { "DESTDIR=${placeholder "out"}" ]; + passthru.tests = { + smoke-test = nixosTests._3proxy; + }; + meta = with lib; { description = "Tiny free proxy server"; homepage = "https://github.com/z3APA3A/3proxy"; From dc6d61dd3e0ed774749166405b5410aa4cf7937a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:29:32 +0200 Subject: [PATCH 073/213] opentracker: add link to nixos test --- pkgs/applications/networking/p2p/opentracker/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index 4e127a1e7b8..f08e5c42e1d 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, libowfat, zlib }: +{ lib, stdenv, fetchgit, libowfat, zlib, nixosTests }: stdenv.mkDerivation { name = "opentracker-2018-05-26"; @@ -23,6 +23,10 @@ stdenv.mkDerivation { runHook postInstall ''; + passthru.tests = { + bittorrent-integration = nixosTests.bittorrent; + }; + meta = with lib; { homepage = "https://erdgeist.org/arts/software/opentracker/"; license = licenses.beerware; From 423af9cd95e238b220c9b50cb7990231d6f21416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:29:44 +0200 Subject: [PATCH 074/213] transmission: add link to nixos test --- pkgs/applications/networking/p2p/transmission/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 363e5f7cfbe..43ca9d455bd 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -17,6 +17,7 @@ , wrapGAppsHook , enableQt ? false , qt5 +, nixosTests , enableSystemd ? stdenv.isLinux , enableDaemon ? true , enableCli ? true @@ -74,6 +75,10 @@ in stdenv.mkDerivation { NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; + passthru.tests = { + smoke-test = nixosTests.bittorrent; + }; + meta = { description = "A fast, easy and free BitTorrent client"; longDescription = '' From 45d1222d473361b9a05288ba1f664c2456fa0af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:29:55 +0200 Subject: [PATCH 075/213] git: add link to related nixos test It'd be better to have a git-only test, but in the meantime this is the first available test I could find, and it's still better than nothing. --- .../version-management/git-and-tools/git/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index a7df1645c7a..aff39a6a44f 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -14,6 +14,7 @@ , withpcre2 ? true , sendEmailSupport , darwin +, nixosTests , withLibsecret ? false , pkg-config, glib, libsecret , gzip # needed at runtime by gitweb.cgi @@ -334,6 +335,9 @@ stdenv.mkDerivation { stripDebugList = [ "lib" "libexec" "bin" "share/git/contrib/credential/libsecret" ]; + passthru.tests = { + buildbot-integration = nixosTests.buildbot; + }; meta = { homepage = "https://git-scm.com/"; From 742886cc3a9b6a1b67e0502840c72f2da57eaf8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:30:36 +0200 Subject: [PATCH 076/213] avahi: add link to nixos tests --- pkgs/development/libraries/avahi/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index dd54ba79db7..a52d1be566e 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,5 +1,6 @@ { fetchurl, fetchpatch, lib, stdenv, pkg-config, libdaemon, dbus, perlPackages , expat, gettext, intltool, glib, libiconv, writeShellScriptBin, libevent +, nixosTests , gtk3Support ? false, gtk3 ? null , qt4 ? null , qt4Support ? false @@ -77,6 +78,11 @@ stdenv.mkDerivation rec { ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc */ + passthru.tests = { + smoke-test = nixosTests.avahi; + smoke-test-resolved = nixosTests.avahi-with-resolved; + }; + meta = with lib; { description = "mDNS/DNS-SD implementation"; homepage = "http://avahi.org"; From 4b3d07eae2ce3080c6d4eb8356378e54233a59c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:30:47 +0200 Subject: [PATCH 077/213] ocamlPackages.atd: add link to nixos test --- pkgs/development/ocaml-modules/atd/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index 2f85221e539..de6ade61518 100644 --- a/pkgs/development/ocaml-modules/atd/default.nix +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -1,4 +1,4 @@ -{ lib, menhir, easy-format, fetchurl, buildDunePackage, which, re }: +{ lib, menhir, easy-format, fetchurl, buildDunePackage, which, re, nixosTests }: buildDunePackage rec { pname = "atd"; @@ -18,6 +18,10 @@ buildDunePackage rec { doCheck = true; + passthru.tests = { + smoke-test = nixosTests.atd; + }; + meta = with lib; { homepage = "https://github.com/mjambon/atd"; description = "Syntax for cross-language type definitions"; From 3554d52545fd8bf91cbf4358534c66d49bcf73b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:31:09 +0200 Subject: [PATCH 078/213] buildbot-worker: add link to nixos test --- pkgs/development/python-modules/buildbot/worker.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 242849e2c79..5237f2ae733 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, buildbot, setuptoolsTrial, mock, twisted, - future, coreutils }: + future, coreutils, nixosTests }: buildPythonPackage (rec { pname = "buildbot-worker"; @@ -19,6 +19,10 @@ buildPythonPackage (rec { --replace /usr/bin/tail "${coreutils}/bin/tail" ''; + passthru.tests = { + smoke-test = nixosTests.buildbot; + }; + meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Worker Daemon"; From 0b85cb4d63a6fa729ebf5d50131a72a0fa9d6317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:31:16 +0200 Subject: [PATCH 079/213] pythonPackages.selenium: add test to related nixos test It'd certainly be better to have a selenium-specific test, but there is currently none so this will be better than nothing. --- pkgs/development/python-modules/selenium/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 664f84933ed..370d2548980 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -6,6 +6,7 @@ , geckodriver , urllib3 , xorg +, nixosTests }: @@ -47,6 +48,10 @@ buildPythonPackage rec { cp -v x_ignore_nofocus.so selenium/webdriver/firefox/${if stdenv.is64bit then "amd64" else "x86"}/ ''; + passthru.tests = { + testing-bitwarden = nixosTests.bitwarden; + }; + meta = with lib; { description = "The selenium package is used to automate web browser interaction from Python"; homepage = "http://www.seleniumhq.org"; From 7c17768a485eb61d717b267572ce6c04cb1ffea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:32:05 +0200 Subject: [PATCH 080/213] buildkite-agent: add link to nixos test --- .../continuous-integration/buildkite-agent/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index db1f2aeabc7..0b6c9792441 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -1,5 +1,6 @@ { fetchFromGitHub, lib, buildGoModule, - makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: + makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep, + nixosTests }: buildGoModule rec { name = "buildkite-agent-${version}"; version = "3.29.0"; @@ -30,6 +31,10 @@ buildGoModule rec { --prefix PATH : '${lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' ''; + passthru.tests = { + smoke-test = nixosTests.buildkite-agents; + }; + meta = with lib; { description = "Build runner for buildkite.com"; longDescription = '' From c6a17072c8ca4ecd8ded1f0d3cab1a9e68d697bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:32:24 +0200 Subject: [PATCH 081/213] beanstalkd: add link to nixos test --- pkgs/servers/beanstalkd/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix index 01af8a4d5bc..9bfe3182d65 100644 --- a/pkgs/servers/beanstalkd/default.nix +++ b/pkgs/servers/beanstalkd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, installShellFiles }: +{ lib, stdenv, fetchurl, installShellFiles, nixosTests }: stdenv.mkDerivation rec { version = "1.12"; @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { installManPage doc/beanstalkd.1 ''; + passthru.tests = { + smoke-test = nixosTests.beanstalkd; + }; + meta = with lib; { homepage = "http://kr.github.io/beanstalkd/"; description = "A simple, fast work queue"; From 4105f83082aaa5183c433e624dfbc233cfb6a0af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:32:37 +0200 Subject: [PATCH 082/213] blockbook: add link to nixos test --- pkgs/servers/blockbook/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 2394ef258a9..5ab10af18c0 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -9,6 +9,7 @@ , snappy , zeromq , zlib +, nixosTests }: buildGoModule rec { @@ -54,6 +55,10 @@ buildGoModule rec { cp -r $src/static/css/ $out/share/ ''; + passthru.tests = { + smoke-test = nixosTests.blockbook-frontend; + }; + meta = with lib; { description = "Trezor address/account balance backend"; homepage = "https://github.com/trezor/blockbook"; From 58c16121e61c35dfc03eae3614a98cc279ecd964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:32:58 +0200 Subject: [PATCH 083/213] apacheHttpd: add link to acme nixos test --- pkgs/servers/http/apache-httpd/2.4.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 46e1d7643d5..8556b55b586 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv, lynx +, nixosTests , proxySupport ? true , sslSupport ? true, openssl , http2Support ? true, nghttp2 @@ -85,6 +86,9 @@ stdenv.mkDerivation rec { passthru = { inherit apr aprutil sslSupport proxySupport ldapSupport luaSupport lua5; + tests = { + acme-integration = nixosTests.acme; + }; }; meta = with lib; { From f93396bf524ef499c46918582e0dd3e86abe0e9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:33:31 +0200 Subject: [PATCH 084/213] nginx: add link to acme nixos test --- pkgs/servers/http/nginx/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 663193789a5..e13c0b4e922 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -145,6 +145,7 @@ stdenv.mkDerivation { tests = { inherit (nixosTests) nginx nginx-auth nginx-etag nginx-pubhtml nginx-sandbox nginx-sso; variants = lib.recurseIntoAttrs nixosTests.nginx-variants; + acme-integration = nixosTests.acme; }; }; From dc42bda5e7332670da2f64eb9124476a35634093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:34:13 +0200 Subject: [PATCH 085/213] pebble: add link to acme nixos test --- pkgs/tools/admin/pebble/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix index 4813f86ea64..1fb902a8c80 100644 --- a/pkgs/tools/admin/pebble/default.nix +++ b/pkgs/tools/admin/pebble/default.nix @@ -1,6 +1,7 @@ { buildGoPackage , fetchFromGitHub , lib +, nixosTests }: let @@ -17,6 +18,10 @@ in buildGoPackage { sha256 = "1piwzzfqsdx6s2niczzp4mf4r3qn9nfdgpn7882g52cmmm0vzks2"; }; + passthru.tests = { + smoke-test = nixosTests.acme; + }; + meta = { homepage = "https://github.com/letsencrypt/pebble"; description = "A miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA"; From 20ee7bd673eb4b0d54e580ae19b4eaba0df8bea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:34:28 +0200 Subject: [PATCH 086/213] bcachefs-tools: add link to bcachefs nixos test --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 8ab82b67226..a28499f7732 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, attr, libuuid, libscrypt, libsodium, keyutils -, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages +, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages, nixosTests , fuseSupport ? false, fuse3 ? null }: assert fuseSupport -> fuse3 != null; @@ -39,6 +39,10 @@ stdenv.mkDerivation { installFlags = [ "PREFIX=${placeholder "out"}" ]; + passthru.tests = { + smoke-test = nixosTests.bcachefs; + }; + meta = with lib; { description = "Tool for managing bcachefs filesystems"; homepage = "https://bcachefs.org/"; From 4554e6698d89580af9ea1eab07caa5f616252254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:34:39 +0200 Subject: [PATCH 087/213] bees: add link to nixos test --- pkgs/tools/filesystems/bees/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index bbad83f0176..7ba27208fe8 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, util-linux }: +{ lib, stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils +, python3Packages, util-linux, nixosTests }: let @@ -55,7 +56,7 @@ let in -runCommand "bees-service" { +(runCommand "bees-service" { inherit bash bees coreutils; utillinux = util-linux; # needs to be a valid shell variable name btrfsProgs = btrfs-progs; # needs to be a valid shell variable name @@ -64,4 +65,8 @@ runCommand "bees-service" { substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper chmod +x "$out"/bin/bees-service-wrapper ln -s ${bees}/bin/beesd "$out"/bin/beesd -'' +'').overrideAttrs (old: { + passthru.tests = { + smoke-test = nixosTests.bees; + }; +}) From 865d28a8b6c23b60f082680213a09462d43f86be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:34:55 +0200 Subject: [PATCH 088/213] miniupnpd: add link to related nixos test --- pkgs/tools/networking/miniupnpd/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 05b04cf9484..aea0faddf5d 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, iptables, libuuid, pkg-config , which, iproute2, gnused, coreutils, gawk, makeWrapper +, nixosTests }: let @@ -30,6 +31,10 @@ stdenv.mkDerivation rec { done ''; + passthru.tests = { + bittorrent-integration = nixosTests.bittorrent; + }; + meta = with lib; { homepage = "http://miniupnp.free.fr/"; description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; From 53f43a2048f9189427e8100081077b36322cccd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 4 Apr 2021 00:35:03 +0200 Subject: [PATCH 089/213] openssh: add link to related nixos test It'd certainly be better to have an openssh-specific integration test, but it's not there yet and this is better than nothing. --- pkgs/tools/networking/openssh/common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 55babb4ca2d..21ad012f3fb 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -22,6 +22,7 @@ , withKerberos ? true , libkrb5 , libfido2 +, nixosTests , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl , linkOpenssl ? true }: @@ -111,6 +112,10 @@ stdenv.mkDerivation rec { "sysconfdir=\${out}/etc/ssh" ]; + passthru.tests = { + borgbackup-integration = nixosTests.borgbackup; + }; + meta = { description = "An implementation of the SSH protocol${extraDesc}"; homepage = "https://www.openssh.com/"; From 9d469535dfa2d7de9ac68ee8be65b4b802d48ffc Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sat, 8 May 2021 15:55:18 -0400 Subject: [PATCH 090/213] python3Packages.fenics: fix build --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d5eaffcb102..728253b52d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2346,6 +2346,7 @@ in { fenics = callPackage ../development/libraries/science/math/fenics { pytest = self.pytest_4; + hdf5 = pkgs.hdf5_1_10; }; ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { }; From 773f051c8753bf8a8616d81a37d42191e18f0368 Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Sat, 8 May 2021 01:53:21 +0300 Subject: [PATCH 091/213] pipewire: 0.3.26 -> 0.3.27 --- pkgs/development/libraries/pipewire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 133853e2362..b3e740f39c4 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -42,7 +42,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.26"; + version = "0.3.27"; outputs = [ "out" @@ -60,7 +60,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-s9+70XXMN4K3yDVwIu+L15gL6rFlpRNVQpeekZQOEec="; + sha256 = "sha256-GfcMODQWtcahBvXnZ98/PKIm4pkqLaz09oOy7zQR4IA="; }; patches = [ From c78b9b47cfdef0cb0b6b0b4e0c5b1ee8bb2c4b0e Mon Sep 17 00:00:00 2001 From: Evils Date: Sat, 1 May 2021 16:27:49 +0200 Subject: [PATCH 092/213] i2c-tools: switch to fetchgit and separate man and clarify license --- pkgs/os-specific/linux/i2c-tools/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix index 23bc89b7d1c..5c05ca6082e 100644 --- a/pkgs/os-specific/linux/i2c-tools/default.nix +++ b/pkgs/os-specific/linux/i2c-tools/default.nix @@ -1,12 +1,18 @@ -{ lib, stdenv, fetchurl, perl, read-edid }: +{ lib +, stdenv +, fetchgit +, perl +, read-edid +}: stdenv.mkDerivation rec { pname = "i2c-tools"; version = "4.2"; - src = fetchurl { - url = "https://www.kernel.org/pub/software/utils/i2c-tools/${pname}-${version}.tar.xz"; - sha256 = "1mmc1n8awl3winyrp1rcxg94vjsx9dc1y7gj7y88blc2f2ydmwip"; + src = fetchgit { + url = "https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git"; + rev = "v${version}"; + sha256 = "0vqrbp10klr7ylarr6cy1q7nafiqaky4iq5my5dqy101h93vg4pg"; }; buildInputs = [ perl ]; @@ -18,6 +24,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; + outputs = [ "out" "man" ]; + postInstall = '' rm -rf $out/include # Installs include/linux/i2c-dev.h that conflics with kernel headers ''; @@ -25,7 +33,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Set of I2C tools for Linux"; homepage = "https://i2c.wiki.kernel.org/index.php/I2C_Tools"; - license = licenses.gpl2; + # library is LGPL 2.1 or later; "most tools" GPL 2 or later + license = with licenses; [ lgpl21Plus gpl2Plus ]; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; }; From 27ed1b4b1508f3f867d681f00c9d7ff6aa214543 Mon Sep 17 00:00:00 2001 From: Evils Date: Sat, 1 May 2021 16:24:56 +0200 Subject: [PATCH 093/213] python.pkgs.i2c-tools: init at i2c-tools.version --- .../python-modules/i2c-tools/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/i2c-tools/default.nix diff --git a/pkgs/development/python-modules/i2c-tools/default.nix b/pkgs/development/python-modules/i2c-tools/default.nix new file mode 100644 index 00000000000..60af11e2419 --- /dev/null +++ b/pkgs/development/python-modules/i2c-tools/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, i2c-tools +}: + +buildPythonPackage rec { + inherit (i2c-tools) pname version src; + + buildInputs = [ i2c-tools ]; + + preConfigure = "cd py-smbus"; + + meta = with lib; { + inherit (i2c-tools.meta) homepage platforms; + + description = "wrapper for i2c-tools' smbus stuff"; + # from py-smbus/smbusmodule.c + license = [ licenses.gpl2Only ]; + maintainers = [ maintainers.evils ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 728253b52d4..0f50609528e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3184,6 +3184,10 @@ in { hyppo = callPackage ../development/python-modules/hyppo { }; + i2c-tools = callPackage ../development/python-modules/i2c-tools { + inherit (pkgs) i2c-tools; + }; + i3ipc = callPackage ../development/python-modules/i3ipc { }; i3-py = callPackage ../development/python-modules/i3-py { }; From 6b6537841c3c622bc90926e91797b76899f68f52 Mon Sep 17 00:00:00 2001 From: Evils Date: Sat, 1 May 2021 12:26:08 +0200 Subject: [PATCH 094/213] liquidctl: 1.5.1 -> 1.6.1; fix and polish a bit add python.pkgs.i2c-tools required since 1.5.0 add man page output add bash completion add udev rules file add the incl. tests add myself as a maintainer and clarify license --- .../python-modules/liquidctl/default.nix | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index ecf5990e74b..4b2decb9550 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -2,40 +2,61 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, installShellFiles , docopt , hidapi , pyusb , smbus-cffi +, i2c-tools +, pytestCheckHook }: buildPythonPackage rec { pname = "liquidctl"; - version = "1.5.1"; + version = "1.6.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1l6cvm8vs2gkmg4qwg5m5vqjql1gah2vd9vs7pcj2v5hf0cm5v9x"; + sha256 = "sha256-FYpr1mYzPc0rOE75fUNjxe/57EWl+zcbIbkqFseDhzI="; }; + nativeBuildInputs = [ installShellFiles ]; + propagatedBuildInputs = [ docopt hidapi pyusb smbus-cffi + i2c-tools ]; - # does not contain tests - doCheck = false; + outputs = [ "out" "man" ]; + + postInstall = '' + installManPage liquidctl.8 + installShellCompletion extra/completions/liquidctl.bash + + mkdir -p $out/lib/udev/rules.d + cp extra/linux/71-liquidctl.rules $out/lib/udev/rules.d/. + ''; + + checkInputs = [ pytestCheckHook ]; + + postBuild = '' + # needed for pythonImportsCheck + export XDG_RUNTIME_DIR=$TMPDIR + ''; + pythonImportsCheck = [ "liquidctl" ]; meta = with lib; { description = "Cross-platform CLI and Python drivers for AIO liquid coolers and other devices"; homepage = "https://github.com/liquidctl/liquidctl"; changelog = "https://github.com/liquidctl/liquidctl/blob/master/CHANGELOG.md"; - license = licenses.gpl3; - maintainers = with maintainers; [ arturcygan ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ arturcygan evils ]; }; } From 34e037b6360641928afd16b3ee4110c04d07b326 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Fri, 7 May 2021 18:22:35 -0400 Subject: [PATCH 095/213] python3Packages.tld: fix on darwin --- pkgs/development/python-modules/tld/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 13f23edaad1..ed601a2620c 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -26,6 +26,12 @@ buildPythonPackage rec { tox ]; + # these tests require network access, but disabledTestPaths doesn't work. + # the file needs to be `import`ed by another python test file, so it + # can't simply be removed. + preCheck = '' + echo > src/tld/tests/test_commands.py + ''; pythonImportsCheck = [ "tld" ]; meta = with lib; { From f6987986d3249ed8358e78ec569fbc0b838d103a Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sat, 8 May 2021 16:26:28 -0400 Subject: [PATCH 096/213] python3Packages.pillow-simd: 7.0.0.post3 -> 8.1.2 --- pkgs/development/python-modules/pillow-simd/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix index 3aed634dfb1..d7b2ff8d6b3 100644 --- a/pkgs/development/python-modules/pillow-simd/default.nix +++ b/pkgs/development/python-modules/pillow-simd/default.nix @@ -1,19 +1,20 @@ { lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k , olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2 -, tk, libX11, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +, libxcb, tk, libX11, openjpeg, libimagequant, pyroma, numpy +, pytestCheckHook }@args: import ../pillow/generic.nix (rec { pname = "Pillow-SIMD"; - version = "7.0.0.post3"; + version = "8.1.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "uploadcare"; repo = "pillow-simd"; - rev = "v${version}"; - sha256 = "1h832xp1bzf951hr4dmjmxqfsv28sx9lr2cq96qdz1c72k40zj1h"; + rev = version; + sha256 = "1z0c1qpx7l1bhj71ww7za7kl29j5wdraqr2pdhv4dp1q74kgrr0m"; }; meta = with lib; { From 13f0da71e613fab9303af5af60c67d4fc5a60051 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 8 May 2021 22:40:02 +0200 Subject: [PATCH 097/213] python3Packages.myjwt: 1.4.0 -> 1.5.0 --- .../python-modules/myjwt/default.nix | 21 +++++++++++-------- .../python-modules/myjwt/pinning.patch | 21 ------------------- 2 files changed, 12 insertions(+), 30 deletions(-) delete mode 100644 pkgs/development/python-modules/myjwt/pinning.patch diff --git a/pkgs/development/python-modules/myjwt/default.nix b/pkgs/development/python-modules/myjwt/default.nix index d80e66e07bf..0fecd439e3f 100644 --- a/pkgs/development/python-modules/myjwt/default.nix +++ b/pkgs/development/python-modules/myjwt/default.nix @@ -1,33 +1,31 @@ { lib , stdenv , buildPythonPackage -, fetchFromGitHub , click , colorama , cryptography , exrex +, fetchFromGitHub , pyopenssl , pyperclip +, pytest-mock +, pytestCheckHook , questionary , requests -, pytestCheckHook -, pytest-mock , requests-mock }: buildPythonPackage rec { pname = "myjwt"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "mBouamama"; repo = "MyJWT"; rev = version; - sha256 = "1n3lvdrzp6wbbcygjwa7xar2jnhjnrz7a9khmn2phhkkngxm5rc4"; + sha256 = "sha256-kZkqFeaQPd56BVaYmCWAbVu1xwbPAIlQC3u5/x3dh7A="; }; - patches = [ ./pinning.patch ]; - propagatedBuildInputs = [ click colorama @@ -40,15 +38,20 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestCheckHook pytest-mock + pytestCheckHook requests-mock ]; + postPatch = '' + # Remove all version pinning (E.g., tornado==5.1.1 -> tornado) + sed -i -e "s/==[0-9.]*//" requirements.txt + ''; + pythonImportsCheck = [ "myjwt" ]; meta = with lib; { - description = "CLI tool for testing vulnerabilities on Json Web Token(JWT)"; + description = "CLI tool for testing vulnerabilities of JSON Web Tokens (JWT)"; homepage = "https://github.com/mBouamama/MyJWT"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/myjwt/pinning.patch b/pkgs/development/python-modules/myjwt/pinning.patch deleted file mode 100644 index abae9d0e2ec..00000000000 --- a/pkgs/development/python-modules/myjwt/pinning.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/requirements.txt b/requirements.txt -index 3017e02..2b465db 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,8 +1,8 @@ --click==7.1.2 --colorama==0.4.4 --cryptography==3.3.1 --exrex==0.10.5 --pyOpenSSL==20.0.1 --pyperclip==1.8.1 --questionary==1.9.0 --requests==2.25.1 -+click -+colorama -+cryptography -+exrex -+pyOpenSSL -+pyperclip -+questionary -+requests From 34305cc1a0ff707f050243a31e2616f9376e07b2 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Wed, 5 May 2021 18:16:15 -0400 Subject: [PATCH 098/213] python3Packages.pomegranate: 0.11.2 -> 0.13.5 --- .../python-modules/pomegranate/default.nix | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 8f260ad8ccb..518840d415a 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -1,19 +1,41 @@ -{ lib, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose, pyyaml }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, numpy +, scipy +, cython +, networkx +, joblib +, pandas +, nose +, pyyaml +}: + buildPythonPackage rec { pname = "pomegranate"; - version = "0.11.2"; + version = "0.13.5"; src = fetchFromGitHub { repo = pname; owner = "jmschrei"; rev = "v${version}"; - sha256 = "070ciwww1lhjmfwd5n1kcwgxwbgdfvmhjs4l156bnf08z9dlrafl"; + sha256 = "1hbxchp3daykkf1fa79a9mh34p78bygqcf1nv4qwkql3gw0pd6l7"; }; + patches = lib.optionals (lib.versionOlder version "13.6") [ + # Fix compatibility with recent joblib release, will be part of the next + # pomegranate release after 0.13.5 + (fetchpatch { + url = "https://github.com/jmschrei/pomegranate/commit/42d14bebc44ffd4a778b2a6430aa845591b7c3b7.patch"; + sha256 = "0f9cx0fj9xkr3hch7jyrn76zjypilh5bqw734caaw6g2m49lvbff"; + }) + ]; + propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ]; - checkInputs = [ nose ]; + checkInputs = [ pandas nose ]; # as of 0.13.5, it depends explicitly on nose, rather than pytest. meta = with lib; { description = "Probabilistic and graphical models for Python, implemented in cython for speed"; From b690ceff5dd2ce5b34d37209f883e575e77b7ec8 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 7 May 2021 21:04:07 +0200 Subject: [PATCH 099/213] superTuxKart: Fix aarch64-linux build --- pkgs/games/super-tux-kart/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 35143028a27..7998e13817d 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -54,7 +54,12 @@ let "libsquish" # Not packaged to this date "sheenbidi" - ]; + ] + # Our system angelscript causes linking error on ARM + # ld: libangelscript.so: undefined reference to + # `CallSystemFunctionNative(asCContext*, asCScriptFunction*, void*, unsigned int*, void*, unsigned long&, void*)' + # Bundled angelscript compiles fine + ++ lib.optional stdenv.hostPlatform.isAarch64 "angelscript"; in stdenv.mkDerivation rec { @@ -100,15 +105,15 @@ stdenv.mkDerivation rec { harfbuzz mcpp wiiuse - angelscript - ]; + ] + ++ lib.optional (!stdenv.hostPlatform.isAarch64) angelscript; cmakeFlags = [ "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs - "-DUSE_SYSTEM_ANGELSCRIPT=OFF" # doesn't work with 2.31.2 or 2.32.0 + # doesn't work with our 2.35.0 on aarch64-linux + "-DUSE_SYSTEM_ANGELSCRIPT=${if !stdenv.hostPlatform.isAarch64 then "ON" else "OFF"}" "-DCHECK_ASSETS=OFF" "-DUSE_SYSTEM_WIIUSE=ON" - "-DUSE_SYSTEM_ANGELSCRIPT=ON" "-DOpenGL_GL_PREFERENCE=GLVND" ]; From eacd24aed23b09a101a1ca98594ec7b6d704eb76 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Fri, 7 May 2021 18:08:52 -0400 Subject: [PATCH 100/213] python3Packages.pykerberos: 1.2.1 -> 1.2.3.dev0 --- pkgs/development/python-modules/pykerberos/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix index 13d7a4fd248..fd4c0088b08 100644 --- a/pkgs/development/python-modules/pykerberos/default.nix +++ b/pkgs/development/python-modules/pykerberos/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pykerberos"; - version = "1.2.1"; + version = "1.2.3.dev0"; src = fetchPypi { inherit pname version; - sha256 = "0v47p840myqgc7hr4lir72xshcfpa0w8j9n077h3njpqyn6wlbag"; + sha256 = "17zjiw6rqgfic32px86qls1i3z7anp15dgb3sprbdvywy98alryn"; }; nativeBuildInputs = [ krb5 ]; # for krb5-config @@ -15,6 +15,7 @@ buildPythonPackage rec { # there are no tests doCheck = false; + pythonImportsCheck = [ "kerberos" ]; meta = with lib; { description = "High-level interface to Kerberos"; From 8268e64d0e791ee88feaa6cae43cf68b0755aef8 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 8 May 2021 20:16:44 +0000 Subject: [PATCH 101/213] python3Packages.hg-evolve: 10.3.0 -> 10.3.1 Fix compatibility with Mercurial 5.8. --- pkgs/development/python-modules/hg-evolve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index b7bd002c367..46db97a9aed 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.3.0"; + version = "10.3.1"; src = fetchPypi { inherit pname version; - sha256 = "5d7f73fc1c357134ae9b4a3ed2d844ab8e75a4ca1303679a9e150e87617e7bc7"; + sha256 = "03xwnadpvgna70n6pfxb7xdrszppdqrx5qmkbr1v0jzbh5rnzi6b"; }; doCheck = false; @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Enables the “changeset evolution” feature of Mercurial core"; homepage = "https://www.mercurial-scm.org/doc/evolution/"; - maintainers = with maintainers; [ xavierzwirtz ]; + maintainers = with maintainers; [ xavierzwirtz lukegb ]; license = licenses.gpl2Plus; }; } From 78c97f07c8b912373b2cb957e6478b0d80ca3bf6 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sat, 8 May 2021 17:48:20 -0400 Subject: [PATCH 102/213] python39Packages.blist: fix build --- pkgs/development/python-modules/blist/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/blist/default.nix b/pkgs/development/python-modules/blist/default.nix index d4dcb54c5cd..af129f4aa5d 100644 --- a/pkgs/development/python-modules/blist/default.nix +++ b/pkgs/development/python-modules/blist/default.nix @@ -22,6 +22,12 @@ buildPythonPackage rec { url = "https://github.com/DanielStutzbach/blist/commit/2dc1ec28ed68611fcec9ac1c68070c782d6b4b4e.patch"; sha256 = "0ma0z6ga80w3wzh3sidwd8ckfbgx4j1y7cc29q6j9ddrvxpf276y"; }) + + # Fixes compatibility for Python 3.9 https://github.com/DanielStutzbach/blist/pull/91 + (fetchpatch { + url = "https://github.com/DanielStutzbach/blist/pull/91/commits/e63514f805e42dc6a5708e629e4153d91bc90bff.patch"; + sha256 = "1prx8znk7008v4ky7q2lx0pi6hzqd4kxgfdwbsr4zylwbrdqvsga"; + }) ]; meta = with lib; { From e2d99fac687a353ef866e4c644f954595a4c43bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 May 2021 05:40:55 +0000 Subject: [PATCH 103/213] kubecfg: 0.19.0 -> 0.19.1 --- pkgs/applications/networking/cluster/kubecfg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index d9740c759a1..16b7796dc64 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.19.0"; in +let version = "0.19.1"; in buildGoPackage { pname = "kubecfg"; @@ -10,7 +10,7 @@ buildGoPackage { owner = "bitnami"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "sha256-G3yLpo/6hv6t3i6b/KMgoZqltyGDddg/SsNPF8hNeUg="; + sha256 = "sha256-makRYWBtOjvuv7dAY1vNh1Nxv+nETVlaFh1C3oiojUo="; }; goPackagePath = "github.com/bitnami/kubecfg"; From 13193df29d3095ed8c383751d81439da67eed2ba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 May 2021 19:07:06 +0000 Subject: [PATCH 104/213] helmfile: 0.138.7 -> 0.139.0 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 3c6d6676906..53b04123438 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.138.7"; + version = "0.139.0"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-LFNsSd+S+mQiTk7bCnSD/Kp/D0Jefxo80eRsGkStBhs="; + sha256 = "sha256-bwhiua+KQdt9fyvM4TeS6Mm7EQB9K2L04FPhGS380xI="; }; - vendorSha256 = "sha256-WlV6moJymQ7VyZXXuViCNN1WP4NzBUszavxpKjQR8to="; + vendorSha256 = "sha256-Qpou4e1My/obIHL/4/IEUml0F82atIwPGZX5+vpvk0k="; doCheck = false; From ace0555d7223143e5c63428ea795c158bd309685 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 May 2021 03:16:16 +0000 Subject: [PATCH 105/213] fluxcd: 0.13.2 -> 0.13.3 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 4a338ac9a42..0bb4c57e089 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.13.2"; + version = "0.13.3"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; @@ -19,10 +19,10 @@ buildGoModule rec { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "sha256-yWcoHUHEiRp4YxTDxi+inJkpb8dnTVTwSO3MgFyhvps="; + sha256 = "sha256-RaQOefVqDPHvTF1qMtgAFNpA1Gx7Vo2JKiwteePsGyo="; }; - vendorSha256 = "sha256-hSnTM89s3R7UDn1gLlb1gu6rhTPqVKJpWKCz1SDyfmg="; + vendorSha256 = "sha256-GR40BgNMHi3TXVQVN1FaPNVi0HXYVm3vbg4NTXfYBes="; nativeBuildInputs = [ installShellFiles ]; From ae33267babb36b68dd839989c913d4c7e4250af8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 8 May 2021 14:19:20 -0700 Subject: [PATCH 106/213] python3Packages.backports-zoneinfo: init at 0.2.1 --- .../backports-zoneinfo/default.nix | 39 +++++++++++++++++++ .../python-modules/exchangelib/default.nix | 4 +- pkgs/top-level/python-packages.nix | 2 + 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/backports-zoneinfo/default.nix diff --git a/pkgs/development/python-modules/backports-zoneinfo/default.nix b/pkgs/development/python-modules/backports-zoneinfo/default.nix new file mode 100644 index 00000000000..a9bc0b55955 --- /dev/null +++ b/pkgs/development/python-modules/backports-zoneinfo/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, pythonOlder +, importlib-resources +, hypothesis +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "backports-zoneinfo"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "pganssle"; + repo = "zoneinfo"; + rev = version; + sha256 = "sha256-00xdDOVdDanfsjQTd3yjMN2RFGel4cWRrAA3CvSnl24="; + }; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ + importlib-resources + ]; + + pythonImportsCheck = [ "backports.zoneinfo" ]; + + checkInputs = [ + hypothesis + pytestCheckHook + ]; + + # unfortunately /etc/zoneinfo doesn't exist in sandbox, and many tests fail + doCheck = false; + + meta = with lib; { + description = "Backport of the standard library module zoneinfo"; + homepage = "https://github.com/pganssle/zoneinfo"; + license = licenses.asl20; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 0cccedd54a9..d29da91af29 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -3,7 +3,7 @@ lxml, tzlocal, python-dateutil, pygments, requests-kerberos, defusedxml, cached-property, isodate, requests_ntlm, dnspython, psutil, requests-mock, pyyaml, - oauthlib, requests_oauthlib, + oauthlib, requests_oauthlib, tzdata, flake8, }: @@ -24,7 +24,7 @@ buildPythonPackage rec { flake8 ]; propagatedBuildInputs = [ - lxml tzlocal python-dateutil pygments requests-kerberos + lxml tzlocal tzdata python-dateutil pygments requests-kerberos defusedxml cached-property isodate requests_ntlm dnspython oauthlib requests_oauthlib ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08fdc924071..1681942e41d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -935,6 +935,8 @@ in { backports_weakref = callPackage ../development/python-modules/backports_weakref { }; + backports-zoneinfo = callPackage ../development/python-modules/backports-zoneinfo { }; + bacpypes = callPackage ../development/python-modules/bacpypes { }; banal = callPackage ../development/python-modules/banal { }; From 283a7fe85c001dfa4cb36659f04d6f91f1359079 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 8 May 2021 14:28:06 -0700 Subject: [PATCH 107/213] python3Packages.exchangelib: fix build --- pkgs/development/python-modules/exchangelib/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index d29da91af29..bf9ae2284f7 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -4,7 +4,7 @@ defusedxml, cached-property, isodate, requests_ntlm, dnspython, psutil, requests-mock, pyyaml, oauthlib, requests_oauthlib, tzdata, - flake8, + flake8, backports-zoneinfo }: buildPythonPackage rec { @@ -27,6 +27,8 @@ buildPythonPackage rec { lxml tzlocal tzdata python-dateutil pygments requests-kerberos defusedxml cached-property isodate requests_ntlm dnspython oauthlib requests_oauthlib + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo ]; meta = with lib; { From d19e4cc55a3329546a7ebee860e5da77105ae702 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 5 May 2021 05:04:17 +0000 Subject: [PATCH 108/213] kooha: 1.1.2 -> 1.1.3 --- pkgs/applications/video/kooha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix index 1531378db89..223ed132c92 100644 --- a/pkgs/applications/video/kooha/default.nix +++ b/pkgs/applications/video/kooha/default.nix @@ -4,14 +4,14 @@ python3.pkgs.buildPythonApplication rec { pname = "kooha"; - version = "1.1.2"; + version = "1.1.3"; format = "other"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Kooha"; rev = "v${version}"; - sha256 = "0jr55b39py9c8dc9rihn7ffx2yh71qqdk6pfn3c2ciiajjs74l17"; + sha256 = "14lrx6wplvlk3cg3wij88h4ydp3m69pw7lvvzrq3j9qnh431bs36"; }; buildInputs = [ From 3e8440cb2691d12dfe9458f96ca65a4aae5db460 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 May 2021 00:56:13 +0000 Subject: [PATCH 109/213] bazelisk: 1.8.0 -> 1.8.1 --- pkgs/development/tools/bazelisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index ab73b8cd8f3..b676213d09c 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bD04wqmtBgdNlPGXz7/4kYQ97r9EthFfGExxOjt8u7k="; + sha256 = "sha256-w2YCqFkZLsTddj9OPOIdFPgXcXapCGWkc5RaH7RHg24="; }; vendorSha256 = "sha256-IkW13y51NhKflAeHLu8k7DxRqYVnfMHSnfFuT6H/flo="; From f36a22c6b335e29a22f8fa9d0c2cf5ff2a39c230 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 4 May 2021 04:15:31 +0000 Subject: [PATCH 110/213] gh-ost: 1.1.0 -> 1.1.1 --- pkgs/tools/misc/gh-ost/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix index dd28ddfaff5..bc7d3f6db42 100644 --- a/pkgs/tools/misc/gh-ost/default.nix +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "gh-ost"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "github"; repo = "gh-ost"; rev = "v${version}"; - sha256 = "0laj5nmf10qn01mqn0flipmhankgvrcfbdl3bc76wa14qkkg722m"; + sha256 = "sha256-srJXzY4TTHZDYKq8OPqin4zRoYlmaJKhHXDzO/GjBV8="; }; goPackagePath = "github.com/github/gh-ost"; From 4d85ba7d911f1c65badf24911565bcc30a4345bf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 4 May 2021 08:17:06 +0000 Subject: [PATCH 111/213] acme-sh: 2.8.8 -> 2.8.9 --- pkgs/tools/admin/acme.sh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 63ca45452e6..2f8532448f3 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2, unixtools, dnsutils }: stdenv.mkDerivation rec { pname = "acme.sh"; - version = "2.8.8"; + version = "2.8.9"; src = fetchFromGitHub { owner = "Neilpang"; repo = "acme.sh"; rev = version; - sha256 = "1iqwzqgg26vsg7lwmgmga9y3ap9q8r5xyx799bj8kawnr8n6s4jd"; + sha256 = "sha256-xiLAvxly4WbMb6DAXPsXJgQqVmTlX9cbqFECJQ+r0Jk="; }; nativeBuildInputs = [ makeWrapper ]; From e8a58e8a909bd14e90e95e614e95f5b7f453c934 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 5 May 2021 02:16:37 +0000 Subject: [PATCH 112/213] doppler: 3.24.3 -> 3.24.4 --- pkgs/tools/security/doppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 0f2dee26ffc..48625e48355 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.24.3"; + version = "3.24.4"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-G7oyyvrn+19N0C0V5MBwls+dQNzHh+DJmMTmsln8rC4="; + sha256 = "sha256-j1HTWC/YDER2LPJ1ELoxA5ZOxrdQOnDiHNOc7aVgWlk="; }; vendorSha256 = "sha256-UaR/xYGMI+C9aID85aPSfVzmTWXj4KcjfOJ6TTJ8KoY="; From bf003c4670c6c4059c6f4f873518a4819368f19d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 May 2021 07:12:22 +0000 Subject: [PATCH 113/213] linuxPackages.bcc: 0.19.0 -> 0.20.0 --- pkgs/os-specific/linux/bcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 4235ecb38d3..1ecf46ad22b 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -6,7 +6,7 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.19.0"; + version = "0.20.0"; disabled = !stdenv.isLinux; @@ -14,7 +14,7 @@ python.pkgs.buildPythonApplication rec { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "sha256:0k807vzznlb2icczw64ph6q28605kvghya2kd4h3c7jmap6gq1qg"; + sha256 = "1xnpz2zv445dp5h0160drv6xlvrnwfj23ngc4dp3clcd59jh1baq"; }; format = "other"; From 9cb8e1ea069dcf86a930690dd9c9640eab815dfa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 5 May 2021 16:21:29 +0000 Subject: [PATCH 114/213] jenkins: 2.277.3 -> 2.277.4 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 5373b2d359b..67074d43543 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.277.3"; + version = "2.277.4"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "1awixb55bkpqcvf2s59aph3kxdd70g9x1a5s5kly33kwrplcf8iy"; + sha256 = "19z72d0rkxpvl03aqz102in9ln08r9831lj3ymsgmglk8c37ici6"; }; buildCommand = '' From d32199f0a6b46cf481b0ebd569588ca0dc94ab0c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 May 2021 01:38:43 +0000 Subject: [PATCH 115/213] certbot: 1.14.0 -> 1.15.0 --- pkgs/development/python-modules/certbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 7b4f7064b16..12e541d9007 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-J514zgmIcHpwySChFBXGKR4552wS9z5x8Berk/irHSU="; + sha256 = "sha256-Z5ZIA0ib+N7La6Z0Taf6DovCF6fXnEDppPQt6Vgwl0c="; }; sourceRoot = "source/${pname}"; From aff091d3dadf476837b6f7a843013d2f718b2806 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 4 May 2021 06:33:34 +0000 Subject: [PATCH 116/213] libmodulemd: 2.12.0 -> 2.12.1 --- pkgs/development/libraries/libmodulemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix index f95d39a02da..edadff523f3 100644 --- a/pkgs/development/libraries/libmodulemd/default.nix +++ b/pkgs/development/libraries/libmodulemd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libmodulemd"; - version = "2.12.0"; + version = "2.12.1"; outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "fedora-modularity"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1mq9as98q4wyka404f8xwfc44cn5j4bsk0fch5pf07v81sagc1q9"; + sha256 = "sha256-Relj14uG+dp9r5xWEbw/eAmlUJJ/kRwlPclcWGQxoJg="; }; patches = [ From c13ae19fadf2fe009952a9a9c0fc91b5e0921e86 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 4 May 2021 03:08:41 +0000 Subject: [PATCH 117/213] droidcam: 1.7.2 -> 1.7.3 --- pkgs/applications/video/droidcam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix index eed4c030cfa..dfb110795f4 100644 --- a/pkgs/applications/video/droidcam/default.nix +++ b/pkgs/applications/video/droidcam/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "droidcam"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "aramg"; repo = "droidcam"; rev = "v${version}"; - sha256 = "sha256-Ny/PJu+ifs9hQRDUv1pONBb6fKJzoiNtjPOFc4veU8c="; + sha256 = "sha256-Ok8FJweSzmewjYzfBJQ28xGHKK/Y32ng1hOCPVwc8eU="; }; nativeBuildInputs = [ From 77079fba2cddf642af7b1e5e981fe90afa5611e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 4 May 2021 03:56:52 +0000 Subject: [PATCH 118/213] flyctl: 0.0.211 -> 0.0.212 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index b65c342aaa7..a8ae0c31ee8 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.211"; + version = "0.0.212"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-iR8vEXLRdhLggFvu4Vhb8WW2Wo6qzAMQWC7qUMlWGd8="; + sha256 = "sha256-4BL+IhwmKiPN5G/5ut0RJcCXWy4IKPichx2dD3/TRic="; }; preBuild = '' From 177dc3e8452cf7b78e0771d431f994977fd4e35d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 3 May 2021 12:59:49 +0000 Subject: [PATCH 119/213] global: 6.6.5 -> 6.6.6 --- pkgs/development/tools/misc/global/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 7ace6f857c8..739615a841c 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -6,11 +6,11 @@ let pygments = python3Packages.pygments; in stdenv.mkDerivation rec { pname = "global"; - version = "6.6.5"; + version = "6.6.6"; src = fetchurl { url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - sha256 = "10vvsgx8v54whb4j9mk5qqyb5h3rdd9da0il3wir8pcpksyk0dww"; + sha256 = "sha256-dYB4r/+Y1MBRxYeFx62j7Rl3+rt3+Il/9le3HMYtTV0="; }; nativeBuildInputs = [ libtool makeWrapper ]; From b88ed9cbe7b38c54424c50240e071e97ebddb314 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 3 May 2021 07:50:20 +0000 Subject: [PATCH 120/213] corectrl: 1.1.1 -> 1.1.2 --- pkgs/applications/misc/corectrl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index f213faa4412..5245d559d44 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-YQDrxPqCa3OzNKd3UiAffqqvOrgbXmDFJGjYPetolyY="; + sha256 = "sha256-hKYZkKQOvNu2qDSOq1cjoiLwwOvEqdJfqGG5p3Vhkhs="; }; nativeBuildInputs = [ From 1370970ca81e72188faedd50b448379247c2efaf Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sat, 8 May 2021 18:13:31 -0400 Subject: [PATCH 121/213] python3Packages.wordfeq: 2.3.2 -> 2.5 --- .../python-modules/wordfreq/default.nix | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix index d687ffd2d0b..6aa8599653b 100644 --- a/pkgs/development/python-modules/wordfreq/default.nix +++ b/pkgs/development/python-modules/wordfreq/default.nix @@ -6,38 +6,43 @@ , msgpack , mecab-python3 , jieba -, pytest -, pythonOlder +, pytestCheckHook +, isPy27 , fetchFromGitHub }: buildPythonPackage rec { pname = "wordfreq"; - version = "2.3.2"; - disabled = pythonOlder "3"; + version = "2.5"; + disabled = isPy27; src = fetchFromGitHub { owner = "LuminosoInsight"; repo = "wordfreq"; - # upstream don't tag by version rev = "v${version}"; - sha256 = "078657iiksrqzcc2wvwhiilf3xxq5vlinsv0kz03qzqr1qyvbmas"; + sha256 = "09wzraddbdw3781pk2sxlz8knax9jrcl24ymz54wx6sk0gvq95i7"; }; - propagatedBuildInputs = [ regex langcodes ftfy msgpack mecab-python3 jieba ]; + propagatedBuildInputs = [ + regex + langcodes + ftfy + msgpack + mecab-python3 + jieba + ]; - # patch to relax version requirements for regex - # dependency to prevent break in upgrade postPatch = '' substituteInPlace setup.py --replace "regex ==" "regex >=" ''; - checkInputs = [ pytest ]; - - checkPhase = '' - # These languages require additional dictionaries - pytest tests -k 'not test_japanese and not test_korean and not test_languages and not test_french_and_related' - ''; + checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # These languages require additional dictionaries that aren't packaged + "test_languages" + "test_japanese" + "test_korean" + ]; meta = with lib; { description = "A library for looking up the frequencies of words in many languages, based on many sources of data"; From e7e6c1e37e6185a75bfdb4facbf1df8139d058f3 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sat, 8 May 2021 17:56:17 -0400 Subject: [PATCH 122/213] python3Packages.dask-image: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/dask-image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index 38d113eee70..e3ab607dcac 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "0.5.0"; + version = "0.6.0"; pname = "dask-image"; src = fetchPypi { inherit pname version; - sha256 = "0bf7ea8dcd9d795505b498bd632394720c048f50761e23c574d9a6bacfb27cbb"; + sha256 = "1zzxrvbm52xn7azkn74pjinlk0jkpdcyl3r5vxxy5lmjnmzlrrpy"; }; propagatedBuildInputs = [ dask scipy pims ]; From 4053d2e481ab68558445540ac1b6a8ba97101349 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 4 May 2021 01:46:38 +0000 Subject: [PATCH 123/213] containerd: 1.4.4 -> 1.5.0 --- pkgs/applications/virtualization/containerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 8a4302de64f..657588e5eaf 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoPackage rec { pname = "containerd"; - version = "1.4.4"; + version = "1.5.0"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb"; + sha256 = "sha256-dUn9lvDLoljq5JPFvUdJ8te0VHkCs9Y9Em2mcq5mHvY="; }; goPackagePath = "github.com/containerd/containerd"; From 99f9c7c4d35629bd67eb4806c0c863c5c9cdb471 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 8 May 2021 22:14:07 +0000 Subject: [PATCH 124/213] python3Packages.Markups: fix tests by providing PyYAML --- pkgs/development/python-modules/Markups/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/Markups/default.nix b/pkgs/development/python-modules/Markups/default.nix index 012f31c266b..d997b120d3b 100644 --- a/pkgs/development/python-modules/Markups/default.nix +++ b/pkgs/development/python-modules/Markups/default.nix @@ -5,6 +5,7 @@ , markdown , docutils , pygments +, pyyaml }: buildPythonPackage rec { @@ -16,7 +17,7 @@ buildPythonPackage rec { sha256 = "e309d79dde0935576ce1def6752f2127a12e2c2ea2ae8b0c69f99ff8bc12181d"; }; - checkInputs = [ markdown docutils pygments ]; + checkInputs = [ markdown docutils pygments pyyaml ]; propagatedBuildInputs = [ python-markdown-math ]; meta = { From 49c8421f10faa416c690246b4f9db6ac50300de8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 May 2021 07:35:26 +0000 Subject: [PATCH 125/213] python38Packages.autopep8: 1.5.6 -> 1.5.7 --- pkgs/development/python-modules/autopep8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 491663b56cd..737989ac318 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.5.6"; + version = "1.5.7"; src = fetchPypi { inherit pname version; - sha256 = "5454e6e9a3d02aae38f866eec0d9a7de4ab9f93c10a273fb0340f3d6d09f7514"; + sha256 = "276ced7e9e3cb22e5d7c14748384a5cf5d9002257c0ed50c0e075b68011bb6d0"; }; propagatedBuildInputs = [ pycodestyle toml ]; From f0521b2416d8c9615d76bbc1bd0a44cefedc2998 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 May 2021 02:10:21 +0000 Subject: [PATCH 126/213] codeql: 2.5.2 -> 2.5.3 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index abcd947fa31..fb0cf4217ab 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.5.2"; + version = "2.5.3"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-/Pl9qDzFSL67lBEyHPqy3QfNCXzR510SgM0U8f55Dqg="; + sha256 = "sha256-+bVbl6cuWrG+75AN5a1SUI8AXJq8ThnOpITPf6S2uEI="; }; nativeBuildInputs = [ From 7f1a670e79e746c1388c038ecf4bbc0a6a13c2db Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 May 2021 03:23:11 +0000 Subject: [PATCH 127/213] findomain: 4.0.1 -> 4.1.0 --- pkgs/tools/networking/findomain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index a32e98ca18a..9c6aa52f607 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-uv1boI9iaBeobo/58Di4oslh1eGLuK9HR5EwQQeWn+0="; + sha256 = "sha256-kzB6HIZK1XRxnjg5FvUWESalrYppJiiXVI8DBsDpLu8="; }; - cargoSha256 = "sha256-31OD/sv4br9cdBNqNGr4McypSGkBbKs7b7H1u7mFt3o="; + cargoSha256 = "sha256-2XftJ/T8wSaHXVgqbWY6EAmaVBXEzM+J6TSOJ0QFR3g="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; From 6a0d9e5242ea97fd0ae6e1294df2a6414a0a0d39 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 9 May 2021 00:49:23 +0200 Subject: [PATCH 128/213] haskellPackages.paramtree: disable flaky test suite --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8637de9495f..1ef615584dc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1946,4 +1946,8 @@ self: super: { # https://github.com/enomsg/science-constants-dimensional/pull/1 science-constants-dimensional = doJailbreak super.science-constants-dimensional; + # Tests are flaky on busy machines + # https://github.com/merijn/paramtree/issues/4 + paramtree = dontCheck super.paramtree; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From e7296ab998deda5c525f1d9516e2b9ac733b4195 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sat, 8 May 2021 18:45:46 -0400 Subject: [PATCH 129/213] python3Packages.pygmt: fix build --- pkgs/development/python-modules/pygmt/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 130be6d44c3..804b33c2f79 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -2,12 +2,17 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub +, setuptools-scm , gmt , numpy , netcdf4 , pandas , packaging , xarray +, pytest-mpl +, ipython +, ghostscript +, pytestCheckHook }: buildPythonPackage rec { @@ -28,12 +33,14 @@ buildPythonPackage rec { --replace "env.get(\"GMT_LIBRARY_PATH\", \"\")" "env.get(\"GMT_LIBRARY_PATH\", \"${gmt}/lib\")" ''; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ numpy netcdf4 pandas packaging xarray ]; - doCheck = false; # requires network access - - postBuild = "export HOME=$TMP"; - + doCheck = false; # the *entire* test suite requires network access + checkInputs = [ pytestCheckHook pytest-mpl ghostscript ipython ]; + postBuild = '' + export HOME=$TMP + ''; pythonImportsCheck = [ "pygmt" ]; meta = with lib; { From 66de11da71cf3de9a748eb30cad667e6147b4c41 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 9 May 2021 01:01:21 +0200 Subject: [PATCH 130/213] maintainers/scripts/haskell/regenerate-hackage-packages.sh: Small improvents and encoding workaround --- .../haskell/regenerate-hackage-packages.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh index 462840cd24c..1effa5e2596 100755 --- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh +++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -1,12 +1,12 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable git nix -I nixpkgs=. -# This script is used to regenerate nixpkgs' Haskell package set, using a tool -# called hackage2nix. hackage2nix looks at the config files in -# pkgs/development/haskell-modules/configuration-hackage2nix and generates -# a Nix expression for package version specified there, using the Cabal files -# from the Hackage database (available under all-cabal-hashes) and its -# companion tool cabal2nix. +# This script is used to regenerate nixpkgs' Haskell package set, using the +# tool hackage2nix from the nixos/cabal2nix repo. hackage2nix looks at the +# config files in pkgs/development/haskell-modules/configuration-hackage2nix +# and generates a Nix expression for package version specified there, using the +# Cabal files from the Hackage database (available under all-cabal-hashes) and +# its companion tool cabal2nix. # # Related scripts are update-hackage.sh, for updating the snapshot of the # Hackage database used by hackage2nix, and update-cabal2nix-unstable.sh, @@ -14,10 +14,15 @@ set -euo pipefail +# To prevent hackage2nix fails because of encoding. +# See: https://github.com/NixOS/nixpkgs/pull/122023 +export LC_ALL=C.UTF-8 + extraction_derivation='with import ./. {}; runCommand "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"' unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)" config_dir=pkgs/development/haskell-modules/configuration-hackage2nix +echo "Starting hackage2nix to regenerate pkgs/development/haskell-modules/hackage-packages.nix ..." hackage2nix \ --hackage "$unpacked_hackage" \ --preferred-versions <(for n in "$unpacked_hackage"/*/preferred-versions; do cat "$n"; echo; done) \ @@ -35,3 +40,5 @@ hackage-packages.nix: Regenerate based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh EOF fi + +echo "Regeneration of hackage-packages.nix finished." From 3e3f1c02f24b4ba8d582bb0fb9ef256fa3293fd0 Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Sat, 8 May 2021 21:13:55 +0200 Subject: [PATCH 131/213] haskellPackages.gi-gtk-declarative-app-simple: loosen haskell-gi version bound https://hydra.nixos.org/build/142721471/nixlog/1 ZHF: #122042 --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1ef615584dc..130c1f89e83 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1950,4 +1950,9 @@ self: super: { # https://github.com/merijn/paramtree/issues/4 paramtree = dontCheck super.paramtree; + # Too strict version bounds on haskell-gi + # https://github.com/owickstrom/gi-gtk-declarative/issues/100 + gi-gtk-declarative = doJailbreak super.gi-gtk-declarative; + gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 3a9d159ed1b41ca18523b2c95c7edb3845c1b411 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 May 2021 13:28:27 +0000 Subject: [PATCH 132/213] libsForQt5.fcitx5-qt: 5.0.4 -> 5.0.6 --- pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index b24dac6886d..40465d55e40 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "fcitx5-qt"; - version = "5.0.4"; + version = "5.0.6"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-qt"; rev = version; - sha256 = "sha256-PZbnxt30Tv7i+Q6G9UpGgWDs65rn0MZVe1ybhz4vN9I="; + sha256 = "sha256-Y7X4pkBSf5FMpf1mdyLvr1QWhqz3yC4iOGXDvvvV9Yw="; }; preConfigure = '' From d52c2692e974360fc5064173e28428fe72ac7386 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 8 May 2021 18:55:52 +0200 Subject: [PATCH 133/213] haskellPackages.language-docker: unbreak sdist doesn't contain all the files necessary for the tests, so we need to fetch the source from github instead. --- .../haskell-modules/configuration-common.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 130c1f89e83..a03d4b8b119 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1955,4 +1955,16 @@ self: super: { gi-gtk-declarative = doJailbreak super.gi-gtk-declarative; gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple; + # Test assets missing from sdist + # https://github.com/hadolint/language-docker/issues/63 + language-docker = overrideSrc super.language-docker { + src = pkgs.fetchFromGitHub { + owner = "hadolint"; + repo = "language-docker"; + rev = "refs/tags/${super.language-docker.version}"; + sha256 = "06263jy538ni31vms5pzggmh64fyk62cv3lxnvkc6gylb94kljb8"; + name = "language-docker-${super.language-docker.version}-source"; + }; + }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From f170298c9aa07cbd08af414ea16723af3122cb9e Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 9 May 2021 01:49:17 +0200 Subject: [PATCH 134/213] top-level/release.nix: fix evaluation of jobset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to merge the set of complete jobs not of platforms to test on since our aggregate jobs will always be “proper” jobs. --- pkgs/top-level/release-haskell.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 0fe5f730dc2..a4ce43859ce 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -77,8 +77,8 @@ let recursiveUpdateMany = builtins.foldl' lib.recursiveUpdate {}; - jobs = mapTestOn (recursiveUpdateMany [ - { + jobs = recursiveUpdateMany [ + (mapTestOn { haskellPackages = packagePlatforms pkgs.haskellPackages; haskell.compiler = packagePlatforms pkgs.haskell.compiler; @@ -194,7 +194,7 @@ let ; elmPackages.elm = pkgsPlatforms.elmPackages.elm; - } + }) (versionedCompilerJobs { # Packages which should be checked on more than the # default GHC version. This list can be used to test @@ -266,6 +266,6 @@ let (maintainedPkgNames pkgs.haskellPackages)); }; } - ]); + ]; in jobs From ce420d97923d68c9b43b0e18f7d15837d4a32f58 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 19:15:24 +0000 Subject: [PATCH 135/213] libwpe: 1.8.0 -> 1.10.0 --- pkgs/development/libraries/libwpe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix index 4397f65ac4b..9e7886eb68d 100644 --- a/pkgs/development/libraries/libwpe/default.nix +++ b/pkgs/development/libraries/libwpe/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "libwpe"; - version = "1.8.0"; + version = "1.10.0"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-pvAKfQkcvU21f+fuO0wSxjUJIdZU7XmBKACibIiEgdI="; + sha256 = "sha256-JBXicNReNZXtQFK8EF9zN0TcLTZ34S/0qDHlAphBCE0="; }; nativeBuildInputs = [ From 014d7ce37799b66040b3d170920a448d31910922 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 19:18:58 +0000 Subject: [PATCH 136/213] liquibase: 4.3.2 -> 4.3.4 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 32ab88bf412..ebd6064ee91 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.3.2"; + version = "4.3.4"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-sc/W4N+pd1bhLiyQLqm0j2o/RviT8iKzBZcD0GRDqqE="; + sha256 = "sha256-tWk4AW2F1v+5C7Gj9I6c4JVfaQDXEVMdPoaKafa7OgE="; }; nativeBuildInputs = [ makeWrapper ]; From 2502b7cb916d7c10aa4ca528c162a59a4e98462d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 21:04:09 +0000 Subject: [PATCH 137/213] libsolv: 0.7.17 -> 0.7.19 --- pkgs/development/libraries/libsolv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 089fbe4b351..c7dede355df 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.17"; + version = "0.7.19"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-LPOS+yDwNpyO9tkFoIy4SCQymytOGB26Pfyd/EFEYnc="; + sha256 = "sha256-AN4cgpMBqTtK04CU89Yqd1ZfWyPrCociPd3XKdVONMU="; }; cmakeFlags = [ From df68856b084ef38094e530223acfc74e21bd8159 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sat, 8 May 2021 19:12:47 -0400 Subject: [PATCH 138/213] python3Packages.pyflume: fix build --- pkgs/development/python-modules/pyflume/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/pyflume/default.nix b/pkgs/development/python-modules/pyflume/default.nix index 36980ddbadf..5c79cd4d257 100644 --- a/pkgs/development/python-modules/pyflume/default.nix +++ b/pkgs/development/python-modules/pyflume/default.nix @@ -22,6 +22,13 @@ buildPythonPackage rec { sha256 = "1dm560hh6fl1waiwsq8m31apmvvwhc3y95bfdb7449bs8k96dmxq"; }; + prePatch = '' + substituteInPlace setup.py --replace 'pyjwt==2.0.1' 'pyjwt>=2.0.1' + substituteInPlace setup.py --replace 'ratelimit==2.2.1' 'ratelimit>=2.2.1' + substituteInPlace setup.py --replace 'pytz==2019.2' 'pytz>=2019.2' + substituteInPlace setup.py --replace 'requests==2.24.0' 'requests>=2.24.0' + ''; + propagatedBuildInputs = [ pyjwt ratelimit From b4640b3cfc63aeff89147123b2e93a112402e7b0 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sat, 8 May 2021 18:59:49 -0400 Subject: [PATCH 139/213] python3Packages.pyaftership: fix build --- .../python-modules/pyaftership/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyaftership/default.nix b/pkgs/development/python-modules/pyaftership/default.nix index e65812cb313..6253d951118 100644 --- a/pkgs/development/python-modules/pyaftership/default.nix +++ b/pkgs/development/python-modules/pyaftership/default.nix @@ -1,4 +1,13 @@ -{ aiohttp, async-timeout, buildPythonPackage, fetchPypi, isPy3k, lib }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, aiohttp +, async-timeout +, aresponses +, pytest-asyncio +, pytestCheckHook +}: buildPythonPackage rec { pname = "pyaftership"; @@ -6,16 +15,17 @@ buildPythonPackage rec { disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "28b62c323d06492399b60d8135a58d6feaa1d60837eddc14e57ea2b69d356c0a"; + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "0jyzgwaijkp80whi58a0hgjzmnlczmd9vwn11z2m0j01kbdwznn5"; }; propagatedBuildInputs = [ aiohttp async-timeout ]; - # No tests - doCheck = false; - pythonImportsCheck = [ "pyaftership.tracker" ]; + checkInputs = [ pytestCheckHook aresponses pytest-asyncio ]; + pythonImportsCheck = [ "pyaftership" ]; meta = with lib; { description = "Python wrapper package for the AfterShip API"; From 83fe0340fd81f1810e6ffcb314770e6659f2d032 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sat, 8 May 2021 19:21:52 -0400 Subject: [PATCH 140/213] python3Packages.ipympl: fix build --- pkgs/development/python-modules/ipympl/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index 44c8c7bfd06..2d25eb645ba 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, ipywidgets, matplotlib }: +{ lib +, buildPythonPackage +, fetchPypi +, ipywidgets +, matplotlib +, jupyter-packaging +}: buildPythonPackage rec { pname = "ipympl"; @@ -9,7 +15,7 @@ buildPythonPackage rec { sha256 = "f0f1f356d8cb9d4fb51bb86dbbf837c190145316cb72f66081872ebc4d6db0a1"; }; - propagatedBuildInputs = [ ipywidgets matplotlib ]; + propagatedBuildInputs = [ ipywidgets matplotlib jupyter-packaging ]; # There are no unit tests in repository doCheck = false; From dd7741f26e0140f53a3baf68b380aae701844434 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sat, 8 May 2021 19:40:06 -0400 Subject: [PATCH 141/213] python3Packages.hyppo: fix build --- pkgs/development/python-modules/hyppo/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index 86b43465fb6..cc0b569d9b2 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -6,6 +6,8 @@ , numpy , scikitlearn , scipy +, matplotlib +, seaborn }: buildPythonPackage rec { @@ -28,8 +30,12 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ pytestCheckHook pytestcov ]; - pytestFlagsArray = [ "--ignore=docs" ]; + checkInputs = [ pytestCheckHook pytestcov matplotlib seaborn ]; + disabledTestPaths = [ + "docs" + "benchmarks" + "examples" + ]; meta = with lib; { homepage = "https://github.com/neurodata/hyppo"; From db770a84f11b5322f4d688a3b3dfe111283ecd92 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 19:23:52 +0000 Subject: [PATCH 142/213] lilypond: 2.22.0 -> 2.22.1 --- pkgs/misc/lilypond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index d8db893f7d7..b75f9c3f800 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "lilypond"; - version = "2.22.0"; + version = "2.22.1"; src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "0khg9dlm1b02mm9w54xqc9ydj416xkikn6p08g1asiyjf4qx1pb4"; + sha256 = "sha256-cqwtVMMQwxQcC3gtTgvvkALVUZz0ZjJ1mx8D72lpzDA="; }; postInstall = '' From da98a2dac872e13820385b9da53adbb7960f5151 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sat, 8 May 2021 19:44:00 -0400 Subject: [PATCH 143/213] python3Packages.crate: fix build --- pkgs/development/python-modules/crate/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index 9be85ff4b3c..07b9652e775 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -29,6 +29,9 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + "RequestsCaBundleTest" + ]; disabledTestPaths = lib.optionals stdenv.isDarwin [ "src/crate/client/test_http.py" ]; meta = with lib; { From cb2604ae1a4f306f679d5d6e8c82713653b7d880 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 May 2021 18:26:58 +0000 Subject: [PATCH 144/213] klibc: 2.0.8 -> 2.0.9 --- pkgs/os-specific/linux/klibc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index dc96f3b6a62..522a74dea01 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "klibc"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; - sha256 = "0dmlkhnn5q8fc6rkzsisir4chkzmmiq6xkjmvyvf0g7yihwz2j2f"; + sha256 = "sha256-bcynCJEzINJjCfBbDCv2gHG/EbPa3MTmx9kjg3/CPuE="; }; patches = [ ./no-reinstall-kernel-headers.patch ]; From cba2ac27050f288b807204bc57abac3f4fc7763e Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sat, 8 May 2021 19:55:57 -0400 Subject: [PATCH 145/213] python3Packages.localzone: 0.9.7 -> 0.9.8 --- pkgs/development/python-modules/localzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/localzone/default.nix b/pkgs/development/python-modules/localzone/default.nix index 0960a824817..0fcf15fe947 100644 --- a/pkgs/development/python-modules/localzone/default.nix +++ b/pkgs/development/python-modules/localzone/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "localzone"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "ags-slc"; repo = pname; rev = "v${version}"; - sha256 = "1vzn1vm3zf86l7qncbmghjrwyvla9dc2v8abn8jajbl47gm7r5f7"; + sha256 = "1cbiv21yryjqy46av9hbjccks95sxznrx8nypd3yzihf1vkjiq5a"; }; propagatedBuildInputs = [ dnspython sphinx ]; From 5ab09faafb5ba9875ce86ae99caa92f1194880d1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 5 May 2021 13:30:46 +0000 Subject: [PATCH 146/213] gretl: 2021a -> 2021b --- pkgs/applications/science/math/gretl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix index cc9fe7c4d2c..450021925bd 100644 --- a/pkgs/applications/science/math/gretl/default.nix +++ b/pkgs/applications/science/math/gretl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gretl"; - version = "2021a"; + version = "2021b"; src = fetchurl { url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; - sha256 = "sha256-BDaTv6PORiBnsEaU7uXJIKuxTqIgpY44vUmSViyME0A="; + sha256 = "sha256-3KSAA0UPx3cqMXf/G5nrlCfLjWcDiGtzvJe/syRyE6c="; }; buildInputs = [ From ed09e90e95f2feddb72bd1cd1bbe038c7637fd6e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 21:21:55 +0000 Subject: [PATCH 147/213] matio: 1.5.20 -> 1.5.21 --- pkgs/development/libraries/matio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 0b8143b6911..3b0e811097e 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.20"; + name = "matio-1.5.21"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "sha256-XR9yofUav2qc0j6qgS+xe4YQlwWQlfSMdoxINcWqJZg="; + sha256 = "sha256-IYCRd+VYOefJTa2nRO5Vwd6n11fdqriWBXdtUBIvsGU="; }; meta = with lib; { From 9a153cb2800e9c38378dff01be930380b0a8488a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 09:46:48 +0000 Subject: [PATCH 148/213] eventstat: 0.04.11 -> 0.04.12 --- pkgs/os-specific/linux/eventstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index 6eaa58f353a..55b00ab8719 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "eventstat"; - version = "0.04.11"; + version = "0.04.12"; src = fetchzip { url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; - sha256 = "0hsi5w8dmqwwdahnqvs83bam3j1cagw1ggm06d35dfwy5xknc5i4"; + sha256 = "sha256-XBSs/jZodCpI9BHgAF8+bE23gRCr2uebYiMJxxB8T5E="; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; From 7c4e0e3a90e099e0e171ba98440cdc59b60ac5c1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 04:18:27 +0000 Subject: [PATCH 149/213] activemq: 5.16.1 -> 5.16.2 --- pkgs/development/libraries/apache-activemq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 136ffb79804..79c1715c61d 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.16.1"; + version = "5.16.2"; src = fetchurl { - sha256 = "sha256-Q9PzqJC/+uhcbxAC6c+VD8wf0X8/XlXcO4XTnQni4yM="; + sha256 = "sha256-IS/soe5Lx1C+/UWnNcv+8AwMmu5FHvURbpkTMMGrEFs="; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; From d76e167bd5a5c4a28fe12effe406749e5734092a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 8 May 2021 17:19:11 -0700 Subject: [PATCH 150/213] kronosnet: 1.20 -> 1.21 --- pkgs/development/libraries/kronosnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kronosnet/default.nix b/pkgs/development/libraries/kronosnet/default.nix index c74ff6716fe..cc282d9abc9 100644 --- a/pkgs/development/libraries/kronosnet/default.nix +++ b/pkgs/development/libraries/kronosnet/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "kronosnet"; - version = "1.20"; + version = "1.21"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-lP5W+4b9McU2Uqibh2SucIu2y4KluO3B1RpAJKgYq/M="; + sha256 = "14i4fl3g60gn5ay3dbwjcay3dnmnqr16zcp3g0wv9a3hjwh1if28"; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; From c362a28fcf2621fd3b6d6a96c821e9af9d123e21 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 8 May 2021 16:57:02 +0200 Subject: [PATCH 151/213] nixos/testing: Switch from black to pyflakes So far, we have used "black" for formatting the test code, which is rather strict and opinionated and when used inline in Nix expressions it creates all sorts of trouble. One of the main annoyances is that when using strings coming from Nix expressions (eg. store paths or option definitions from NixOS modules), completely unrelated changes could cause tests to fail, since eg. black wants lines to be broken. Another downside of enforcing a certain kind of formatting is that it makes the Nix expression code inconsistent because we're mixing two spaces of indentation (common in nixpkgs) with four spaces of indentation as defined in PEP-8. While this is perfectly fine for standalone Python files, it really looks ugly and inconsistent IMO when used within Nix strings. What we actually want though is a linter that catches problems early on before actually running the test, because this is *actually* helping in development because running the actual VM test takes much longer. This is the reason why I switched from black to pyflakes, because the latter actually has useful checks, eg. usage of undefined variables, invalid format arguments, duplicate arguments, shadowed loop vars and more. Signed-off-by: aszlig Closes: https://github.com/NixOS/nixpkgs/issues/72964 --- nixos/lib/testing-python.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 6497b897eaf..6327f7a10a3 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -159,7 +159,7 @@ rec { echo -n "$testScript" > $out/test-script ${lib.optionalString (!skipLint) '' - ${python3Packages.black}/bin/black --check --diff $out/test-script + ${python3Packages.pyflakes}/bin/pyflakes $out/test-script ''} ln -s ${testDriver}/bin/nixos-test-driver $out/bin/ From 71087b2bc4e3d78a44c8d562be63fc91c0acbefa Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 8 May 2021 17:24:47 +0200 Subject: [PATCH 152/213] nixos/testing-python.nix: Expose driver (cherry picked from commit a2c9220568648b4528154ebd8e657add243ed0b4) --- nixos/lib/testing-python.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 6327f7a10a3..fde52ba4fc1 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -73,7 +73,9 @@ rec { LOGFILE=/dev/null tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver ''; - passthru = driver.passthru; + passthru = driver.passthru // { + inherit driver; + }; inherit pos; }; From 56d9637119ef4f05be20887ed09b2a2b760e6dae Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 8 May 2021 17:52:22 +0200 Subject: [PATCH 153/213] nixos/testing: Set up scope for testScript linter Our test driver exposes a bunch of variables and functions, which pyflakes doesn't recognise by default because it assumes that the test script is executed standalone. In reality however the test driver script is using exec() on the testScript. Fortunately pyflakes has $PYFLAKES_BUILTINS, which are the attributes that are globally available on all modules to be checked. Since we only have one module, using this environment variable is fine as opposed to my first approach to this, which tried to use the unstable internal API of pyflakes. The attributes are gathered by the main derivation of the test driver, because we don't want to end up defining a new attribute in the test driver module just to being confused why using it in a test will result in an error. Another way we could have gathered these attributes would be in mkDriver, which is where the linting takes place. However, we do have a different set of Python dependencies in scope and duplicating these will again just cause confusion over having it at one location only. Signed-off-by: aszlig Co-Authored-By: aszlig --- nixos/lib/testing-python.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index fde52ba4fc1..679c31f3e35 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -32,6 +32,14 @@ rec { preferLocalBuild = true; + buildPhase = '' + python < $out/test-script ${lib.optionalString (!skipLint) '' - ${python3Packages.pyflakes}/bin/pyflakes $out/test-script + PYFLAKES_BUILTINS="$( + echo -n ${lib.escapeShellArg (lib.concatStringsSep "," nodeHostNames)}, + < ${lib.escapeShellArg "${testDriver}/nix-support/driver-exports"} + )" ${python3Packages.pyflakes}/bin/pyflakes $out/test-script ''} ln -s ${testDriver}/bin/nixos-test-driver $out/bin/ @@ -195,6 +208,8 @@ rec { (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null) nodeNames; + nodeHostNames = map (c: c.config.system.name) (lib.attrValues driver.nodes); + in if lib.length invalidNodeNames > 0 then throw '' From 06b070ffe7f4f24a2a92c22b0696517b247cd862 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 8 May 2021 18:38:00 +0200 Subject: [PATCH 154/213] nixosTests.acme: lint --- nixos/tests/acme.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 99dd8ec6fd3..6f98b0da378 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -245,7 +245,7 @@ in import ./make-test-python.nix ({ lib, ... }: { ) for line in subject_data.lower().split("\n"): if "subject" in line: - print(f"First subject in fullchain.pem: ", line) + print(f"First subject in fullchain.pem: {line}") assert cert_name.lower() in line return From b9e7fb14e2ea9a7047e719f65aa1b465ec472829 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 8 May 2021 22:57:44 +0200 Subject: [PATCH 155/213] nixos/tests/nfs: lint --- nixos/tests/nfs/kerberos.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/nfs/kerberos.nix b/nixos/tests/nfs/kerberos.nix index 75d1210496b..5684131f671 100644 --- a/nixos/tests/nfs/kerberos.nix +++ b/nixos/tests/nfs/kerberos.nix @@ -88,8 +88,8 @@ in "kdb5_util create -s -r NFS.TEST -P master_key", "systemctl restart kadmind.service kdc.service", ) - server.wait_for_unit(f"kadmind.service") - server.wait_for_unit(f"kdc.service") + server.wait_for_unit("kadmind.service") + server.wait_for_unit("kdc.service") # create principals server.succeed( @@ -102,8 +102,8 @@ in # add principals to server keytab server.succeed("kadmin.local ktadd nfs/server.nfs.test") server.succeed("systemctl start rpc-gssd.service rpc-svcgssd.service") - server.wait_for_unit(f"rpc-gssd.service") - server.wait_for_unit(f"rpc-svcgssd.service") + server.wait_for_unit("rpc-gssd.service") + server.wait_for_unit("rpc-svcgssd.service") client.wait_for_unit("network-online.target") From 774aba102a842c60c635fdc583ba871cf1dea8cf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 8 May 2021 22:58:41 +0200 Subject: [PATCH 156/213] nixosTests.chromium: lint Note: I didn't execute it entirely because I'd have to build chromium for this, but the diff appears fine. --- nixos/tests/chromium.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 8429d932ae6..60ecf986d6e 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -54,7 +54,8 @@ mapAttrs (channel: chromiumPkg: makeTest rec { in "${pkgs.xdotool}/bin/xdotool ${xdoScript}"; in '' import shlex - from contextlib import contextmanager, _GeneratorContextManager + import re + from contextlib import contextmanager # Run as user alice From fc76a44d0f9cc43a496b0bb4afb5b628b8fb250e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 8 May 2021 22:59:12 +0200 Subject: [PATCH 157/213] nixosTests.containers-custom-pkgs: lint The new linter basically does def testScript # ... before calling `pyflakes`. As this test-script is empty, it would lead to a syntax-error unless `pass` is added. --- nixos/tests/containers-custom-pkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/containers-custom-pkgs.nix b/nixos/tests/containers-custom-pkgs.nix index c050e49bc29..1627a2c70c3 100644 --- a/nixos/tests/containers-custom-pkgs.nix +++ b/nixos/tests/containers-custom-pkgs.nix @@ -30,5 +30,5 @@ in { }; # This test only consists of evaluating the test machine - testScript = ""; + testScript = "pass"; }) From b4b5dcb66947cf195fd05978cae0eb9d3a708199 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 8 May 2021 23:01:59 +0200 Subject: [PATCH 158/213] nixosTests.containers-imperative: lint --- nixos/tests/containers-imperative.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index bb207165a02..1dcccfc306a 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -162,6 +162,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.fail( "nixos-container create b0rk --config-file ${brokenCfg}" ) - machine.succeed(f"test ! -e /var/lib/containers/b0rk") + machine.succeed("test ! -e /var/lib/containers/b0rk") ''; }) From b782440a62879f1ea9cfe3b9be4475de924c9a51 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 8 May 2021 23:02:08 +0200 Subject: [PATCH 159/213] nixosTests.custom-ca: lint --- nixos/tests/custom-ca.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/custom-ca.nix b/nixos/tests/custom-ca.nix index 31909188d3a..7ce1101911d 100644 --- a/nixos/tests/custom-ca.nix +++ b/nixos/tests/custom-ca.nix @@ -112,6 +112,7 @@ in }; testScript = '' + from typing import Tuple def execute_as(user: str, cmd: str) -> Tuple[int, str]: """ Run a shell command as a specific user. From 62a518b904a235709b30293a08caffa202b7cbb2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 8 May 2021 23:25:20 +0200 Subject: [PATCH 160/213] nixos/tests/yggdrasil: Fix linting error Linter error was: f-string is missing placeholders Signed-off-by: aszlig --- nixos/tests/yggdrasil.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/yggdrasil.nix b/nixos/tests/yggdrasil.nix index 0b58ad29aa2..0e75ed54db2 100644 --- a/nixos/tests/yggdrasil.nix +++ b/nixos/tests/yggdrasil.nix @@ -147,7 +147,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { # If Alice can talk to Carol, then Bob's outbound peering and Carol's # local peering have succeeded and everybody is connected. alice.wait_until_succeeds(f"ping -c 1 {carol_ip6}") - alice.succeed(f"ping -c 1 ${bobIp6}") + alice.succeed("ping -c 1 ${bobIp6}") bob.succeed("ping -c 1 ${aliceIp6}") bob.succeed(f"ping -c 1 {carol_ip6}") From c066cc3c0b1f7f3c4b7e11ef330ce0980440273a Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 8 May 2021 23:36:39 +0200 Subject: [PATCH 161/213] nixos/tests/networking: Fix str literal comparison Linter error: use ==/!= to compare constant literals (str, bytes, int, float, tuple) Signed-off-by: aszlig --- nixos/tests/networking.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 1ea61f99a95..c8756207f27 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -511,7 +511,7 @@ let machine.sleep(10) residue = machine.succeed("ip tuntap list") assert ( - residue is "" + residue == "" ), "Some virtual interface has not been properly cleaned:\n{}".format(residue) ''; }; @@ -665,10 +665,10 @@ let ipv4Residue = machine.succeed("ip -4 route list dev eth0 | head -n-3").strip() ipv6Residue = machine.succeed("ip -6 route list dev eth0 | head -n-3").strip() assert ( - ipv4Residue is "" + ipv4Residue == "" ), "The IPv4 routing table has not been properly cleaned:\n{}".format(ipv4Residue) assert ( - ipv6Residue is "" + ipv6Residue == "" ), "The IPv6 routing table has not been properly cleaned:\n{}".format(ipv6Residue) ''; }; From e157ad41cb2df25b21a2d648f519caa0dc6dc712 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 8 May 2021 23:41:39 +0200 Subject: [PATCH 162/213] nixos/tests/printing: Remove unused 'sys' import Signed-off-by: aszlig --- nixos/tests/printing.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 6a1801fb288..b2f2540fb7a 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -50,7 +50,6 @@ in { testScript = '' import os import re - import sys start_all() From 6c0ec527b98de827e4dcb868498409b8e2cee1f3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 8 May 2021 23:46:07 +0200 Subject: [PATCH 163/213] nixos/tests/shadow: Fix linting errors Linter errors reported: 6:32 f-string is missing placeholders 7:26 f-string is missing placeholders 8:32 f-string is missing placeholders 30:32 f-string is missing placeholders 31:26 f-string is missing placeholders 32:32 f-string is missing placeholders 48:32 f-string is missing placeholders 49:26 f-string is missing placeholders 50:32 f-string is missing placeholders 76:32 f-string is missing placeholders 77:26 f-string is missing placeholders 78:32 f-string is missing placeholders Signed-off-by: aszlig --- nixos/tests/shadow.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/nixos/tests/shadow.nix b/nixos/tests/shadow.nix index c51961e1fc6..dd2a575b193 100644 --- a/nixos/tests/shadow.nix +++ b/nixos/tests/shadow.nix @@ -36,9 +36,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: { with subtest("Normal login"): shadow.send_key("alt-f2") - shadow.wait_until_succeeds(f"[ $(fgconsole) = 2 ]") - shadow.wait_for_unit(f"getty@tty2.service") - shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty2'") + shadow.wait_until_succeeds("[ $(fgconsole) = 2 ]") + shadow.wait_for_unit("getty@tty2.service") + shadow.wait_until_succeeds("pgrep -f 'agetty.*tty2'") shadow.wait_until_tty_matches(2, "login: ") shadow.send_chars("emma\n") shadow.wait_until_tty_matches(2, "login: emma") @@ -60,9 +60,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: { with subtest("Change password"): shadow.send_key("alt-f3") - shadow.wait_until_succeeds(f"[ $(fgconsole) = 3 ]") - shadow.wait_for_unit(f"getty@tty3.service") - shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty3'") + shadow.wait_until_succeeds("[ $(fgconsole) = 3 ]") + shadow.wait_for_unit("getty@tty3.service") + shadow.wait_until_succeeds("pgrep -f 'agetty.*tty3'") shadow.wait_until_tty_matches(3, "login: ") shadow.send_chars("emma\n") shadow.wait_until_tty_matches(3, "login: emma") @@ -78,9 +78,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: { shadow.send_chars("${password3}\n") shadow.sleep(2) shadow.send_key("alt-f4") - shadow.wait_until_succeeds(f"[ $(fgconsole) = 4 ]") - shadow.wait_for_unit(f"getty@tty4.service") - shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty4'") + shadow.wait_until_succeeds("[ $(fgconsole) = 4 ]") + shadow.wait_for_unit("getty@tty4.service") + shadow.wait_until_succeeds("pgrep -f 'agetty.*tty4'") shadow.wait_until_tty_matches(4, "login: ") shadow.send_chars("emma\n") shadow.wait_until_tty_matches(4, "login: emma") @@ -106,9 +106,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: { with subtest("nologin shell"): shadow.send_key("alt-f5") - shadow.wait_until_succeeds(f"[ $(fgconsole) = 5 ]") - shadow.wait_for_unit(f"getty@tty5.service") - shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty5'") + shadow.wait_until_succeeds("[ $(fgconsole) = 5 ]") + shadow.wait_for_unit("getty@tty5.service") + shadow.wait_until_succeeds("pgrep -f 'agetty.*tty5'") shadow.wait_until_tty_matches(5, "login: ") shadow.send_chars("layla\n") shadow.wait_until_tty_matches(5, "login: layla") From 6ad2e41269db0d68aaf92440ad44d354e9608ff0 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Sat, 8 May 2021 16:53:52 -0400 Subject: [PATCH 164/213] nixos/testing: lint jellyfin test --- nixos/tests/jellyfin.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/tests/jellyfin.nix b/nixos/tests/jellyfin.nix index f8c2429a7b8..cae31a71925 100644 --- a/nixos/tests/jellyfin.nix +++ b/nixos/tests/jellyfin.nix @@ -24,7 +24,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: in '' import json - import time from urllib.parse import urlencode machine.wait_for_unit("jellyfin.service") @@ -101,7 +100,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: def is_refreshed(_): - folders = machine.succeed(api_get(f"/Library/VirtualFolders")) + folders = machine.succeed(api_get("/Library/VirtualFolders")) folders = json.loads(folders) print(folders) return all(folder["RefreshStatus"] == "Idle" for folder in folders) @@ -141,7 +140,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: "ffmpeg" + f" -headers 'X-Emby-Authorization:{auth_header}'" + f" -i http://localhost:8096/Videos/{video}/master.m3u8?mediaSourceId={media_source_id}" - + f" /tmp/test.mkv" + + " /tmp/test.mkv" ) duration = machine.succeed( From 74bff4e6678a90934a37ab7d912c480fd313a588 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 8 May 2021 23:50:44 +0200 Subject: [PATCH 165/213] nixos/tests/unbound: Remove unused 'json' import Signed-off-by: aszlig --- nixos/tests/unbound.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/unbound.nix b/nixos/tests/unbound.nix index e24c3ef6c99..fcfa222299c 100644 --- a/nixos/tests/unbound.nix +++ b/nixos/tests/unbound.nix @@ -192,7 +192,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: testScript = { nodes, ... }: '' import typing - import json zone = "example.local." records = [("AAAA", "abcd::eeff"), ("A", "1.2.3.4")] From 54bc69637bf2a891977dc87418e4c8cd1f71ce6f Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 May 2021 00:43:41 +0200 Subject: [PATCH 166/213] nixos/test/virtualbox: Fix linting errors There were a bunch of unnecessary f-strings in there and I also removed the "# fmt: on/off" comments, because we no longer use Black and thus won't need those comments anymore. Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 0a7369b0fa2..09314d93b7d 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -226,18 +226,16 @@ let def create_vm_${name}(): - # fmt: off - vbm(f"createvm --name ${name} ${createFlags}") - vbm(f"modifyvm ${name} ${vmFlags}") - vbm(f"setextradata ${name} VBoxInternal/PDM/HaltOnReset 1") - vbm(f"storagectl ${name} ${controllerFlags}") - vbm(f"storageattach ${name} ${diskFlags}") - vbm(f"sharedfolder add ${name} ${sharedFlags}") - vbm(f"sharedfolder add ${name} ${nixstoreFlags}") + vbm("createvm --name ${name} ${createFlags}") + vbm("modifyvm ${name} ${vmFlags}") + vbm("setextradata ${name} VBoxInternal/PDM/HaltOnReset 1") + vbm("storagectl ${name} ${controllerFlags}") + vbm("storageattach ${name} ${diskFlags}") + vbm("sharedfolder add ${name} ${sharedFlags}") + vbm("sharedfolder add ${name} ${nixstoreFlags}") cleanup_${name}() ${mkLog "$HOME/VirtualBox VMs/${name}/Logs/VBox.log" "HOST-${name}"} - # fmt: on def destroy_vm_${name}(): @@ -259,9 +257,7 @@ let def wait_for_ip_${name}(interface): property = f"/VirtualBox/GuestInfo/Net/{interface}/V4/IP" - # fmt: off getip = f"VBoxManage guestproperty get ${name} {property} | sed -n -e 's/^Value: //p'" - # fmt: on ip = machine.succeed( ru( @@ -394,9 +390,7 @@ let machine.wait_for_x() - # fmt: off ${mkLog "$HOME/.config/VirtualBox/VBoxSVC.log" "HOST-SVC"} - # fmt: on ${testScript} # (keep black happy) From bf8c4855e06d46ea54cc4f00f3ee5b01b82c80d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Apr 2021 02:44:04 +0000 Subject: [PATCH 167/213] libmaxminddb: 1.5.2 -> 1.6.0 --- pkgs/development/libraries/libmaxminddb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index 05ae1af2e25..1c15519aaff 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmaxminddb"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-UjcHbSUKX3wpfjMcNaQz7qrw3CBeBw5Ns1PJuhDzQKI="; + sha256 = "sha256-diCsGHxZHOIbzXvzUjdqPFapM+aEVYofa+9L1PP5gmc="; }; meta = with lib; { From 0e0a10ceb69bbfe17fcafb6d29cbad2e5f49485f Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sat, 8 May 2021 19:49:29 -0400 Subject: [PATCH 168/213] python3Packages.pylint-django: 2.4.2 -> 2.4.3 --- .../python-modules/pylint-django/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 54b2f65ad97..9d8b36c5ef8 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.4.2"; + version = "2.4.3"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "0535y4sdi521a9s7di8ld0i8aav0afbxmx0956v6sjpyqmqdm6hr"; + sha256 = "1mybq9jynypxbaxj921s3sx8dph8n3hmipmv4nla1g9h07g9g02z"; }; propagatedBuildInputs = [ @@ -42,9 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Pylint plugin to analyze Django applications"; homepage = "https://github.com/PyCQA/pylint-django"; - license = licenses.gpl2; - maintainers = with maintainers; [ - kamadorueda - ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ kamadorueda ]; }; } From 9a414c148874c67c087712d1ed6827d0ad210356 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Apr 2021 15:00:03 +0000 Subject: [PATCH 169/213] libjwt: 1.12.1 -> 1.13.1 --- pkgs/development/libraries/libjwt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjwt/default.nix b/pkgs/development/libraries/libjwt/default.nix index 9c7d624e7f6..a81b60c425e 100644 --- a/pkgs/development/libraries/libjwt/default.nix +++ b/pkgs/development/libraries/libjwt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libjwt"; - version = "1.12.1"; + version = "1.13.1"; src = fetchFromGitHub { owner = "benmcollins"; repo = "libjwt"; rev = "v${version}"; - sha256 = "1c69slf9k56gh0xcg6269v712ysm6wckracms4grdsc72xg6x7h2"; + sha256 = "sha256-hS10Ecq0VVuYLDrBu4x+Y2mz6eeJV1SvnqttgbiQbi0="; }; buildInputs = [ jansson openssl ]; From 74d8b78a24be1f896cec07bb2ba0e1dbc840c34a Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 9 May 2021 02:38:05 +0200 Subject: [PATCH 170/213] haskellPackages.tomland: Fix build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c06b8ad48f4..d8f5348f5ad 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1861,4 +1861,7 @@ self: super: { phonetic-languages-phonetics-basics = appendPatch super.phonetic-languages-phonetics-basics ./patches/phonetic-languages-phonetics-basics-haddock.patch; + # 2021-05-09: Restrictive bound on hspec-golden. Dep removed in newer versions. + tomland = assert super.tomland.version == "1.3.2.0"; doJailbreak super.tomland; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 518269b7cb80dab7a1f39fa8513978d186832236 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 16:50:03 +0000 Subject: [PATCH 171/213] hydroxide: 0.2.17 -> 0.2.18 --- pkgs/applications/networking/hydroxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index 52d4ae07ce5..d47560c4e87 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hydroxide"; - version = "0.2.17"; + version = "0.2.18"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gNMLVh5ntVCxiIKLshRvYXi5dYLZ8qiZFwZxbNPVFTk="; + sha256 = "sha256-s8EmoVZUUeaKTaINXvKO5tSdPUS3MlhEucwnmTTC3Wk="; }; - vendorSha256 = "sha256-f/1Vxuc87eQie/j1b14q/1lAAzRk+ZDkBaTmHtCy7go="; + vendorSha256 = "sha256-jkiTpDsJN628YKkFZcng9P05hmNUc3UeFsanLf+QtJY="; doCheck = false; From 54933eeef03eabff730507f6393335e196f7563f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 17:08:30 +0000 Subject: [PATCH 172/213] ibus-engines.m17n: 1.4.4 -> 1.4.5 --- pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 8fbd9254486..acb2d41e045 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-kPTysHTC+j8BMnzsddRa4Tg54idejApTqmLrP20pu5M="; + sha256 = "sha256-atsfaoA0V9PPwhPTpHI7b7A5JsDiYHfA+0NlNOKYIPg="; }; nativeBuildInputs = [ From 078e0b6f935de243dc6bf62be94355263d1a5550 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 10:37:26 +0000 Subject: [PATCH 173/213] fcitx-engines.anthy: 0.2.3 -> 0.2.4 --- pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix index 3fe5a59175f..74553dcebbb 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fcitx-anthy"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-anthy/${pname}-${version}.tar.xz"; - sha256 = "01jx7wwq0mifqrzkswfglqhwkszbfcl4jinxgdgqx9kc6mb4k6zd"; + sha256 = "sha256-Hxhs2RXuFf/bhczcQ3+Zj+gI3+Z4BEfIzMIfUOUNX7M="; }; nativeBuildInputs = [ cmake pkg-config ]; From b8cf4172f234746445f24240fbe04634eb867997 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 08:01:13 +0000 Subject: [PATCH 174/213] gallery-dl: 1.17.1 -> 1.17.3 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index ad0970e0fe2..8f6c97d196d 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.17.1"; + version = "1.17.3"; src = fetchPypi { inherit pname version; - sha256 = "1cfaa3a617d5d222d4b9b41634b1bdede2673a8620d6b0e62fb755ae224ca2ac"; + sha256 = "5da10d931c371841575d988b4e91e9d4ce55c8c3c99aa6d4efa5abca34c75ec8"; }; propagatedBuildInputs = [ requests ]; From 5d9dc70c2fc0e2bbf8375b1ef5c22df5606682ea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 03:39:06 +0000 Subject: [PATCH 175/213] pony-corral: 0.4.1 -> 0.5.0 --- pkgs/development/compilers/ponyc/pony-corral.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/pony-corral.nix b/pkgs/development/compilers/ponyc/pony-corral.nix index 8910d7f1e61..e9473b81f48 100644 --- a/pkgs/development/compilers/ponyc/pony-corral.nix +++ b/pkgs/development/compilers/ponyc/pony-corral.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation ( rec { pname = "corral"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "sha256-YJZ1jGMOeZKGZaTrWO2mtR94F0voC2DXaghi0LytF7I="; + sha256 = "sha256-mQ/SxnppChZ+6PKVo5VM+QiNn94F4qJT1kQSrwXTa7k="; }; buildInputs = [ ponyc ]; From b1d725d4d930f9e4f4f99fdd910682f2321d161c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 22:19:02 +0000 Subject: [PATCH 176/213] gcsfuse: 0.34.1 -> 0.35.0 --- pkgs/tools/filesystems/gcsfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index b145d1802a1..ee7f8676070 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "gcsfuse"; - version = "0.34.1"; + version = "0.35.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "16ns04g4cvp6lfhkifgib5rxpbcxy8ghhavi3mv1cvxawpmdrxnq"; + sha256 = "sha256-GJ21Cqd/W/PocmN1p4OeeUdswhH7fSmAMiNTs0X3564="; }; goPackagePath = "github.com/googlecloudplatform/gcsfuse"; From 796208b8fc7f97b36f3160c7ffed9b43f74cec55 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 06:45:06 +0000 Subject: [PATCH 177/213] debootstrap: 1.0.123 -> 1.0.124 --- pkgs/tools/misc/debootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index ea60887ebfa..b75f31c6172 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -15,13 +15,13 @@ let binPath = lib.makeBinPath [ ]; in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.123"; + version = "1.0.124"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.gz"; - sha256 = "0a53dhfwa74vdhqd6kbl7zlm7iic37c6wkdclppf0syxxi3q2njy"; + sha256 = "sha256-dwDphksp8WaybFQVPtjCdbRvS5pgRou2B+AZpkwWzY8="; }; nativeBuildInputs = [ makeWrapper ]; From 577c3a55780d98923b8f09f7f0d42791d0db01d4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 23:19:52 +0000 Subject: [PATCH 178/213] heimer: 2.4.0 -> 2.5.0 --- pkgs/applications/misc/heimer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 5d9fb0f30d7..3fd80d4eff3 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "sha256-5cepT9Tfr/3nYbxRAMqKSUDB+suEyojnexWxZ0i7GBw="; + sha256 = "sha256-CY7n9eq/FtQ6srZ9L31nJi0b9rOQq60kNOY3iTFws/E="; }; nativeBuildInputs = [ cmake ]; From b8016c6aa6b552b98b0bd9e37d73ccc4cd3dc53a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 23:52:40 +0000 Subject: [PATCH 179/213] istioctl: 1.9.3 -> 1.9.4 --- pkgs/applications/networking/cluster/istioctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index d0ffb22217f..85b6c623ae3 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-gCI4LRUjsE6V7fomWaQsseX1Xi2f+2ZgtvWBDarpXvw="; + sha256 = "sha256-QyiGDk9lA9Y49VpRNRGNbir/ql/Vzp6wsZ1LGodGTks="; }; - vendorSha256 = "sha256-yJHYyRPl1V1WNV0nJoR3bRTTGRTQaT/tG4TSQeL5U88="; + vendorSha256 = "sha256-N+7xajNkxuaC1yDTkPCg80bl2gRy2+Sa4Qq1A8zSGD8="; doCheck = false; From 6d7d4664231919a4058e5943416c2a30b792f338 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 16:54:17 +0000 Subject: [PATCH 180/213] cargo-fuzz: 0.10.0 -> 0.10.1 --- pkgs/development/tools/rust/cargo-fuzz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index ced5d7cd583..80ce649d6c1 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "rust-fuzz"; repo = "cargo-fuzz"; rev = version; - sha256 = "sha256-kBbwE4ToUud5BDDlGoey2qpp2imzO6t3FcIbV3NTFa8="; + sha256 = "sha256-txlHXboQi3Z8AMIJJBZsBrCA7xggF0zGDpKqcD8UxMo="; }; - cargoSha256 = "sha256-zqRlB2Kck4icMKzhaeeakEnn6O7zhoKPa5ZWbGooWIg="; + cargoSha256 = "sha256-eEfry6Q2YiIkNEHu6C8p17pUTF43eS1/iTP2oATZ/F8="; doCheck = false; From 5fbb4944bc5c8eb84c0fe62b908ad4d5fd749594 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 15:04:29 +0000 Subject: [PATCH 181/213] apt-cacher-ng: 3.6.1 -> 3.6.3 --- pkgs/servers/http/apt-cacher-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index c79a9fe3fd2..9e40bb648ea 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "apt-cacher-ng"; - version = "3.6.1"; + version = "3.6.3"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "sha256-avyjp4KH7l6OZxnMVDv1U/MIWcadqyPPtnLYzEYkqlA="; + sha256 = "sha256-P4ArWpxjOjBi9EiDp/ord17GfUOFwpiTKGvSEuZljGA="; }; nativeBuildInputs = [ cmake doxygen pkg-config ]; From c6dbb82d8c0cc39f40267974d81ae61de64d8ca0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 12:29:50 +0000 Subject: [PATCH 182/213] gmic: 2.9.6 -> 2.9.7 --- pkgs/tools/graphics/gmic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index b50716188e9..37b398ef1c6 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.9.6"; + version = "2.9.7"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "sha256-0i/oUVrxbc0FDQmgvHEn7Cn0eVznMqDGw+r4OTVrwRo="; + sha256 = "sha256-lCU3SH6nIhQSMFeds81DMTaEKcDjPLOP7hsXqulVfxY="; }; nativeBuildInputs = [ From 6f09f253f52f67cedb6eb0f7c1406c09d7a2b3f7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 15:24:41 +0000 Subject: [PATCH 183/213] birdfont: 2.29.1 -> 2.29.4 --- pkgs/tools/misc/birdfont/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index 609899bbe30..1b1fefc0a7c 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "birdfont"; - version = "2.29.1"; + version = "2.29.4"; src = fetchurl { url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0620bppcbm9pb8l0d4sc56gfwkr97gw4zjirjz5ikk5lj0m801yi"; + sha256 = "sha256-caNY6PrsqBrYwC61MxNsf8B9E8it1Ls1d+hdbf8u+o8="; }; nativeBuildInputs = [ python3 pkg-config vala_0_44 gobject-introspection wrapGAppsHook ]; From 68155982fad9a5b478a28eed6de4bf7bfef00e50 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 05:25:02 +0000 Subject: [PATCH 184/213] kustomize-sops: 2.5.2 -> 2.5.5 --- pkgs/development/tools/kustomize/kustomize-sops.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index e471489e709..7753556a4ea 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "2.5.2"; + version = "2.5.5"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c8v9O3ufTZ7/rWwLNoak0ITlEVlOg9MvheRjQIxPwKc="; + sha256 = "sha256-lNC8TwX462Lnt/uiKWt9hNa81g3tdenvvuNQJNkj7hM="; }; - vendorSha256 = "sha256-kJtJ2ut+yhgNoPIY5i3dKmQV0g+8RvcGnxCyay7wy2A="; + vendorSha256 = "sha256-uStmUhiZuUguxUx2L8ifSNnbMCs7Jk+6tq7qZdACjag="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ From 8c868f47a8934ccfa27d5ac3103297d344506b68 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 9 May 2021 02:48:59 +0200 Subject: [PATCH 185/213] Revert "nixos/tests/docker-tools*: remove useless formatter" Annoyed with the interference of the python formatting of generated code (see #72964), I took matters into my own hands as maintainer of dockerTools. Afterwards, I've created a PR, hoping to unstuck the discussion. @aszlig took notice and thanks to his python ecosystem knowledge, the testing efforts of @blaggacao and @Ma27, and a sense of shared suffering and comraderie we were able to change the situation for the better in #122201. Now, we have a proper linter that actually helps contributors, so it's time to turn it back on again. I'm glad we could make it happen this quickly! Thanks! This reverts commit 4035049af3e45554ffc4d8b4c30fd43ae9cd328a. --- nixos/tests/docker-tools-cross.nix | 3 --- nixos/tests/docker-tools-overlay.nix | 3 --- nixos/tests/docker-tools.nix | 3 --- 3 files changed, 9 deletions(-) diff --git a/nixos/tests/docker-tools-cross.nix b/nixos/tests/docker-tools-cross.nix index 91a6c954008..a7a6a31475d 100644 --- a/nixos/tests/docker-tools-cross.nix +++ b/nixos/tests/docker-tools-cross.nix @@ -73,7 +73,4 @@ in { "docker rmi ${hello2.imageName}", ) ''; - - # Remove when the formatter has been removed and a linter has been added - skipLint = true; }) diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix index b4504032019..6781388e639 100644 --- a/nixos/tests/docker-tools-overlay.nix +++ b/nixos/tests/docker-tools-overlay.nix @@ -30,7 +30,4 @@ import ./make-test-python.nix ({ pkgs, ... }: # drw------- 99 0 0 100 Apr 14 11:36 /nix/store docker.succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version") ''; - - # Remove when the formatter has been removed and a linter has been added - skipLint = true; }) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 650648fe724..39b97b4cb99 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -365,7 +365,4 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'" ) ''; - - # Remove when the formatter has been removed and a linter has been added - skipLint = true; }) From 69090bce703261ff57b694668aa6269b467da492 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 11 Apr 2021 15:46:27 +0000 Subject: [PATCH 186/213] sickgear: 0.23.15 -> 0.23.16 --- pkgs/servers/sickbeard/sickgear.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 85ed2808d78..f713ab39cb9 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.23.15"; + version = "0.23.16"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-xZ2SgYSEamh+Z64VKvIemqJLH/WjJHFji5qIameF5hM="; + sha256 = "sha256-Kx3vTbwYfILxn7n4upyVZo0V6S2lTStlezku9bfwGVw="; }; dontBuild = true; From a8926057f051da54f543751c577a3434298f658b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 16:04:11 +0000 Subject: [PATCH 187/213] bacula: 11.0.1 -> 11.0.2 --- pkgs/tools/backup/bacula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index c2ed7882331..cb4f5874bac 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bacula"; - version = "11.0.1"; + version = "11.0.2"; src = fetchurl { url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz"; - sha256 = "sha256-Lr2c24hZU8A/Cd8xGA7rfqga67ghz0XJ/cs/z/hSlPU="; + sha256 = "sha256-ooaKsNhUIxubAlGt6fUAkbD+PDMfkq+6lnK4G9lp4C8="; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] From 36c5cea0f6af3c86af3933da4c74e038a7b63569 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 03:46:07 +0000 Subject: [PATCH 188/213] bzrtp: 4.5.1 -> 4.5.10 --- pkgs/development/libraries/bzrtp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index b698cf7b404..5236c92527e 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "4.5.1"; + version = "4.5.10"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1a500ncgznwha0j3c27ak3p4jh5jm6fnnb531k7c0a4i91745agj"; + sha256 = "sha256-8qlCTkiRKMDODKMsa52pskBJ7pjqCDYkUJDb/5gFoKg="; }; buildInputs = [ bctoolbox sqlite ]; From 75c4fc1c8bf1c4c453c2b7279d70dc058d0b60ba Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 8 May 2021 17:25:34 +0200 Subject: [PATCH 189/213] nixos/testing-python.nix: Move makeWrapper to nativeBuildInputs --- nixos/lib/testing-python.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 679c31f3e35..7e87313e963 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -158,7 +158,7 @@ rec { in lib.warnIf skipLint "Linting is disabled" (runCommand testDriverName { - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; testScript = testScript'; preferLocalBuild = true; testName = name; From dfa9e91b11b0e4a1e12fe7c3fcffbdd945f365aa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 May 2021 02:56:20 +0200 Subject: [PATCH 190/213] python3Packages.pulsectl: 21.3.4 -> 21.5.0 --- pkgs/development/python-modules/pulsectl/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 6b05f383ec6..378e37ec69d 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "21.3.4"; + version = "21.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+qi5M2I3VlmQKY8ghw4T3RZ4pFhoR8paf/Kr8QdS81Y="; + sha256 = "11dw8hij1vzqawlv5l1ax6i2zw6p4ccn4ww3v6q1kdmrwk46vi7r"; }; patches = [ @@ -17,7 +17,12 @@ buildPythonPackage rec { }) ]; + pythonImportsCheck = [ + "pulsectl" + ]; + checkInputs = [ pulseaudio ]; + checkPhase = '' ${python.interpreter} -m unittest pulsectl.tests.all ''; From 3360314646ce5c354057e848cb35f67bf6e3a586 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sat, 8 May 2021 20:05:53 +0800 Subject: [PATCH 191/213] rtl8812au: 5.6.4.2 -> 5.9.3.2 --- pkgs/os-specific/linux/rtl8812au/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 68a88fb6778..e34712f2460 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: stdenv.mkDerivation rec { - name = "rtl8812au-${kernel.version}-${version}"; - version = "5.6.4.2_35491.20200702"; + pname = "rtl8812au"; + version = "${kernel.version}-5.9.3.2.20210427"; src = fetchFromGitHub { owner = "gordboy"; - repo = "rtl8812au-5.6.4.2"; - rev = "3110ad65d0f03532bd97b1017cae67ca86dd34f6"; - sha256 = "0p0cv67dfr41npxn0c1frr0k9wiv0pdbvlzlmclgixn39xc6n5qz"; + repo = "rtl8812au-5.9.3.2"; + rev = "6ef5d8fcdb0b94b7490a9a38353877708fca2cd4"; + sha256 = "sha256-czExf4z0nf7XEJ1YnRSB3CrGV6NTmUKDiZjLmrh6Hwo="; }; nativeBuildInputs = [ bc nukeReferences ]; @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod"; - homepage = "https://github.com/gordboy/rtl8812au-5.6.4.2"; - license = licenses.gpl2; + homepage = "https://github.com/gordboy/rtl8812au-5.9.3.2"; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ danielfullmer ]; }; From 918cf983fb2022d260058991d28af0a8a8509c97 Mon Sep 17 00:00:00 2001 From: fortune Date: Sun, 9 May 2021 08:38:11 +0800 Subject: [PATCH 192/213] rtl8812au: remove unsupported kernels Co-authored-by: Jonathan Ringer --- pkgs/os-specific/linux/rtl8812au/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index e34712f2460..0ed6b443e04 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ danielfullmer ]; + broken = kernel.kernelOlder "4.10" || kernel.isHardened; }; } From 77ff20bdbaba71224cff0fb6c11c20ef48839605 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 May 2021 02:59:09 +0200 Subject: [PATCH 193/213] python3Packages.csvw: 1.10.2 -> 1.11.0 --- pkgs/development/python-modules/csvw/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix index cf388409c57..3df013e7599 100644 --- a/pkgs/development/python-modules/csvw/default.nix +++ b/pkgs/development/python-modules/csvw/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 +, pythonOlder , attrs , isodate , dateutil @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "csvw"; - version = "1.10.2"; - disabled = isPy27; + version = "1.11.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "cldf"; repo = "csvw"; rev = "v${version}"; - sha256 = "0z0qxlsfxwz1qapxb4d0mz3wkj99d7zi9yrg1cbd2xp7giagb6d4"; + sha256 = "1393xwqawaxsflbq62vks92vv4zch8p6dd1mdvdi7j4vvf0zljkg"; }; patchPhase = '' From 2c143443f7c5c17e57a0723a2bf0e84a74f8778a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 29 Apr 2021 16:11:55 +0000 Subject: [PATCH 194/213] libpoly: 0.1.8 -> 0.1.9 --- pkgs/applications/science/logic/poly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix index 15e89138c6b..d0344a3737d 100644 --- a/pkgs/applications/science/logic/poly/default.nix +++ b/pkgs/applications/science/logic/poly/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "libpoly"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "libpoly"; # they've pushed to the release branch, use explicit tag rev = "refs/tags/v${version}"; - sha256 = "1n3gijksnl2ybznq4lkwm2428f82423sxq18gnb2g1kiwqlzdaa3"; + sha256 = "sha256-E2lHo8Bt4ujoGQ623fjkQbqRnDYJYilXdRt4lnF4wJk="; }; nativeBuildInputs = [ cmake ]; From ac3277d04c3c51431b046a2690db626c50335cfd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Apr 2021 13:22:43 +0000 Subject: [PATCH 195/213] libdigidocpp: 3.14.5 -> 3.14.6 --- pkgs/development/libraries/libdigidocpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 5b2914c141f..c7a7673dc1b 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.5"; + version = "3.14.6"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - sha256 = "sha256-PSrYoz5ID88pYs/4rP2kz0NpI0pK6wcnx62HokE0g20="; + sha256 = "sha256-zDMxJyL/T3cXrqgMT15yZlCozgyOt5nNreottuuiGHk="; }; nativeBuildInputs = [ cmake pkg-config xxd ]; From ba80e48da5d545f6a0d607f3dc829fd01faf2d03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Apr 2021 09:52:06 +0000 Subject: [PATCH 196/213] gerbera: 1.7.0 -> 1.8.0 --- pkgs/servers/gerbera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index c7e560f9e61..bc0bfa23d7b 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -20,13 +20,13 @@ let optionOnOff = option: if option then "on" else "off"; in stdenv.mkDerivation rec { pname = "gerbera"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { repo = "gerbera"; owner = "gerbera"; rev = "v${version}"; - sha256 = "sha256-unBToiLSpTtnung77z65iuUqiQHwfMVgmFZMUtKU7fQ="; + sha256 = "sha256-i33pAgSOjVOoj0qGBnb8hpRMqgTCBTQmKTuZ9AkvoPg="; }; cmakeFlags = [ From 769c34306ffb6b1c3f3cac6e08b5f4728b268bb2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Apr 2021 12:36:57 +0000 Subject: [PATCH 197/213] jftui: 0.4.0 -> 0.5.0 --- pkgs/applications/video/jftui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix index b050e2636cc..3411b2d5c33 100644 --- a/pkgs/applications/video/jftui/default.nix +++ b/pkgs/applications/video/jftui/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "jftui"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Aanok"; repo = pname; rev = "v${version}"; - sha256 = "0riwqfh5lyjg7as75kyx7jw6zq4gikbglhv8s05y7pzgsc9xy75j"; + sha256 = "sha256-KyiLZuzQ0kCReUEPBf0YbmdXhw9nBfghBBsXiy9+N0E="; }; nativeBuildInputs = [ From 2d41db9d71902b098351ecc38715303f16414374 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Apr 2021 11:50:16 +0000 Subject: [PATCH 198/213] helmsman: 3.6.6 -> 3.6.7 --- pkgs/applications/networking/cluster/helmsman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index ed828feefda..dc777ad0298 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.6.6"; + version = "3.6.7"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-SGVch7mMtHi5GYFOrSss4dk29aRTQmBzkPYOetPdF88="; + sha256 = "sha256-6w2CV6Uj1b8b3vwB933eNHPe1rK+TRyUL++Vy38cKqo="; }; - vendorSha256 = "sha256-mktq5Dnk1mBO2yy5SeMDxa/akXdO5i2WafMTGtH53H8="; + vendorSha256 = "sha256-icX8mOc8g+DhfAjD1pzneLWTXY17lXyAjdPOWAxkHwI="; doCheck = false; From cbd1cc10cd4872d9ecd3a8a064edc8ffe0cd2acd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Apr 2021 13:06:43 +0000 Subject: [PATCH 199/213] kubernetes: 1.20.5 -> 1.21.0 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 12127e223a3..52bd01ae17b 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.20.5"; + version = "1.21.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-RDaD7tlTtAucW8ido9FumKb5E9n6F9H8HwxQ9TPyOLk="; + sha256 = "sha256-5IUcKVbHxL5qb7M087sZSsd50t5zSaeWATnyLHkVsRU="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; From 548bd84185d2e1c62448edb76565f8467642b955 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Apr 2021 09:36:00 +0000 Subject: [PATCH 200/213] fstrm: 0.6.0 -> 0.6.1 --- pkgs/development/libraries/fstrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix index 46a7118cefe..15daa7e5a95 100644 --- a/pkgs/development/libraries/fstrm/default.nix +++ b/pkgs/development/libraries/fstrm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fstrm"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "farsightsec"; repo = "fstrm"; rev = "v${version}"; - sha256 = "0b6x9wgyn92vykkmd3ynhnpbdl77zb4wf4rm7p0h8p9pwq953hdm"; + sha256 = "sha256-/WFP2g3Vuf/qaY8pprY8XFAlpEE+0SJUlFNWfa+7ZlE="; }; outputs = [ "bin" "out" "dev" ]; From e11130d6fcf980785a6f2c78932743c6c71b2aef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Apr 2021 08:34:37 +0000 Subject: [PATCH 201/213] ergo: 4.0.8 -> 4.0.9 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 597db2ae8ff..d4210c83bb2 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.8"; + version = "4.0.9"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-swU4CnX2BxL3ILH/sXux8ZHMo5nAPLQOIiWmr4C8BOQ="; + sha256 = "sha256-FstAKUZVKW9U6QTqqCEDybvbBl+0H9qVHqFMPubdDpk="; }; nativeBuildInputs = [ makeWrapper ]; From 99e8492074e21c27a7c522c57bf4c684d4a280df Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 16:14:31 +0000 Subject: [PATCH 202/213] belle-sip: 4.5.1 -> 4.5.3 --- pkgs/development/libraries/belle-sip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 0f8a61bed24..76a3b96533c 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "4.5.1"; + version = "4.5.3"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "0d1wf0jv9lb0s6r49i9gz5nrx8jzpkx558hywll7idma9d0mr61p"; + sha256 = "sha256-N5hcQUuqtngo5R6iUvq8X6KebfkvxUSy0WDRtCVwPDQ="; }; nativeBuildInputs = [ antlr3_4 cmake ]; From cbaa4db0ad3a355687611939425a6faf5dd94278 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 9 May 2021 09:41:04 +0800 Subject: [PATCH 203/213] chroma: update sha256 --- pkgs/tools/text/chroma/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/tools/text/chroma/default.nix index 388d9b92273..6511d2dcdbb 100644 --- a/pkgs/tools/text/chroma/default.nix +++ b/pkgs/tools/text/chroma/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "alecthomas"; repo = pname; rev = "v${version}"; - sha256 = "0zzk4wcjgxa9lsx8kwpmxvcw67f2fr7ai37jxmdahnws0ai2c2f7"; + sha256 = "sha256-+4UaQrJh3PBf68rlW1lOEyEVw3vWxfc+Casa5+H8F9A="; leaveDotGit = true; }; From d8458c456413e7df48ce5b1033d3f81288e75169 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 9 May 2021 09:12:25 +0800 Subject: [PATCH 204/213] flavours: add missing libiconv dependency on darwin --- pkgs/applications/misc/flavours/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/applications/misc/flavours/default.nix index b116fbbbd7c..5274e606dda 100644 --- a/pkgs/applications/misc/flavours/default.nix +++ b/pkgs/applications/misc/flavours/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }: rustPlatform.buildRustPackage rec { pname = "flavours"; @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-rDy859jg+F8XC4sJogIgdn1FoT8cf7S+KORt+7kboAc="; }; + buildInputs = [ ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; + cargoSha256 = "sha256-cAXiAPhHdxdd8pFQ0Gq7eHO2p/Dam53gDbE583UYY/k="; meta = with lib; { From 8647f1570fdaa6081db373fb73511643254b8d91 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 2 May 2021 11:11:39 +0200 Subject: [PATCH 205/213] pqiv: use ffmpeg4 See migrate away from ffmpeg_3 #120705. --- pkgs/applications/graphics/pqiv/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 7948ef0f08c..f678af70611 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config -, ffmpeg_3, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler +, ffmpeg, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler }: stdenv.mkDerivation (rec { @@ -14,14 +14,14 @@ stdenv.mkDerivation (rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg_3 gtk3 imagemagick libarchive libspectre libwebp poppler ]; + buildInputs = [ ffmpeg gtk3 imagemagick libarchive libspectre libwebp poppler ]; prePatch = "patchShebangs ."; meta = with lib; { description = "Powerful image viewer with minimal UI"; - homepage = "http://www.pberndt.com/Programme/Linux/pqiv"; - license = licenses.gpl3; + homepage = "https://www.pberndt.com/Programme/Linux/pqiv"; + license = licenses.gpl3Plus; maintainers = []; platforms = platforms.linux; }; From 174735e1399d03631bf641dbbd694995cb776264 Mon Sep 17 00:00:00 2001 From: Bernard Fortz Date: Fri, 30 Apr 2021 16:02:05 +0200 Subject: [PATCH 206/213] bitwig-studio: Move away from from ffmpeg_3 --- pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix | 4 ++-- pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index fca3eaf223e..b1625868933 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk-pixbuf , wrapGAppsHook, gtk2, gtk3, harfbuzz, jdk, lib, xorg -, libbsd, libjack2, libpng, ffmpeg_3 +, libbsd, libjack2, libpng, ffmpeg , libxkbcommon , makeWrapper, pixman, autoPatchelfHook , xdg-utils, zenity, zlib }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; binPath = lib.makeBinPath [ - xdg-utils zenity ffmpeg_3 + xdg-utils zenity ffmpeg ]; installPhase = '' diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 28b5ef438e2..93fa00b827b 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, cairo, dpkg, freetype , gdk-pixbuf, glib, gtk3, lib, xorg -, libglvnd, libjack2, ffmpeg_3 +, libglvnd, libjack2, ffmpeg , libxkbcommon, xdg-utils, zlib, pulseaudio , wrapGAppsHook, makeWrapper }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; binPath = lib.makeBinPath [ - xdg-utils ffmpeg_3 + xdg-utils ffmpeg ]; ldLibraryPath = lib.strings.makeLibraryPath buildInputs; From 7c58a1e244ef39f96aa6906594d35c8079a99bc5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 May 2021 22:28:19 +0200 Subject: [PATCH 207/213] python3Packages.mcstatus: 5.1.4 -> 5.2.0 --- pkgs/development/python-modules/mcstatus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 1ea14c35510..cf61eb2fa38 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "5.1.4"; + version = "5.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Dinnerbone"; repo = pname; rev = "v${version}"; - sha256 = "1k8hjv965svbm95m7jaawlhdbxqpkjchlwvjwn1n7z90dfgn5kih"; + sha256 = "sha256-RlqzeixaHgyIl/7mMRkZAEsqJEP79Bz1bDGAU8PIetU="; }; propagatedBuildInputs = [ From 9b80b8324c837feef5a88930a8b734d30c1f9a95 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Sat, 8 May 2021 19:04:12 -0400 Subject: [PATCH 208/213] python3Packages.pytest-ordering: mark as broken --- pkgs/development/python-modules/pytest-ordering/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pytest-ordering/default.nix b/pkgs/development/python-modules/pytest-ordering/default.nix index 6cd1ed22797..c5e8a786b5e 100644 --- a/pkgs/development/python-modules/pytest-ordering/default.nix +++ b/pkgs/development/python-modules/pytest-ordering/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { homepage = "https://github.com/ftobia/pytest-ordering"; description = "Pytest plugin to run your tests in a specific order"; license = licenses.mit; + broken = true; # See https://github.com/NixOS/nixpkgs/pull/122264 maintainers = with maintainers; [ eadwu ]; }; } From b1f796eabe317d441626e616ed96d23eed1432af Mon Sep 17 00:00:00 2001 From: David Date: Sat, 8 May 2021 17:30:22 +0200 Subject: [PATCH 209/213] rebar3: 3.14.4 -> 3.15.1 --- .../tools/build-managers/rebar3/default.nix | 78 ++----------------- .../build-managers/rebar3/rebar-deps.nix | 58 ++++++++++++++ 2 files changed, 64 insertions(+), 72 deletions(-) create mode 100644 pkgs/development/tools/build-managers/rebar3/rebar-deps.nix diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index c2b10d823a3..b9070a42764 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -3,70 +3,12 @@ tree }: let - version = "3.14.4"; + version = "3.15.1"; # Dependencies should match the ones in: # https://github.com/erlang/rebar3/blob/${version}/rebar.lock # `sha256` could also be taken from https://hex.pm - Checksum - - bbmustache = fetchHex { - pkg = "bbmustache"; - version = "1.10.0"; - sha256 = "1vp27jqnq65a8iqp7j4z8nw9ad29dhky5agmg8aj75dvshzzmvs3"; - }; - certifi = fetchHex { - pkg = "certifi"; - version = "2.5.3"; - sha256 = "040w1scglvqhcvc1ifdnlcyrbwr0smi00w4xi8h03c99775nllgd"; - }; - cf = fetchHex { - pkg = "cf"; - version = "0.3.1"; - sha256 = "0wknz4xkqkhgvlx4vx5619p8m65v7g87lfgsvfy04jrsgm28spii"; - }; - cth_readable = fetchHex { - pkg = "cth_readable"; - version = "1.5.0"; - sha256 = "0z58b6frqdnhyzrmbdf6x78l3izbbh5z5i3am8hqc253r7xwv0dx"; - }; - erlware_commons = fetchHex { - pkg = "erlware_commons"; - version = "1.4.0"; - sha256 = "1rp2vkgzqm6sax7fc13rh9x6qzxsgg718dnv7l0kmarvyifcyphq"; - }; - eunit_formatters = fetchHex { - pkg = "eunit_formatters"; - version = "0.5.0"; - sha256 = "1jb3hzb216r29x2h4pcjwfmx1k81431rgh5v0mp4x5146hhvmj6n"; - }; - getopt = fetchHex { - pkg = "getopt"; - version = "1.0.1"; - sha256 = "53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c"; - }; - parse_trans = fetchHex { - pkg = "parse_trans"; - version = "3.3.1"; - sha256 = "12w8ai6b5s6b4hnvkav7hwxd846zdd74r32f84nkcmjzi1vrbk87"; - }; - - providers = fetchHex { - pkg = "providers"; - version = "1.8.1"; - sha256 = "183b9128l4af60rs40agqh6kc6db33j4027ad6jajxn4x6nlamz4"; - }; - - relx = fetchHex { - pkg = "relx"; - version = "4.3.0"; - sha256 = "0h044arh41sr92r1nlg176shavlv7pvw17alwklhszgwlr4hk3kk"; - }; - - ssl_verify_fun = fetchHex { - pkg = "ssl_verify_fun"; - version = "1.1.6"; - sha256 = "1026l1z1jh25z8bfrhaw0ryk5gprhrpnirq877zqhg253x3x5c5x"; - }; + deps = import ./rebar-deps.nix { inherit fetchHex; }; in stdenv.mkDerivation rec { pname = "rebar3"; @@ -78,7 +20,7 @@ stdenv.mkDerivation rec { owner = "erlang"; repo = pname; rev = version; - sha256 = "09bnqwli93sq1pcz4h88ks7qg7k8yrjy9fd46yyp8xdl7i4irwy2"; + sha256 = "1pcy5m79g0l9l3d8lkbx6cq1w87z1g3sa6wwvgbgraj2v3wkyy5g"; }; bootstrapper = ./rebar3-nix-bootstrap; @@ -89,17 +31,9 @@ stdenv.mkDerivation rec { mkdir -p _checkouts mkdir -p _build/default/lib/ - cp --no-preserve=mode -R ${bbmustache} _checkouts/bbmustache - cp --no-preserve=mode -R ${certifi} _checkouts/certifi - cp --no-preserve=mode -R ${cf} _checkouts/cf - cp --no-preserve=mode -R ${cth_readable} _checkouts/cth_readable - cp --no-preserve=mode -R ${erlware_commons} _checkouts/erlware_commons - cp --no-preserve=mode -R ${eunit_formatters} _checkouts/eunit_formatters - cp --no-preserve=mode -R ${getopt} _checkouts/getopt - cp --no-preserve=mode -R ${parse_trans} _checkouts/parse_trans - cp --no-preserve=mode -R ${providers} _checkouts/providers - cp --no-preserve=mode -R ${relx} _checkouts/relx - cp --no-preserve=mode -R ${ssl_verify_fun} _checkouts/ssl_verify_fun + ${toString (lib.mapAttrsToList (k: v: '' + cp -R --no-preserve=mode ${v} _checkouts/${k} + '') deps)} # Bootstrap script expects the dependencies in _build/default/lib # TODO: Make it accept checkouts? diff --git a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix new file mode 100644 index 00000000000..60dfc0b5b83 --- /dev/null +++ b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix @@ -0,0 +1,58 @@ +{ fetchHex }: +{ + ssl_verify_fun = fetchHex { + pkg = "ssl_verify_fun"; + version = "1.1.6"; + sha256 = "sha256-vbDSRx9FPIj/OQjnaG+G+b4yfQZcwewW+kVAGX6gRoA="; + }; + relx = fetchHex { + pkg = "relx"; + version = "4.4.0"; + sha256 = "sha256-VcDtY7tdVeuYOhnrlNfzB1320Sbb3/QxAqZmCpH86SU="; + }; + providers = fetchHex { + pkg = "providers"; + version = "1.8.1"; + sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; + }; + parse_trans = fetchHex { + pkg = "parse_trans"; + version = "3.3.1"; + sha256 = "sha256-B82Vd4hfVjYtQU6MTE5r3xDUOodnq7ktJMvoskxUiIs="; + }; + getopt = fetchHex { + pkg = "getopt"; + version = "1.0.1"; + sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; + }; + eunit_formatters = fetchHex { + pkg = "eunit_formatters"; + version = "0.5.0"; + sha256 = "sha256-1si6ITQklE5uBbvAl8MgAc3Qq+OSXQJFTyKbINaHY8k="; + }; + erlware_commons = fetchHex { + pkg = "erlware_commons"; + version = "1.4.0"; + sha256 = "sha256-GF7PXPQ7qzoBPds2FM57un9seoJ5BOZOV9pU/N/c4uY="; + }; + cth_readable = fetchHex { + pkg = "cth_readable"; + version = "1.5.1"; + sha256 = "sha256-aGVBoi7+bKWkGgR7OVFsLdKPs8reXySi8ZFFs5Z/nYA="; + }; + cf = fetchHex { + pkg = "cf"; + version = "0.3.1"; + sha256 = "sha256-MV6NRH06SwK82/o5etA7u5iKbgqm9E063Q9OPDv5dnI="; + }; + certifi = fetchHex { + pkg = "certifi"; + version = "2.5.3"; + sha256 = "sha256-7VFqyzkpsQEgip1wAGLVIPOVPaO2uRjYZhBv+pgOHBA="; + }; + bbmustache = fetchHex { + pkg = "bbmustache"; + version = "1.10.0"; + sha256 = "sha256-Q+/6P9S7lSMVevWp4idsSTSVuEWfyHNxRKoYbLE84u4="; + }; +} From c8cc491b7ec29d83a2f8d07dbffcbef604a13e81 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 9 May 2021 06:33:14 +0200 Subject: [PATCH 210/213] dragonfly-reverb: 3.2.1 -> 3.2.5 (#118939) --- pkgs/applications/audio/dragonfly-reverb/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index 4f3d2a6a4dc..a07dca699d7 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "dragonfly-reverb"; - version = "3.2.1"; + version = "3.2.5"; src = fetchFromGitHub { owner = "michaelwillis"; repo = "dragonfly-reverb"; rev = version; - sha256 = "0vfm2510shah67k87mdyar4wr4vqwii59y9lqfhwm6blxparkrqa"; + sha256 = "14kia9wjs0nqfx4psnr3vf4x6hihkf80gb0mjzmdnnnk4cnrdydm"; fetchSubmodules = true; }; - patchPhase = '' + postPatch = '' patchShebangs dpf/utils/generate-ttl.sh ''; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall mkdir -p $out/bin mkdir -p $out/lib/lv2/ mkdir -p $out/lib/vst/ @@ -31,13 +32,14 @@ stdenv.mkDerivation rec { cp -a $bin-vst.so $out/lib/vst/ cp -a $bin.lv2/ $out/lib/lv2/ ; done + runHook postInstall ''; meta = with lib; { homepage = "https://github.com/michaelwillis/dragonfly-reverb"; description = "A hall-style reverb based on freeverb3 algorithms"; maintainers = [ maintainers.magnetophon ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = ["x86_64-linux"]; }; } From 7c46cfbc026db51374b9f02a6b9dcc342fc60a2c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 9 May 2021 04:55:05 +0000 Subject: [PATCH 211/213] qtwebkit: fix linux build with glib 2.68 (#122259) --- pkgs/development/libraries/qt-5/5.12/default.nix | 5 +++++ pkgs/development/libraries/qt-5/5.14/default.nix | 5 +++++ pkgs/development/libraries/qt-5/5.15/default.nix | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 63e893ea69f..fcb6297f519 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -98,6 +98,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) + (fetchpatch { + name = "qtwebkit-glib-2.68.patch"; + url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; + sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 3e3790ed1a4..02b170e0eb1 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -111,6 +111,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) + (fetchpatch { + name = "qtwebkit-glib-2.68.patch"; + url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; + sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch ] ++ optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index f969254b595..9712914c9ec 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -135,6 +135,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) + (fetchpatch { + name = "qtwebkit-glib-2.68.patch"; + url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; + sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch ] ++ optionals stdenv.isDarwin [ From b26b54f056330010b23e0df2057ec5c1ee6e13fb Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 9 May 2021 04:55:26 +0000 Subject: [PATCH 212/213] mamba: 1.8 -> 2.2 (#122193) --- pkgs/applications/audio/mamba/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix index 022b41007c1..04d5bb0a6dd 100644 --- a/pkgs/applications/audio/mamba/default.nix +++ b/pkgs/applications/audio/mamba/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchFromGitHub , pkg-config +, xxd , cairo , fluidsynth , libX11 @@ -13,17 +14,17 @@ stdenv.mkDerivation rec { pname = "mamba"; - version = "1.8"; + version = "2.2"; src = fetchFromGitHub { owner = "brummer10"; repo = "Mamba"; rev = "v${version}"; - sha256 = "049gvdvvv3hkh1b47h0bia02g1p71agwh6g7q0n4yxz4d81b8kha"; + sha256 = "1885qxyfkpslzk0aaaaws0x73b10h9nbr04jkk7xhkya25gf280m"; fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config xxd ]; buildInputs = [ cairo fluidsynth libX11 libjack2 alsaLib liblo libsigcxx libsmf ]; makeFlags = [ "PREFIX=$(out)" ]; From b4833b346c78b4308e574b6134aa03b21dda268f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 9 May 2021 05:11:03 +0000 Subject: [PATCH 213/213] gleam: 0.15.0 -> 0.15.1 --- pkgs/development/compilers/gleam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 8ceac64a622..7bce45c455f 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sB+QTokH/ngcED40+vw+okFLFt+JSJQ/CbOgzlt/YmE="; + sha256 = "sha256-vBxVGIgg2BpVvEYjmX99YSf1zy9aWOHr6ftaYxJWkzY="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-C/OAzg24kulIvIZwV9L5hwvf/BkF05spJPskr2maqrM="; + cargoSha256 = "sha256-2zHc7xk5MuEUO9YGifSWbgRTi51ZUk84QLro94LsBtQ="; meta = with lib; { description = "A statically typed language for the Erlang VM";