From 6cecaebbaaacc9438e8d0e71e74675abdeb59609 Mon Sep 17 00:00:00 2001 From: Torsten Schmits Date: Mon, 28 Oct 2024 14:04:44 +0100 Subject: [PATCH] bump nixpkgs --- flake.lock | 12 ++++++------ nix/overlay.nix | 37 ------------------------------------- 2 files changed, 6 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index 9df30d02..056f6235 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": 1720181791, - "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", + "lastModified": 1729850857, + "narHash": "sha256-WvLXzNNnnw+qpFOmgaM3JUlNEH+T4s22b5i2oyyCpXE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", + "rev": "41dea55321e5a999b17033296ac05fe8a8b5a257", "type": "github" }, "original": { diff --git a/nix/overlay.nix b/nix/overlay.nix index 4035e93f..fd787b85 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -5,7 +5,6 @@ }: let pkgs = import nixpkgs { inherit system; }; - hlib = pkgs.haskell.lib; overrides = self: super: let @@ -16,42 +15,6 @@ let in { polysemy = c2n "polysemy" ../.; polysemy-plugin = c2n "polysemy-plugin" ../polysemy-plugin; - } // pkgs.lib.optionalAttrs (compiler == "ghc910") { - - cabal-doctest = self.callHackageDirect { - pkg = "cabal-doctest"; - ver = "1.0.10"; - sha256 = "sha256-h6lGtI8czHKiYyoSrrMKrpitidhH5MBfczl9JkJ7Y0E="; - } {}; - - call-stack = hlib.dontCheck super.call-stack; - - doctest = hlib.dontCheck (self.callHackageDirect { - pkg = "doctest"; - ver = "0.22.2"; - sha256 = "193vrmxcnn9fxn7bc6y7jg8qwr13z9a26qqn0c294mn67il18cqn"; - rev = { - revision = "1"; - sha256 = "sha256-bZcyn5y1PS27VOv+j4EgIQWRd2aizi5EKs15BoL+NvE="; - }; - } {}); - - ghc-tcplugins-extra = self.callHackageDirect { - pkg = "ghc-tcplugins-extra"; - ver = "0.4.6"; - sha256 = "sha256-dFCNSkiKP5pr8Kx/p5Cb+WJ4cp/xcQA2Y5JgPwQ0CzQ="; - } {}; - - os-string = null; - - primitive = hlib.dontCheck super.primitive_0_9_0_0; - - th-abstraction = self.callHackageDirect { - pkg = "th-abstraction"; - ver = "0.7.0.0"; - sha256 = "sha256-YNCvJ9C8PsOTT+B4NoRT6kA2bOFk4F6ygm8hzWMH+1I="; - } {}; - }; in pkgs.haskell.packages.${compiler}.override { inherit overrides; } // { inherit pkgs; }