From 16db0a058c2bc6e9a76a92f846925f0765225c09 Mon Sep 17 00:00:00 2001 From: Szabo Gergely Date: Thu, 14 Aug 2025 10:16:34 +0900 Subject: [PATCH 1/5] Switch to upstream http2-grpc-haskell --- flake.lock | 10 +++++----- flake.nix | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 6ed60d1..27b2736 100644 --- a/flake.lock +++ b/flake.lock @@ -553,15 +553,15 @@ "http2-grpc-native": { "flake": false, "locked": { - "lastModified": 1657722007, - "narHash": "sha256-yvwCkJBvfM51sp8FfbJe4IGpJpmi2Aag9WamuHLYHBo=", - "owner": "bladyjoker", + "lastModified": 1713558097, + "narHash": "sha256-aDn9LsImlz2mSbieSsW+42e8Rsv8oEgSv6MKXsntArk=", + "owner": "haskell-grpc-native", "repo": "http2-grpc-haskell", - "rev": "182cbbd50e8968f696f9f5583827073da86cd872", + "rev": "7c19009e37fc305f73988b06b2cba9f31ae5478e", "type": "github" }, "original": { - "owner": "bladyjoker", + "owner": "haskell-grpc-native", "repo": "http2-grpc-haskell", "type": "github" } diff --git a/flake.nix b/flake.nix index 5d55397..52b7dfc 100644 --- a/flake.nix +++ b/flake.nix @@ -13,9 +13,8 @@ flake = false; }; - # TODO(bladyjoker): Merge with upstream and use that. http2-grpc-native = { - url = "github:bladyjoker/http2-grpc-haskell"; + url = "github:haskell-grpc-native/http2-grpc-haskell"; flake = false; }; From 94851a7d3998d68c8674b64f9bc642e01bc856e0 Mon Sep 17 00:00:00 2001 From: Szabo Gergely Date: Thu, 14 Aug 2025 10:17:05 +0900 Subject: [PATCH 2/5] Remove unused haskell-nix --- flake.lock | 605 +---------------------------------------------------- flake.nix | 3 - pkgs.nix | 17 -- 3 files changed, 1 insertion(+), 624 deletions(-) delete mode 100644 pkgs.nix diff --git a/flake.lock b/flake.lock index 27b2736..062865b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,106 +1,6 @@ { "nodes": { - "HTTP": { - "flake": false, - "locked": { - "lastModified": 1451647621, - "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", - "owner": "phadej", - "repo": "HTTP", - "rev": "9bc0996d412fef1787449d841277ef663ad9a915", - "type": "github" - }, - "original": { - "owner": "phadej", - "repo": "HTTP", - "type": "github" - } - }, - "cabal-32": { - "flake": false, - "locked": { - "lastModified": 1603716527, - "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", - "owner": "haskell", - "repo": "cabal", - "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "3.2", - "repo": "cabal", - "type": "github" - } - }, - "cabal-34": { - "flake": false, - "locked": { - "lastModified": 1645834128, - "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", - "owner": "haskell", - "repo": "cabal", - "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", - "type": "github" - } - }, - "cabal-36": { - "flake": false, - "locked": { - "lastModified": 1669081697, - "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", - "owner": "haskell", - "repo": "cabal", - "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", - "type": "github" - } - }, - "cardano-shell": { - "flake": false, - "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", - "type": "github" - } - }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1672831974, - "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", - "owner": "input-output-hk", - "repo": "flake-compat", - "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "hkm/gitlab-fix", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1747046372, @@ -154,23 +54,6 @@ "type": "indirect" } }, - "ghc-8.6.5-iohk": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -192,109 +75,6 @@ "type": "github" } }, - "hackage": { - "flake": false, - "locked": { - "lastModified": 1754958431, - "narHash": "sha256-y20lSGL34w0W6D50JytnXAP1U0TvpMQDZd9blb5+0lk=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "0ca90916c82889aa0dedeaf98e11b8d4fb4a20da", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackage-for-stackage": { - "flake": false, - "locked": { - "lastModified": 1754958420, - "narHash": "sha256-tkZdEohv4Ui8P4+5EDL5WvY7G/der8vyt0vLRzaqa4A=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "701485197c7394cecf1cc0b9634f44ee46e37626", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "for-stackage", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackage-internal": { - "flake": false, - "locked": { - "lastModified": 1750307553, - "narHash": "sha256-iiafNoeLHwlSLQTyvy8nPe2t6g5AV4PPcpMeH/2/DLs=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "f7867baa8817fab296528f4a4ec39d1c7c4da4f3", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "haskell-nix": { - "inputs": { - "HTTP": "HTTP", - "cabal-32": "cabal-32", - "cabal-34": "cabal-34", - "cabal-36": "cabal-36", - "cardano-shell": "cardano-shell", - "flake-compat": "flake-compat", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "hackage": "hackage", - "hackage-for-stackage": "hackage-for-stackage", - "hackage-internal": "hackage-internal", - "hls": "hls", - "hls-1.10": "hls-1.10", - "hls-2.0": "hls-2.0", - "hls-2.10": "hls-2.10", - "hls-2.11": "hls-2.11", - "hls-2.2": "hls-2.2", - "hls-2.3": "hls-2.3", - "hls-2.4": "hls-2.4", - "hls-2.5": "hls-2.5", - "hls-2.6": "hls-2.6", - "hls-2.7": "hls-2.7", - "hls-2.8": "hls-2.8", - "hls-2.9": "hls-2.9", - "hpc-coveralls": "hpc-coveralls", - "iserv-proxy": "iserv-proxy", - "nixpkgs": [ - "haskell-nix", - "nixpkgs-unstable" - ], - "nixpkgs-2305": "nixpkgs-2305", - "nixpkgs-2311": "nixpkgs-2311", - "nixpkgs-2405": "nixpkgs-2405", - "nixpkgs-2411": "nixpkgs-2411", - "nixpkgs-2505": "nixpkgs-2505", - "nixpkgs-unstable": "nixpkgs-unstable", - "old-ghc-nix": "old-ghc-nix", - "stackage": "stackage" - }, - "locked": { - "lastModified": 1754959933, - "narHash": "sha256-db0IjDO3mV57aJftEtyz09FRzU5sWa3eXUYmlCaJ0j8=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "6dd3b06865102c5e1284423a59ff92945aa61534", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "type": "github" - } - }, "hci-effects": { "inputs": { "flake-parts": "flake-parts_2", @@ -314,242 +94,6 @@ "type": "github" } }, - "hls": { - "flake": false, - "locked": { - "lastModified": 1741604408, - "narHash": "sha256-tuq3+Ip70yu89GswZ7DSINBpwRprnWnl6xDYnS4GOsc=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "682d6894c94087da5e566771f25311c47e145359", - "type": "github" - }, - "original": { - "owner": "haskell", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-1.10": { - "flake": false, - "locked": { - "lastModified": 1680000865, - "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "1.10.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.0": { - "flake": false, - "locked": { - "lastModified": 1687698105, - "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "783905f211ac63edf982dd1889c671653327e441", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.0.0.1", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.10": { - "flake": false, - "locked": { - "lastModified": 1743069404, - "narHash": "sha256-q4kDFyJDDeoGqfEtrZRx4iqMVEC2MOzCToWsFY+TOzY=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "2318c61db3a01e03700bd4b05665662929b7fe8b", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.10.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.11": { - "flake": false, - "locked": { - "lastModified": 1747306193, - "narHash": "sha256-/MmtpF8+FyQlwfKHqHK05BdsxC9LHV70d/FiMM7pzBM=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "46ef4523ea4949f47f6d2752476239f1c6d806fe", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.11.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.2": { - "flake": false, - "locked": { - "lastModified": 1693064058, - "narHash": "sha256-8DGIyz5GjuCFmohY6Fa79hHA/p1iIqubfJUTGQElbNk=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "b30f4b6cf5822f3112c35d14a0cba51f3fe23b85", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.2.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.3": { - "flake": false, - "locked": { - "lastModified": 1695910642, - "narHash": "sha256-tR58doOs3DncFehHwCLczJgntyG/zlsSd7DgDgMPOkI=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "458ccdb55c9ea22cd5d13ec3051aaefb295321be", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.3.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.4": { - "flake": false, - "locked": { - "lastModified": 1699862708, - "narHash": "sha256-YHXSkdz53zd0fYGIYOgLt6HrA0eaRJi9mXVqDgmvrjk=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "54507ef7e85fa8e9d0eb9a669832a3287ffccd57", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.4.0.1", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.5": { - "flake": false, - "locked": { - "lastModified": 1701080174, - "narHash": "sha256-fyiR9TaHGJIIR0UmcCb73Xv9TJq3ht2ioxQ2mT7kVdc=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "27f8c3d3892e38edaef5bea3870161815c4d014c", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.5.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.6": { - "flake": false, - "locked": { - "lastModified": 1705325287, - "narHash": "sha256-+P87oLdlPyMw8Mgoul7HMWdEvWP/fNlo8jyNtwME8E8=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "6e0b342fa0327e628610f2711f8c3e4eaaa08b1e", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.6.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.7": { - "flake": false, - "locked": { - "lastModified": 1708965829, - "narHash": "sha256-LfJ+TBcBFq/XKoiNI7pc4VoHg4WmuzsFxYJ3Fu+Jf+M=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "50322b0a4aefb27adc5ec42f5055aaa8f8e38001", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.7.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.8": { - "flake": false, - "locked": { - "lastModified": 1715153580, - "narHash": "sha256-Vi/iUt2pWyUJlo9VrYgTcbRviWE0cFO6rmGi9rmALw0=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "dd1be1beb16700de59e0d6801957290bcf956a0a", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.8.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.9": { - "flake": false, - "locked": { - "lastModified": 1719993701, - "narHash": "sha256-wy348++MiMm/xwtI9M3vVpqj2qfGgnDcZIGXw8sF1sA=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "90319a7e62ab93ab65a95f8f2bcf537e34dae76a", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.9.0.1", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hpc-coveralls": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, "http2-grpc-native": { "flake": false, "locked": { @@ -566,23 +110,6 @@ "type": "github" } }, - "iserv-proxy": { - "flake": false, - "locked": { - "lastModified": 1750543273, - "narHash": "sha256-WaswH0Y+Fmupvv8AkIlQBlUy/IdD3Inx9PDuE+5iRYY=", - "owner": "stable-haskell", - "repo": "iserv-proxy", - "rev": "a53c57c9a8d22a66a2f0c4c969e806da03f08c28", - "type": "github" - }, - "original": { - "owner": "stable-haskell", - "ref": "iserv-syms", - "repo": "iserv-proxy", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1751984180, @@ -599,86 +126,6 @@ "type": "github" } }, - "nixpkgs-2305": { - "locked": { - "lastModified": 1705033721, - "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-23.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2311": { - "locked": { - "lastModified": 1719957072, - "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-23.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2405": { - "locked": { - "lastModified": 1735564410, - "narHash": "sha256-HB/FA0+1gpSs8+/boEavrGJH+Eq08/R2wWNph1sM1Dg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1e7a8f391f1a490460760065fa0630b5520f9cf8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-24.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2411": { - "locked": { - "lastModified": 1748037224, - "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-24.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2505": { - "locked": { - "lastModified": 1748852332, - "narHash": "sha256-r/wVJWmLYEqvrJKnL48r90Wn9HWX9SHFt6s4LhuTh7k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a8167f3cc2f991dd4d0055746df53dae5fd0c953", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-25.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1753579242, @@ -694,22 +141,6 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1748856973, - "narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1751274312, @@ -742,26 +173,9 @@ "type": "github" } }, - "old-ghc-nix": { - "flake": false, - "locked": { - "lastModified": 1631092763, - "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", - "owner": "angerman", - "repo": "old-ghc-nix", - "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", - "type": "github" - }, - "original": { - "owner": "angerman", - "ref": "master", - "repo": "old-ghc-nix", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "gitignore": "gitignore", "nixpkgs": "nixpkgs_3" }, @@ -798,29 +212,12 @@ "root": { "inputs": { "flake-parts": "flake-parts", - "haskell-nix": "haskell-nix", "hci-effects": "hci-effects", "http2-grpc-native": "http2-grpc-native", "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", "protobuf": "protobuf" } - }, - "stackage": { - "flake": false, - "locked": { - "lastModified": 1754957611, - "narHash": "sha256-V/AKJTvb6AaE4jgwvYDQyiXc7BRRPIlMJ5FmPqrHkn4=", - "owner": "input-output-hk", - "repo": "stackage.nix", - "rev": "b2024065c393572b979e55ed3b526d540b4865b8", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "stackage.nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 52b7dfc..a06aa1a 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - haskell-nix.url = "github:input-output-hk/haskell.nix"; - pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; protobuf = { @@ -27,7 +25,6 @@ inputs@{ flake-parts, ... }: flake-parts.lib.mkFlake { inherit inputs; } { imports = [ - ./pkgs.nix ./settings.nix ./pre-commit.nix ./hercules-ci.nix diff --git a/pkgs.nix b/pkgs.nix deleted file mode 100644 index 377a3dd..0000000 --- a/pkgs.nix +++ /dev/null @@ -1,17 +0,0 @@ -# Repo-wide Nixpkgs with a ton of overlays -{ inputs, ... }: -{ - perSystem = - { pkgs, system, ... }: - { - - _module.args.pkgs = import inputs.nixpkgs { - inherit system; - inherit (inputs.haskell-nix) config; - overlays = [ - inputs.haskell-nix.overlay - ]; - }; - - }; -} From caee0f04c2595789be27b1adaa62b45f90ea268d Mon Sep 17 00:00:00 2001 From: Szabo Gergely Date: Thu, 14 Aug 2025 10:20:51 +0900 Subject: [PATCH 3/5] Update protobuf --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 062865b..81a7224 100644 --- a/flake.lock +++ b/flake.lock @@ -196,11 +196,11 @@ "protobuf": { "flake": false, "locked": { - "lastModified": 1754974209, - "narHash": "sha256-s2+jNwG3xHgyKRBTW1Rz/Wffx++HMYJM5CfVDrJ+RVg=", + "lastModified": 1755131070, + "narHash": "sha256-fP7CyYzdaoxZdru5piaZhnv+Exl7nJ48F8yFKu8LMq0=", "owner": "protocolbuffers", "repo": "protobuf", - "rev": "9d8f0b5ede683ff0358c2d73ed2769160b101a0e", + "rev": "dafdede53504b6b2d0d2f076ad6e95c82e2f2cd7", "type": "github" }, "original": { From 3458cdb51674fe583d6a54d5f6d6352a220a219a Mon Sep 17 00:00:00 2001 From: Szabo Gergely Date: Thu, 14 Aug 2025 10:48:13 +0900 Subject: [PATCH 4/5] Update nixpkgs --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 81a7224..9c13ce8 100644 --- a/flake.lock +++ b/flake.lock @@ -143,16 +143,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751274312, - "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", + "lastModified": 1754937576, + "narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", + "rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index a06aa1a..6fb43b1 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "proto.nix"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; From 31f6fd5212ba56eab7e2dd31a210e86847983971 Mon Sep 17 00:00:00 2001 From: Szabo Gergely Date: Thu, 14 Aug 2025 12:07:57 +0900 Subject: [PATCH 5/5] Update proto-lens-protoc --- settings.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/settings.nix b/settings.nix index 22197be..069b0ec 100644 --- a/settings.nix +++ b/settings.nix @@ -19,9 +19,7 @@ config = { settings = { - # WARN(bladyjoker): Using recent versions fails because `ghc-source-gen` is marked as broken. - # Unfortunately, this means yet another GHC in your Nix store -.- - proto-lens-protoc = pkgs.haskell.packages.ghc810.proto-lens-protoc; + proto-lens-protoc = pkgs.haskellPackages.proto-lens-protoc; }; };