git.iko.soy/jrec
on master help sign in
Update nixpkgs; thus remove 140774 workaround
8ec690bSridhar Ratnakumar
flake.lock+3−3
compare with master
unifiedsplit
@@ -70,11 +70,11 @@
70 },
70 },
71 "nixpkgs_2": {
71 "nixpkgs_2": {
72 "locked": {
72 "locked": {
73− "lastModified": 1678500213,
73+ "lastModified": 1678594102,
74− "narHash": "sha256-A5s2rXawJ+dCThkMXoMuYW8dgyUmkElcyfVJUot/Vr0=",
74+ "narHash": "sha256-OHAHYiMWJFPNxuW/PcOMlSD2tvXnEYC1jxREBADHwwQ=",
75 "owner": "nixos",
75 "owner": "nixos",
76 "repo": "nixpkgs",
76 "repo": "nixpkgs",
77− "rev": "2ce9b9842b5e63884dfc3dea6689769e2a1ea309",
77+ "rev": "796b4a3c1d903c4b9270cd2548fe46f524eeb886",
78 "type": "github"
78 "type": "github"
79 },
79 },
80 "original": {
80 "original": {
flake.nix−8
@@ -10,16 +10,8 @@
10 perSystem = { self', inputs', pkgs, system, ... }:
10 perSystem = { self', inputs', pkgs, system, ... }:
11 let
11 let
12 inherit (gitignore.lib) gitignoreSource;
12 inherit (gitignore.lib) gitignoreSource;
13− fixCyclicReference = drv:
14− pkgs.haskell.lib.overrideCabal drv (_: {
15− enableSeparateBinOutput = false;
16− });
17 overlay = self: super: {
13 overlay = self: super: {
18 jrec = self.callCabal2nix "jrec" (gitignoreSource ./.) { };
14 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− });
23 };
15 };
24 haskellPackages' = pkgs.haskellPackages.extend overlay;
16 haskellPackages' = pkgs.haskellPackages.extend overlay;
25 in
17 in