update horizon

This commit is contained in:
Tom Sydney Kerckhove 2024-10-13 01:00:01 +02:00
parent be4aba9ef1
commit a7488a3303
2 changed files with 82 additions and 81 deletions

View File

@ -3,11 +3,11 @@
"fast-myers-diff": {
"flake": false,
"locked": {
"lastModified": 1721402405,
"narHash": "sha256-VtJeYPN+rk9rx9aPwLsd/l62nxee4rJpHcvpUC8LpwI=",
"lastModified": 1725809875,
"narHash": "sha256-csh7DuQAtoIWgEKEGj+GcRrmO9Ue6a7QyNAtY3yNsLc=",
"owner": "NorfairKing",
"repo": "fast-myers-diff",
"rev": "6cee293f3f32c443295e589330cf30a46ada0045",
"rev": "d7c1a675af3889698b987485a630f96a993226fa",
"type": "github"
},
"original": {
@ -37,11 +37,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1717285511,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"lastModified": 1727826117,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github"
},
"original": {
@ -55,11 +55,11 @@
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1717285511,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"lastModified": 1726153070,
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github"
},
"original": {
@ -101,11 +101,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1719751316,
"narHash": "sha256-exJ80zZPyiSxiYQb4IreK7LDpjfBLOCPb77QUn3TGR8=",
"lastModified": 1728731176,
"narHash": "sha256-BMlGwamx9DGPK2sZUcHBaIxxF5NrvmxEojLVQnlFIP0=",
"ref": "refs/heads/master",
"rev": "36784235da4dd828b3e139a855dc8410fff91376",
"revCount": 259,
"rev": "8c130d28aff2973045540361c34112a6fdb49db0",
"revCount": 267,
"type": "git",
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-advance"
},
@ -127,11 +127,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1718969469,
"narHash": "sha256-0Q8v/yNwcLZy0znegLXx/SQmbfd2d/4TBSrFYh7g7+0=",
"lastModified": 1727953000,
"narHash": "sha256-X87uDIiVm8ele4o53FaKKm9PvI4fdfqpQyea6LWxexI=",
"ref": "refs/heads/master",
"rev": "23fa82740dc197706a3737c8830b724ccabafac4",
"revCount": 96,
"rev": "dfc1cfe14f6f3e156b800c55dced4c211aa328f4",
"revCount": 104,
"type": "git",
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-build-packages"
},
@ -148,11 +148,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1718977916,
"narHash": "sha256-sssWF/XjZga4asgwvovPLAbg8E2EyLDQOYSFgUbKg6c=",
"lastModified": 1728019357,
"narHash": "sha256-8FB4varne9uSaq6S22470RKWIuZZRVm7tzMa+mlc1vA=",
"ref": "refs/heads/master",
"rev": "81674e75e63548341ebe0cb94127044255affb55",
"revCount": 1375,
"rev": "6e77e3b661ecb7318332f510f1c85480df7cda88",
"revCount": 1383,
"type": "git",
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core"
},
@ -167,11 +167,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1718969245,
"narHash": "sha256-eeMsOK3Hmm23SH45GdbuWRtpEcMWZPC/JCYvKL2LOos=",
"lastModified": 1727952319,
"narHash": "sha256-oh2st42snuv44c7/Pga/obgVG87alRoWywKZ60Bf0V8=",
"ref": "refs/heads/master",
"rev": "0bcfe994903359aef81338915706bf6b2f38aaa4",
"revCount": 109,
"rev": "f99ab296e55a80fbcfa50e2a7832b001ae1b0ba5",
"revCount": 115,
"type": "git",
"url": "https://gitlab.horizon-haskell.net/ghc/horizon-ghc"
},
@ -212,11 +212,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1718928808,
"narHash": "sha256-MjVGflb3qXOrJRTJ5siQZHYuMCsRHaqYgTSKSik+/sE=",
"lastModified": 1726877710,
"narHash": "sha256-53Q5rKVWBYc62qS2TNOtoa6hG8820Teq0/x7olr0KUs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "564000ae34c6af8549f3729051bbae33403e298c",
"rev": "93d142112e81929c5bfd20b13bc287da8922dc97",
"type": "github"
},
"original": {
@ -226,22 +226,6 @@
"type": "github"
}
},
"nixpkgs-23_05": {
"locked": {
"lastModified": 1704290814,
"narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-23_11": {
"locked": {
"lastModified": 1720535198,
@ -260,26 +244,26 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1717284937,
"narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
"lastModified": 1727825735,
"narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
}
},
"nixpkgs-lib_2": {
"locked": {
"lastModified": 1717284937,
"narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
"lastModified": 1725233747,
"narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
}
},
"nixpkgs-stable": {
@ -300,11 +284,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1718928808,
"narHash": "sha256-MjVGflb3qXOrJRTJ5siQZHYuMCsRHaqYgTSKSik+/sE=",
"lastModified": 1727914564,
"narHash": "sha256-S0KZLpF6yfX6c6ehfz2svB3VzYNJ8YxfQJH6NgyHNk8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "564000ae34c6af8549f3729051bbae33403e298c",
"rev": "9d0ab8b5db9ba62989e648db86c66c0fb620b6e9",
"type": "github"
},
"original": {
@ -316,11 +300,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1718928808,
"narHash": "sha256-MjVGflb3qXOrJRTJ5siQZHYuMCsRHaqYgTSKSik+/sE=",
"lastModified": 1727914564,
"narHash": "sha256-S0KZLpF6yfX6c6ehfz2svB3VzYNJ8YxfQJH6NgyHNk8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "564000ae34c6af8549f3729051bbae33403e298c",
"rev": "9d0ab8b5db9ba62989e648db86c66c0fb620b6e9",
"type": "github"
},
"original": {
@ -332,11 +316,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1719706517,
"narHash": "sha256-ynXAAr5AJgTQHQAJW4GH3i8auqnZVzcjCokZMdEKjcs=",
"lastModified": 1728000969,
"narHash": "sha256-MYiswvy74bWkXGSk+D8Hhu7Gg2iel6Tu4J3sbgC3krg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "01da4c59cc4879540b7a5d73230475b4616a0dc8",
"rev": "d4db941d790cc72a8b6867ccf85ef4e6d77e1097",
"type": "github"
},
"original": {
@ -348,11 +332,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1721226092,
"narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=",
"lastModified": 1728627514,
"narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c716603a63aca44f39bef1986c13402167450e0a",
"rev": "c505ebf777526041d792a49d5f6dd4095ea391a7",
"type": "github"
},
"original": {
@ -378,6 +362,22 @@
"type": "github"
}
},
"opt-env-conf": {
"flake": false,
"locked": {
"lastModified": 1728773750,
"narHash": "sha256-bgQLjvq+fdDNntJJfgABCm8LevZJuRJYQXZcM6tbNxQ=",
"owner": "NorfairKing",
"repo": "opt-env-conf",
"rev": "be38b03718899ee7819054ee442cbb637108201e",
"type": "github"
},
"original": {
"owner": "NorfairKing",
"repo": "opt-env-conf",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat",
@ -386,11 +386,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1721042469,
"narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
"lastModified": 1728727368,
"narHash": "sha256-7FMyNISP7K6XDSIt1NJxkXZnEdV3HZUXvFoBaJ/qdOg=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
"rev": "eb74e0be24a11a1531b5b8659535580554d30b28",
"type": "github"
},
"original": {
@ -404,8 +404,8 @@
"fast-myers-diff": "fast-myers-diff",
"horizon-advance": "horizon-advance",
"nixpkgs": "nixpkgs_5",
"nixpkgs-23_05": "nixpkgs-23_05",
"nixpkgs-23_11": "nixpkgs-23_11",
"opt-env-conf": "opt-env-conf",
"pre-commit-hooks": "pre-commit-hooks",
"safe-coloured-text": "safe-coloured-text",
"sydtest": "sydtest",
@ -415,11 +415,11 @@
"safe-coloured-text": {
"flake": false,
"locked": {
"lastModified": 1721401843,
"narHash": "sha256-vLE7xo1A4pnjJVsbwCm+A1N5osuhWbVcrPZDNL0g6C0=",
"lastModified": 1722709522,
"narHash": "sha256-zglWqKISYz34A+/PvqwvwrbQYSEcko8C595VAeINitw=",
"owner": "NorfairKing",
"repo": "safe-coloured-text",
"rev": "26b7657428f277f819a0831cbddddb7f4c5408f9",
"rev": "046f10147a058c00c2706d98c341219e3cbc7669",
"type": "github"
},
"original": {
@ -431,11 +431,11 @@
"sydtest": {
"flake": false,
"locked": {
"lastModified": 1717391148,
"narHash": "sha256-LDjuZAqincm814E0wCsiZEHKiwLx20srJyAkUsCYpTA=",
"lastModified": 1728771925,
"narHash": "sha256-ejWRIKV5TEHtEx2PxfBC+7yaWlyNufY05gPgAJ/Q9gU=",
"owner": "NorfairKing",
"repo": "sydtest",
"rev": "6be618a53366d2453ba55da6cddc119d6d589916",
"rev": "aab13681d89f0875411f2ac2b8d7dd7822869b5f",
"type": "github"
},
"original": {
@ -447,11 +447,11 @@
"validity": {
"flake": false,
"locked": {
"lastModified": 1722943924,
"narHash": "sha256-hq5FwDFW+02u5Qsx8v1KWoQUsY6S6ufI4WYKZ6yhYUA=",
"lastModified": 1728772377,
"narHash": "sha256-5hHY8A8lO87G9TQLjwqCFzXmFMeXE71jeanuqHTS3T8=",
"owner": "NorfairKing",
"repo": "validity",
"rev": "51b8843b9bd5228160b99f653d3271147245d689",
"rev": "512aea6e0a112f5df09cc0b08f7fceffb122abc6",
"type": "github"
},
"original": {

View File

@ -7,7 +7,6 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-24.05";
nixpkgs-23_11.url = "github:NixOS/nixpkgs?ref=nixos-23.11";
nixpkgs-23_05.url = "github:NixOS/nixpkgs?ref=nixos-23.05";
horizon-advance.url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-advance";
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
validity.url = "github:NorfairKing/validity";
@ -18,19 +17,21 @@
fast-myers-diff.flake = false;
sydtest.url = "github:NorfairKing/sydtest";
sydtest.flake = false;
opt-env-conf.url = "github:NorfairKing/opt-env-conf";
opt-env-conf.flake = false;
};
outputs =
{ self
, nixpkgs
, nixpkgs-23_11
, nixpkgs-23_05
, horizon-advance
, pre-commit-hooks
, validity
, safe-coloured-text
, fast-myers-diff
, sydtest
, opt-env-conf
}:
let
system = "x86_64-linux";
@ -41,6 +42,7 @@
(pkgs.callPackage (safe-coloured-text + "/nix/overrides.nix") { })
(pkgs.callPackage (sydtest + "/nix/overrides.nix") { })
(pkgs.callPackage (validity + "/nix/overrides.nix") { })
(pkgs.callPackage (opt-env-conf + "/nix/overrides.nix") { })
self.overrides.${system}
];
horizonPkgs = horizon-advance.legacyPackages.${system}.extend allOverrides;
@ -56,8 +58,7 @@
backwardCompatibilityCheckFor = nixpkgs: (haskellPackagesFor nixpkgs).autodocodecRelease;
allNixpkgs = {
inherit
nixpkgs-23_11
nixpkgs-23_05;
nixpkgs-23_11;
};
backwardCompatibilityChecks = pkgs.lib.mapAttrs (_: nixpkgs: backwardCompatibilityCheckFor nixpkgs) allNixpkgs;
in