From cc356684d2c0790b01a647f44114cd17130de04d Mon Sep 17 00:00:00 2001 From: Bohdan Date: Thu, 19 Sep 2024 17:03:07 +0200 Subject: [PATCH] push updated nixpkgs and remove the jailbreak --- flake.lock | 12 ++++++------ flake.nix | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 5c9ecf6a..9e7daf54 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711555030, - "narHash": "sha256-PuFoxVlnKIIqI83o5yVFjR9XWiCSMTsHhvGoCpUNpvU=", + "lastModified": 1726757509, + "narHash": "sha256-3/2rV78QyC/OPu+WzimbElmSdD3HsQq/P/TLcFQHjZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb11f8589769078fa154fb57ed8edd185281f1db", + "rev": "78fdf431cdf6bc4ba4af9c100aaeda65da7e4ed3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2c35db9e..a71c117f 100644 --- a/flake.nix +++ b/flake.nix @@ -26,8 +26,7 @@ src = ./.; extraCabal2nixOptions = options; #"--jailbreak" }; - # jailbreaking here because otherwise aeson has to be overridden and that triggers recompilation of a lot of dependencies - agda2hs-hs = pkgs.haskellPackages.callPackage (agda2hs-pkg "--jailbreak") {}; + agda2hs-hs = pkgs.haskellPackages.callPackage (agda2hs-pkg "") {}; agda2hs-expr = import ./agda2hs.nix; agda2hs = pkgs.callPackage agda2hs-expr { inherit self;