*.nix: Adjust to nixpkgs update.

awakesecurity · Nov 7, 2023 · e1e3292 · e1e3292
1 parent c6c6a26
commit e1e3292
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/nix/dhall.nix b/nix/dhall.nix
@@ -20,6 +20,7 @@ mkDerivation {
   sha256 = "f3e95cfa0ef1a89d5ca29591b7925db51551150a27f3fd02717ce69699e8e03c";
   revision = "2";
   editedCabalFile = "02z0jmzzp20yj46iz6i384xwc6k2anxb33smvc4yhpmhqjs0aq8a";
+  jailbreak = true;
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = true;

diff --git a/nix/proto3-suite.nix b/nix/proto3-suite.nix
@@ -15,8 +15,8 @@ mkDerivation {
   version = "0.6.0";
   src = fetchgit {
     url = "https://github.com/awakesecurity/proto3-suite.git";
-    sha256 = "1bvivy1rw84gln3kvb704wcsaz8l5xmgfibbbammbkmnjcgfs1y5";
-    rev = "1f2c156b1178599d3853dac941beb3f29e2bdf5e";
+    sha256 = "sha256-1a1ZHlvvtE1urvDL7n984OQ5gbro26RnKAjvDCH/2fs=";
+    rev = "9f7daef66ba6dfc9574039b1d206c5df126d4b39";
     fetchSubmodules = true;
   };
   isLibrary = true;

diff --git a/nix/proto3-wire.nix b/nix/proto3-wire.nix
@@ -9,8 +9,8 @@ mkDerivation {
   version = "1.4.1";
   src = fetchgit {
     url = "https://github.com/awakesecurity/proto3-wire.git";
-    sha256 = "189dzkxdwnfscq8ylfalxkh95x7kkjlawz9wqkwbdblg5a5k1y7i";
-    rev = "13962d58dbfb3cfbb539702746afe94ec02189ce";
+    sha256 = "sha256-g15oAYmhfv8DVgmQTZkcCgOYRFkxl2PQi30qXXXhBLs=";
+    rev = "ee6ca644eef86cc5f31da85fb48e10b20ab0e1a1";
     fetchSubmodules = true;
   };
   libraryHaskellDepends = [

diff --git a/release.nix b/release.nix
@@ -71,7 +71,12 @@ let
     haskellPackages = pkgsOld.haskellPackages.override {
       overrides = haskellPackagesNew: haskellPackagesOld: rec {
         data-diverse =
-          pkgsNew.haskell.lib.unmarkBroken haskellPackagesOld.data-diverse;
+          pkgsNew.haskell.lib.overrideCabal haskellPackagesOld.data-diverse (old: {
+            broken = assert !old.broken ->
+              builtins.trace "remove the data-diverse override in release.nix" false;
+              false;
+            doCheck = false;
+          });
 
         dhall =
           haskellPackagesNew.callPackage ./nix/dhall.nix { };