on master help sign in
Update nixpkgs; thus remove 140774 workaround
commit8ec690bb11cc1932f7e3aa0cfe8074ab3ba7ab24 authorSridhar Ratnakumar <srid@srid.ca> dateSun 12 Mar 2023, 19:57 (4 years ago) parent991d3a4
2 files changed+3−11
flake.lock+3−3 flake.nix−8
flake.lock+3−3
@@ -70,11 +70,11 @@
7070 },
7171 "nixpkgs_2": {
7272 "locked": {
73− "lastModified": 1678500213,
74− "narHash": "sha256-A5s2rXawJ+dCThkMXoMuYW8dgyUmkElcyfVJUot/Vr0=",
73+ "lastModified": 1678594102,
74+ "narHash": "sha256-OHAHYiMWJFPNxuW/PcOMlSD2tvXnEYC1jxREBADHwwQ=",
7575 "owner": "nixos",
7676 "repo": "nixpkgs",
77− "rev": "2ce9b9842b5e63884dfc3dea6689769e2a1ea309",
77+ "rev": "796b4a3c1d903c4b9270cd2548fe46f524eeb886",
7878 "type": "github"
7979 },
8080 "original": {
flake.nix−8
@@ -10,16 +10,8 @@
1010 perSystem = { self', inputs', pkgs, system, ... }:
1111 let
1212 inherit (gitignore.lib) gitignoreSource;
13− fixCyclicReference = drv:
14− pkgs.haskell.lib.overrideCabal drv (_: {
15− enableSeparateBinOutput = false;
16− });
1713 overlay = self: super: {
1814 jrec = self.callCabal2nix "jrec" (gitignoreSource ./.) { };
19− # Workaround for https://github.com/NixOS/nixpkgs/issues/140774
20− haskell-language-server = super.haskell-language-server.overrideScope (lself: lsuper: {
21− ormolu = fixCyclicReference super.ormolu;
22− });
2315 };
2416 haskellPackages' = pkgs.haskellPackages.extend overlay;
2517 in