From 2303dc0128e759948bc9255584634a37560d0c0f Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Wed, 30 Mar 2022 21:08:19 -0600 Subject: [PATCH 01/24] signal-desktop: 5.36.0 -> 5.37.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index e3fa08e3df3a..72bd18163e68 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.36.0"; # Please backport all updates to the stable channel. + version = "5.37.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-x1PUEDq/0B1T14mBs2FuKtcGpJHWOIvHAs8hptpzhZk="; + sha256 = "sha256-hnRS/7CZPk1bbBjpHLAywKVu2u7jgg3p5/pxEdkzMJ8="; }; nativeBuildInputs = [ From 3a069d73e91c6ac307108736c21f0f14b94ac4f6 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 2 Apr 2022 21:05:19 +0800 Subject: [PATCH 02/24] fprintd: 1.94.1 -> 1.94.2 --- pkgs/tools/security/fprintd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index b0339846a67d..d9c17f935eda 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { pname = "fprintd"; - version = "1.94.1"; + version = "1.94.2"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XHfHPffVp0jV3Md9Gui9v/nyOJ/bTWM3+hiR7WdEsgQ="; + sha256 = "sha256-ePhcIZyXoGr8XlBuzKjpibU9D/44iCXYBlpVR9gcswQ="; }; nativeBuildInputs = [ From 106ac75a9c62e248b3e378baadd9fc581f016c85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Apr 2022 15:17:51 +0000 Subject: [PATCH 03/24] qbs: 1.21.0 -> 1.22.0 --- pkgs/development/tools/build-managers/qbs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index e09aeea75a32..14d9f146651a 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "qbs"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "sha256-jlJ7bk+lKBUs+jB6MTMe2Qxhf7BA7s5M9Xa2Dnx2UJs="; + sha256 = "sha256-gFPcT/TNsKEUNzkJVaXHCGNmhQ0dV1/NYgQQInYrcNI="; }; nativeBuildInputs = [ qmake ]; From 72d643fb836bd2127485a21eef53336484eb6554 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Apr 2022 03:45:39 +0000 Subject: [PATCH 04/24] python310Packages.anyconfig: 0.12.0 -> 0.13.0 --- pkgs/development/python-modules/anyconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anyconfig/default.nix b/pkgs/development/python-modules/anyconfig/default.nix index 3e0e347bbfa3..17794d5c8c46 100644 --- a/pkgs/development/python-modules/anyconfig/default.nix +++ b/pkgs/development/python-modules/anyconfig/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "anyconfig"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MJHXZ1dAaG+t6FdVU38qfGzO+oZZxbtWF04C3tdLltU="; + sha256 = "sha256-A/8uF2KvOI+7vtHBq3+fHsAGqR2n2zpouWPabneV0qw="; }; postPatch = '' From 859b7c7d01350b37884c3c4dfe8cfaf48aa05aed Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 5 Apr 2022 12:37:21 +0800 Subject: [PATCH 05/24] marker: fix build with meson 0.61 --- pkgs/applications/editors/marker/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/marker/default.nix b/pkgs/applications/editors/marker/default.nix index c6779b8fba87..93b8dabb6814 100644 --- a/pkgs/applications/editors/marker/default.nix +++ b/pkgs/applications/editors/marker/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub +, itstool , meson , ninja , pkg-config @@ -24,6 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + itstool meson ninja pkg-config From 7f00e7a8f1fbd5e269f46ccae8b095647d7398d0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 5 Apr 2022 12:51:04 +0800 Subject: [PATCH 06/24] pitivi: fix build with meson 0.61 --- pkgs/applications/video/pitivi/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 7ae463b98730..1b97fa9b7c66 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,5 +1,6 @@ { lib , fetchurl +, fetchpatch , pkg-config , gettext , itstool @@ -36,6 +37,13 @@ python3Packages.buildPythonApplication rec { # and saves them to the generated binary. This would make the build-time # dependencies part of the closure so we remove it. ./prevent-closure-contamination.patch + + # Fix build with meson 0.61 + # https://gitlab.gnome.org/GNOME/pitivi/-/merge_requests/414 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/pitivi/-/commit/ddf2369d1fc6fddd63f676cc905a8b8e96291a4c.patch"; + sha256 = "MC4naGnqhrYlFBFHZaSzbOzrqaNK5/Xv5jBmCu0fLQE="; + }) ]; nativeBuildInputs = [ From 29c80c305815a30c504c773cb674f8dcb4f285ea Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 5 Apr 2022 22:54:41 +0800 Subject: [PATCH 07/24] berry: 0.1.10 -> 0.1.11 --- pkgs/applications/window-managers/berry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix index f6ba52013f6f..5c2c7dcb5ce4 100644 --- a/pkgs/applications/window-managers/berry/default.nix +++ b/pkgs/applications/window-managers/berry/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "berry"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "JLErvin"; repo = pname; rev = version; - hash = "sha256-6asph0QXzhmHuYcfrLcQ8RTP4QzX8m6AcCp5ImA++9M="; + hash = "sha256-cs1NVwaANMIteCQuGqPcEWuUbfJulhjmfWnlU8Eb2OM="; }; nativeBuildInputs = [ From 6532f90a8f873228a05b1a93ed67383d24c09855 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 5 Apr 2022 15:15:48 -0300 Subject: [PATCH 08/24] imgproxy: enable tests --- pkgs/servers/imgproxy/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index d35c53de9afe..a46efc07fa83 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -14,8 +14,6 @@ buildGoModule rec { vendorSha256 = "sha256-Rp0vTtpdKpYg/7UjX73Qwxu6dOqDr24nqp41fKN1IYw="; - doCheck = false; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ gobject-introspection vips ] From d60926bff10a77b13105017bd4c316b174901e16 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 5 Apr 2022 16:00:05 -0300 Subject: [PATCH 09/24] echoip: enable tests --- pkgs/servers/echoip/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix index 745cf96df46a..840d7a2d4e6a 100644 --- a/pkgs/servers/echoip/default.nix +++ b/pkgs/servers/echoip/default.nix @@ -13,8 +13,6 @@ buildGoModule { vendorSha256 = "0vvs717pl5gzggxpbn2vkyxmpiw5zjdfnpbh8i81xidbqvlnm22h"; - doCheck = false; - outputs = [ "out" "index" ]; postInstall = '' From 84032b1febdf0131ba2ebb3f473ca497103f01d3 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 5 Apr 2022 16:02:20 -0300 Subject: [PATCH 10/24] traefik: enable tests --- pkgs/servers/traefik/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 2dbed400650a..edf8fb33a093 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -12,8 +12,6 @@ buildGoModule rec { vendorSha256 = "sha256-tqrfCpZ/fRYZBZ/SBAvvJebLBeD2M/AVJEPiseehJHY="; - doCheck = false; - subPackages = [ "cmd/traefik" ]; nativeBuildInputs = [ go-bindata ]; From 2d58e98feb1e263bac4ae2e1bf4f969465ab309a Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 16 Mar 2022 13:18:53 -0300 Subject: [PATCH 11/24] docui: enable tests --- pkgs/tools/misc/docui/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index a1b2ad662bc6..9f0cb31c1ff7 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "1ggdczvv03lj0g6cq26vrk1rba6pk0805n85w9hkbjx9c4r3j577"; - doCheck = false; - meta = with lib; { description = "TUI Client for Docker"; homepage = "https://github.com/skanehira/docui"; From e3eef795d86ff6ca9d6285d9055f601a2f534d9e Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 5 Apr 2022 16:53:18 -0400 Subject: [PATCH 12/24] arkade: 0.8.19 -> 0.8.20 --- pkgs/applications/networking/cluster/arkade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 2ee7374e81b3..57a56e20c2e5 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.19"; + version = "0.8.20"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-GbuDL0JSG0r2LVcdJgQFBMNDpAl2WbhjIX0Ls9yCDYg="; + sha256 = "sha256-DIXvsYYckNlxFzeJqk3TYRQIAtafAfylyDc/a20kl+0="; }; CGO_ENABLED = 0; From aa45331156956d2ea9e8c2c2e5bdfd590a4c418c Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 5 Apr 2022 17:56:57 -0300 Subject: [PATCH 13/24] kubeseal: enable tests --- pkgs/applications/networking/cluster/kubeseal/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index b42a98405d2d..72218fa2209b 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = null; - doCheck = false; - subPackages = [ "cmd/kubeseal" ]; ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; From 3ebf33593c719a86c7ce4d996b012b0dc57e9aad Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 5 Apr 2022 18:00:01 -0300 Subject: [PATCH 14/24] yq-go: enable tests --- pkgs/development/tools/yq-go/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 9f31ce6f9434..59244b053eff 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "sha256-R40zU0jOc/eIFVDsWG3+4o51iro7Sd7jwtyH/fpWVZs="; - doCheck = false; - nativeBuildInputs = [ installShellFiles ]; postInstall = '' From 9c0c4fcf01fec234620ddc6c43162bf488d0b672 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 5 Apr 2022 18:21:58 -0300 Subject: [PATCH 15/24] gobuster: enable tests --- pkgs/tools/security/gobuster/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix index cc436a16b587..e11e76cc971b 100644 --- a/pkgs/tools/security/gobuster/default.nix +++ b/pkgs/tools/security/gobuster/default.nix @@ -16,8 +16,6 @@ buildGoModule rec { vendorSha256 = "1isp2jd6k4ppns5zi9irj09090imnc0xp6vcps135ymgp8qg4163"; - doCheck = false; - meta = with lib; { description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers"; homepage = "https://github.com/OJ/gobuster"; From 9e2d17a29d041e20f0f79f2443c016ad58389cdc Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 5 Apr 2022 18:25:24 -0300 Subject: [PATCH 16/24] istioctl: enable tests --- pkgs/applications/networking/cluster/istioctl/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index da633af2b8f7..84ba5330da10 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -12,8 +12,6 @@ buildGoModule rec { }; vendorSha256 = "sha256-AOcWkcw+2DcgBxvxRO/sdb339a7hmI7Oy5I4kW4oE+k="; - doCheck = false; - nativeBuildInputs = [ installShellFiles ]; # Bundle release metadata From be4566c532d740bdd7ee3a4fb259c4f5b1370d1b Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 5 Apr 2022 18:43:31 -0300 Subject: [PATCH 17/24] nextdns: enable tests --- pkgs/applications/networking/nextdns/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index c06291c719e8..c099ffd43c10 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "sha256-6hWD05lXteqL7egj9tiRVHlevKM33i+a+zBUZs7PF7I="; - doCheck = false; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { From 557f7572d8db3fb5ddddf5099c81725fb779edb7 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 6 Apr 2022 00:49:09 +0300 Subject: [PATCH 18/24] rustfmt: stop pretending we're on nightly We're not, and starting with 1.59 the test behavior actually differs based on these env vars. --- pkgs/development/compilers/rust/rustfmt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index b3191c242fea..f8ac8bf39df3 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -18,8 +18,8 @@ rustPlatform.buildRustPackage rec { # As of rustc 1.45.0, these env vars are required to build rustfmt (due to # https://github.com/rust-lang/rust/pull/72001) - CFG_RELEASE = "${rustPlatform.rust.rustc.version}-nightly"; - CFG_RELEASE_CHANNEL = "nightly"; + CFG_RELEASE = rustPlatform.rust.rustc.version; + CFG_RELEASE_CHANNEL = "stable"; meta = with lib; { description = "A tool for formatting Rust code according to style guidelines"; From d8710ac534fdb541314534c5ea68e1ddaad8573f Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 6 Apr 2022 01:14:21 +0300 Subject: [PATCH 19/24] indradb: fix build Was missing deps and hooks, now it at least compiles --- pkgs/development/tools/database/indradb/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/indradb/default.nix b/pkgs/development/tools/database/indradb/default.nix index f577963e8f4b..eefb0a32525f 100644 --- a/pkgs/development/tools/database/indradb/default.nix +++ b/pkgs/development/tools/database/indradb/default.nix @@ -3,6 +3,7 @@ , lib , rustPlatform , rustfmt +, protobuf }: let src = fetchFromGitHub { @@ -30,7 +31,9 @@ in buildAndTestSubdir = "server"; - nativeBuildInputs = [ rustfmt ]; + PROTOC = "${protobuf}/bin/protoc"; + + nativeBuildInputs = [ rustfmt rustPlatform.bindgenHook ]; # test rely on libindradb and it can't be found # failure at https://github.com/indradb/indradb/blob/master/server/tests/plugins.rs#L63 @@ -44,7 +47,9 @@ in cargoSha256 = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM="; - nativeBuildInputs = [ rustfmt ]; + PROTOC = "${protobuf}/bin/protoc"; + + nativeBuildInputs = [ rustfmt rustPlatform.bindgenHook ]; buildAndTestSubdir = "client"; }; From 22f857bf484921f02a8bad0eb0ade7169b32e663 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Apr 2022 02:13:04 +0200 Subject: [PATCH 20/24] nix-bisect: apply patch to fix nix compat --- pkgs/development/tools/misc/nix-bisect/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/tools/misc/nix-bisect/default.nix b/pkgs/development/tools/misc/nix-bisect/default.nix index 4075fe5ffbba..23efce44cff8 100644 --- a/pkgs/development/tools/misc/nix-bisect/default.nix +++ b/pkgs/development/tools/misc/nix-bisect/default.nix @@ -1,4 +1,5 @@ { lib +, fetchpatch , fetchFromGitHub , python3 }: @@ -18,6 +19,14 @@ python3.pkgs.buildPythonApplication { hash = "sha256-01vj35mMakqKi5zbMIPQ+R8xdkOWbzpnigd3/SU+svw="; }; + patches = [ + (fetchpatch { + # Fixes compatibility with recent nix versions + url = "https://github.com/timokau/nix-bisect/commit/01eefe174b740cb90e48b06d67d5582d51786b96.patch"; + hash = "sha256-Gls/NtHH7LujdEgLbcIRZ12KsJDrasXIMcHeeBVns4A="; + }) + ]; + propagatedBuildInputs = with python3.pkgs; [ appdirs numpy From e15ae73b7abc81133624644953fbfda9b5382065 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 6 Apr 2022 03:34:36 +0200 Subject: [PATCH 21/24] libsecret: fix build on darwin Remove unnecessary xvfb-run, accidentally re-introduced in https://github.com/NixOS/nixpkgs/commit/a42ca0678b548d47b1bda46259c5b02b5d54c019 And only run tests on Linux, since gjs dependency is not supported on Darwin. --- pkgs/development/libraries/libsecret/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index e023a524ae28..95e2c69e4c7b 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -18,7 +18,6 @@ , gjs , libintl , dbus -, xvfb-run }: stdenv.mkDerivation rec { @@ -59,16 +58,14 @@ stdenv.mkDerivation rec { python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 - xvfb-run dbus gjs ]; - doCheck = true; - + doCheck = stdenv.isLinux; postPatch = '' - patchShebangs . + patchShebangs ./tool/test-*.sh ''; preCheck = '' From 9bf28042f513bc7b54b7b4af5debaaf9a887478a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 30 Mar 2022 17:44:23 +0200 Subject: [PATCH 22/24] ocamlPackages.sqlite3EZ: remove at 0.1.0 Broken by a13cdfe520d87db401dd000fbd67cad728162a60 --- .../ocaml-modules/sqlite3EZ/default.nix | 36 ------------------- pkgs/top-level/ocaml-packages.nix | 2 -- 2 files changed, 38 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/sqlite3EZ/default.nix diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix deleted file mode 100644 index 6009eaecce1d..000000000000 --- a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, twt, ocaml_sqlite3 }: - -assert lib.versionAtLeast (lib.getVersion ocaml) "3.12"; - -if lib.versionAtLeast ocaml.version "4.06" -then throw "sqlite3EZ is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - pname = "ocaml-sqlite3EZ"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "mlin"; - repo = "ocaml-sqlite3EZ"; - rev = "v${version}"; - sha256 = "sha256-pKysvth0efxJeyJQY2Dnqarg7OtsKyyLnFV/1ZhsfDY="; - }; - - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ twt ]; - - propagatedBuildInputs = [ ocaml_sqlite3 ]; - - strictDeps = true; - - createFindlibDestdir = true; - - meta = with lib; { - homepage = "https://github.com/mlin/ocaml-sqlite3EZ"; - description = "A thin wrapper for sqlite3-ocaml with a simplified interface"; - license = licenses.mit; - maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or [ ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 62394a00c6d4..17015119cd92 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1293,8 +1293,6 @@ let spelll = callPackage ../development/ocaml-modules/spelll { }; - sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { }; - srt = callPackage ../development/ocaml-modules/srt { inherit (pkgs) srt; }; From ed1bc6d3699f825efd5c2aa319f3b00c6667c0df Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 30 Mar 2022 17:44:30 +0200 Subject: [PATCH 23/24] ocamlPackages.asn1-combinators: disable with OCaml < 4.08 Fixes build failures introduced by fbac0f4a6d367974be3a8ee015fd403a679a3402 --- pkgs/development/ocaml-modules/asn1-combinators/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 3c8be666b66a..8447c25cd707 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -3,13 +3,11 @@ }: buildDunePackage rec { - minimumOCamlVersion = "4.05"; + minimalOCamlVersion = "4.08"; pname = "asn1-combinators"; version = "0.2.6"; - useDune2 = true; - src = fetchurl { url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz"; sha256 = "sha256-ASreDYhp72IQY3UsHPjqAm9rxwL+0Q35r1ZojikbGpE="; From d240ca09aa43b3650da8b5b5ebc77053e7ecbaf6 Mon Sep 17 00:00:00 2001 From: "Aaron L. Zeng" Date: Wed, 6 Apr 2022 00:13:32 -0400 Subject: [PATCH 24/24] ocamlPackages.torch: Mark as broken with pytorch >= 1.11 --- pkgs/development/ocaml-modules/torch/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index 7a0c6bdadeff..c4c80dacc9f2 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -56,5 +56,6 @@ buildDunePackage rec { description = "Ocaml bindings to Pytorch"; maintainers = [ maintainers.bcdarwin ]; license = licenses.asl20; + broken = lib.versionAtLeast pytorch.version "1.11"; }; }