diff --git a/README.md b/README.md index fd909f8991a08fd47cc4b7d7435746c9a95d71cb..126446d3774a43d12315500f5a8e8736d0399882 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ This package set has the following policy. The package set is generated from the `horizon.dhall` using the following command: ``` -nix run 'git+https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix?ref=refs/tags/0.10.0' +nix run develop/#horizon-gen-nix ``` If you need to do additional manual overrides to the nix code, such as @@ -38,7 +38,7 @@ afterwards. To use `horizon-shell`. ``` -nix run 'git+https://gitlab.horizon-haskell.net/shells/horizon-shell?ref=refs/tags/0.0.7' +nix develop develop/ ``` See the in-shell help for usage. diff --git a/develop/flake.lock b/develop/flake.lock new file mode 100644 index 0000000000000000000000000000000000000000..622375615e722548220058d74ede9608d7977c93 --- /dev/null +++ b/develop/flake.lock @@ -0,0 +1,819 @@ +{ + "nodes": { + "crazyshell": { + "inputs": { + "flake-utils": "flake-utils_4", + "get-flake": "get-flake_2", + "horizon-platform": "horizon-platform", + "lint-utils": "lint-utils_4", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1680415307, + "narHash": "sha256-r5AlSRqlamRyIigCkA+Hq2ZkqFt+lE0bfOGMcQWLUlg=", + "ref": "refs/heads/master", + "rev": "42f4da076ee81c8e245731bf6fdf57cb25db3604", + "revCount": 22, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/shells/crazyshell" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/shells/crazyshell" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1683560683, + "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "006c75898cf814ef9497252b022e91c946ba8e17", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_3" + }, + "locked": { + "lastModified": 1678379998, + "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_4" + }, + "locked": { + "lastModified": 1683560683, + "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "006c75898cf814ef9497252b022e91c946ba8e17", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "locked": { + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_8": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_9": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "get-flake": { + "locked": { + "lastModified": 1673819588, + "narHash": "sha256-gRtwKAlu4htvS6dxyZnW3n+vMS1acqnMGVHqxUdETeY=", + "owner": "ursi", + "repo": "get-flake", + "rev": "e0917b6f564aa5acefb1484b5baf76da21746c3c", + "type": "github" + }, + "original": { + "owner": "ursi", + "repo": "get-flake", + "type": "github" + } + }, + "get-flake_2": { + "locked": { + "lastModified": 1673819588, + "narHash": "sha256-gRtwKAlu4htvS6dxyZnW3n+vMS1acqnMGVHqxUdETeY=", + "owner": "ursi", + "repo": "get-flake", + "rev": "e0917b6f564aa5acefb1484b5baf76da21746c3c", + "type": "github" + }, + "original": { + "owner": "ursi", + "repo": "get-flake", + "type": "github" + } + }, + "get-flake_3": { + "locked": { + "lastModified": 1673819588, + "narHash": "sha256-gRtwKAlu4htvS6dxyZnW3n+vMS1acqnMGVHqxUdETeY=", + "owner": "ursi", + "repo": "get-flake", + "rev": "e0917b6f564aa5acefb1484b5baf76da21746c3c", + "type": "github" + }, + "original": { + "owner": "ursi", + "repo": "get-flake", + "type": "github" + } + }, + "get-flake_4": { + "locked": { + "lastModified": 1673819588, + "narHash": "sha256-gRtwKAlu4htvS6dxyZnW3n+vMS1acqnMGVHqxUdETeY=", + "owner": "ursi", + "repo": "get-flake", + "rev": "e0917b6f564aa5acefb1484b5baf76da21746c3c", + "type": "github" + }, + "original": { + "owner": "ursi", + "repo": "get-flake", + "type": "github" + } + }, + "horizon-core": { + "inputs": { + "flake-parts": "flake-parts_2", + "get-flake": "get-flake", + "lint-utils": "lint-utils", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1697043887, + "narHash": "sha256-+ts9eNlYP5EuPXIIrJHbCn+1+5gjU9BphDHs6VNyVec=", + "ref": "refs/heads/master", + "rev": "f8238d98b143e2b0e7d2044a587df79293b255af", + "revCount": 1109, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core" + } + }, + "horizon-core_2": { + "inputs": { + "flake-parts": "flake-parts_4", + "get-flake": "get-flake_4", + "lint-utils": "lint-utils_5", + "nixpkgs": "nixpkgs_8" + }, + "locked": { + "lastModified": 1697043887, + "narHash": "sha256-+ts9eNlYP5EuPXIIrJHbCn+1+5gjU9BphDHs6VNyVec=", + "ref": "refs/heads/master", + "rev": "f8238d98b143e2b0e7d2044a587df79293b255af", + "revCount": 1109, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core" + } + }, + "horizon-gen-nix": { + "inputs": { + "flake-utils": "flake-utils", + "horizon-core": "horizon-core", + "lint-utils": "lint-utils_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1697044360, + "narHash": "sha256-+0kuvQp34A6h+AvZ1+AIKoDOfWaGNjuP3yebPExJN4s=", + "ref": "refs/heads/master", + "rev": "7ed16cff2708f6fb75d3bb3b024b8e4c42ad4fbf", + "revCount": 174, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix" + } + }, + "horizon-platform": { + "inputs": { + "flake-parts": "flake-parts_3", + "get-flake": "get-flake_3", + "horizon-shell-flake": "horizon-shell-flake", + "lint-utils": "lint-utils_3", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1680120375, + "narHash": "sha256-f6qp5jJFbvt/QU82s82C99xDs/ib6w7GAqrmXsvLw8M=", + "ref": "refs/heads/master", + "rev": "d987b5882bd0dc622687920e14398227a482c4db", + "revCount": 1060, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-platform" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-platform" + } + }, + "horizon-shell": { + "inputs": { + "crazyshell": "crazyshell", + "flake-utils": "flake-utils_7", + "horizon-core": "horizon-core_2", + "lint-utils": "lint-utils_6", + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1697046127, + "narHash": "sha256-GvNo2VkdBJlcW4nAqWopJOl8VFLlONVOI5VMwnAo/cM=", + "ref": "refs/heads/master", + "rev": "4a0bb73862a287a74ef68059ce3ba22d994c19c1", + "revCount": 28, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/shells/horizon-shell" + }, + "original": { + "type": "git", + "url": "https://gitlab.horizon-haskell.net/shells/horizon-shell" + } + }, + "horizon-shell-flake": { + "flake": false, + "locked": { + "lastModified": 1679524452, + "narHash": "sha256-xzNxvLVa3o0F/z4CnBDORv2Y6PfxjlGv7b7LybIyCSg=", + "ref": "refs/tags/0.0.8", + "rev": "21b8913803cefeb287bb244c7ee335638233db7f", + "revCount": 21, + "type": "git", + "url": "https://gitlab.horizon-haskell.net/shells/horizon-shell" + }, + "original": { + "ref": "refs/tags/0.0.8", + "type": "git", + "url": "https://gitlab.horizon-haskell.net/shells/horizon-shell" + } + }, + "lint-utils": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1681737193, + "narHash": "sha256-c+0eLyF/VWZWGeB1DA88aDUZ3BjO6+jnsJpVW4wxs4w=", + "ref": "refs/heads/master", + "rev": "efaf89d12a6811f0e00034444904b8d169f0fa34", + "revCount": 48, + "type": "git", + "url": "https://gitlab.nixica.dev/nix/lint-utils" + }, + "original": { + "type": "git", + "url": "https://gitlab.nixica.dev/nix/lint-utils" + } + }, + "lint-utils_2": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "horizon-gen-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1681737193, + "narHash": "sha256-c+0eLyF/VWZWGeB1DA88aDUZ3BjO6+jnsJpVW4wxs4w=", + "ref": "refs/heads/master", + "rev": "efaf89d12a6811f0e00034444904b8d169f0fa34", + "revCount": 48, + "type": "git", + "url": "https://gitlab.nixica.dev/nix/lint-utils" + }, + "original": { + "type": "git", + "url": "https://gitlab.nixica.dev/nix/lint-utils" + } + }, + "lint-utils_3": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1676204115, + "narHash": "sha256-cYYt6sN9t+lYYYelAbRtM/ioVJ27kMcUtR4unA8jfd4=", + "ref": "refs/heads/master", + "rev": "cc55bca9b25e65f7060de642c99e51bd96dfc190", + "revCount": 47, + "type": "git", + "url": "https://gitlab.homotopic.tech/nix/lint-utils" + }, + "original": { + "type": "git", + "url": "https://gitlab.homotopic.tech/nix/lint-utils" + } + }, + "lint-utils_4": { + "inputs": { + "flake-utils": "flake-utils_6", + "nixpkgs": [ + "horizon-shell", + "crazyshell", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1676204115, + "narHash": "sha256-cYYt6sN9t+lYYYelAbRtM/ioVJ27kMcUtR4unA8jfd4=", + "ref": "refs/heads/master", + "rev": "cc55bca9b25e65f7060de642c99e51bd96dfc190", + "revCount": 47, + "type": "git", + "url": "https://gitlab.homotopic.tech/nix/lint-utils" + }, + "original": { + "type": "git", + "url": "https://gitlab.homotopic.tech/nix/lint-utils" + } + }, + "lint-utils_5": { + "inputs": { + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1681737193, + "narHash": "sha256-c+0eLyF/VWZWGeB1DA88aDUZ3BjO6+jnsJpVW4wxs4w=", + "ref": "refs/heads/master", + "rev": "efaf89d12a6811f0e00034444904b8d169f0fa34", + "revCount": 48, + "type": "git", + "url": "https://gitlab.nixica.dev/nix/lint-utils" + }, + "original": { + "type": "git", + "url": "https://gitlab.nixica.dev/nix/lint-utils" + } + }, + "lint-utils_6": { + "inputs": { + "flake-utils": "flake-utils_9", + "nixpkgs": [ + "horizon-shell", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1681737193, + "narHash": "sha256-c+0eLyF/VWZWGeB1DA88aDUZ3BjO6+jnsJpVW4wxs4w=", + "ref": "refs/heads/master", + "rev": "efaf89d12a6811f0e00034444904b8d169f0fa34", + "revCount": 48, + "type": "git", + "url": "https://gitlab.nixica.dev/nix/lint-utils" + }, + "original": { + "type": "git", + "url": "https://gitlab.nixica.dev/nix/lint-utils" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1644525281, + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_2": { + "locked": { + "dir": "lib", + "lastModified": 1682879489, + "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_3": { + "locked": { + "dir": "lib", + "lastModified": 1678375444, + "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_4": { + "locked": { + "dir": "lib", + "lastModified": 1682879489, + "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_10": { + "locked": { + "lastModified": 1696879762, + "narHash": "sha256-Ud6bH4DMcYHUDKavNMxAhcIpDGgHMyL/yaDEAVSImQY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f99e5f03cc0aa231ab5950a15ed02afec45ed51a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1686701582, + "narHash": "sha256-uCj6bWmhb2RF+kmCP7T5ov5pg3HjksIyv4WDsCHZQyU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "55843b93856ad113166142cb3d2b01ffdcdf5de0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "haskell-updates", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1696757521, + "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2646b294a146df2781b1ca49092450e8a32814e1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1644525281, + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1679198465, + "narHash": "sha256-VfXpHpniNWgg7pBzxb20pRX7kqn80LApPDQYTReiFCw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5a05160f7671434e1c833b1b01284b876e04eca4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1680273054, + "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1644525281, + "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1686701582, + "narHash": "sha256-uCj6bWmhb2RF+kmCP7T5ov5pg3HjksIyv4WDsCHZQyU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "55843b93856ad113166142cb3d2b01ffdcdf5de0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "haskell-updates", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1696757521, + "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2646b294a146df2781b1ca49092450e8a32814e1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-parts": "flake-parts", + "horizon-gen-nix": "horizon-gen-nix", + "horizon-shell": "horizon-shell", + "nixpkgs": "nixpkgs_10" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/develop/flake.nix b/develop/flake.nix new file mode 100644 index 0000000000000000000000000000000000000000..47463ad52af51b83a4aa21badbebe1b5dbf88579 --- /dev/null +++ b/develop/flake.nix @@ -0,0 +1,48 @@ +{ + + nixConfig = { + extra-substituters = "https://horizon.cachix.org"; + extra-trusted-public-keys = "horizon.cachix.org-1:MeEEDRhRZTgv/FFGCv3479/dmJDfJ82G6kfUDxMSAw0="; + }; + + inputs = { + flake-parts.url = "github:hercules-ci/flake-parts"; + horizon-gen-nix.url = "git+https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix"; + horizon-shell.url = "git+https://gitlab.horizon-haskell.net/shells/horizon-shell"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + }; + + outputs = + inputs@ + { self + , flake-parts + , nixpkgs + , ... + }: + flake-parts.lib.mkFlake { inherit inputs; } + { + systems = [ + "x86_64-linux" + ]; + perSystem = { config, system, final, inputs', ... }: + let + pkgs = import inputs.nixpkgs { inherit system; }; + in + { + + apps = { + horizon-gen-nix = inputs.horizon-gen-nix.apps.${system}.default; + }; + + devShells.default = pkgs.mkShell { + buildInputs = [ + inputs.horizon-shell.packages.${system}.default + ]; + shellHook = '' + exec horizon-shell + ''; + }; + + }; + }; +} diff --git a/flake.lock b/flake.lock index ab7dda084ac976004856a307664c893caaf653c0..07a0ea26b82dc18293ce57014e2326ef84b8a06a 100644 --- a/flake.lock +++ b/flake.lock @@ -66,21 +66,6 @@ "type": "github" } }, - "get-flake": { - "locked": { - "lastModified": 1694475786, - "narHash": "sha256-s5wDmPooMUNIAAsxxCMMh9g68AueGg63DYk2hVZJbc8=", - "owner": "ursi", - "repo": "get-flake", - "rev": "ac54750e3b95dab6ec0726d77f440efe6045bec1", - "type": "github" - }, - "original": { - "owner": "ursi", - "repo": "get-flake", - "type": "github" - } - }, "horizon-core": { "inputs": { "flake-parts": "flake-parts", @@ -101,22 +86,6 @@ "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core" } }, - "horizon-shell-flake": { - "flake": false, - "locked": { - "lastModified": 1697046127, - "narHash": "sha256-GvNo2VkdBJlcW4nAqWopJOl8VFLlONVOI5VMwnAo/cM=", - "ref": "refs/heads/master", - "rev": "4a0bb73862a287a74ef68059ce3ba22d994c19c1", - "revCount": 28, - "type": "git", - "url": "https://gitlab.horizon-haskell.net/shells/horizon-shell" - }, - "original": { - "type": "git", - "url": "https://gitlab.horizon-haskell.net/shells/horizon-shell" - } - }, "lint-utils": { "inputs": { "flake-utils": "flake-utils_2", @@ -240,9 +209,7 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "get-flake": "get-flake", "horizon-core": "horizon-core", - "horizon-shell-flake": "horizon-shell-flake", "lint-utils": "lint-utils_2", "nixpkgs": "nixpkgs_4" } diff --git a/flake.nix b/flake.nix index 270fe47f2792ac6033839b22234b24079f85121c..8da7b239c41efb9fee401cb3ac60e83ee287cd14 100644 --- a/flake.nix +++ b/flake.nix @@ -7,12 +7,7 @@ }; inputs = { - get-flake.url = "github:ursi/get-flake"; horizon-core.url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-core"; - horizon-shell-flake = { - url = "git+https://gitlab.horizon-haskell.net/shells/horizon-shell"; - flake = false; - }; flake-utils.url = "github:numtide/flake-utils"; lint-utils.url = "git+https://gitlab.nixica.dev/nix/lint-utils"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -22,9 +17,7 @@ inputs@ { self , flake-utils - , get-flake , horizon-core - , horizon-shell-flake , lint-utils , nixpkgs , ... @@ -34,10 +27,7 @@ pkgs = import nixpkgs { inherit system; config.allowUnfree = true; }; in with pkgs.lib; - with pkgs.writers; let - horizon-shell = get-flake horizon-shell-flake; - overrides = composeManyExtensions [ (import ./overlay.nix { inherit pkgs; }) (import ./configuration.nix { inherit pkgs; }) @@ -47,15 +37,6 @@ packages = filterAttrs (_: isDerivation) legacyPackages; - devShell = pkgs.mkShell { - buildInputs = [ - horizon-shell.packages.${system}.default - ]; - shellHook = '' - horizon-shell - exit - ''; - }; in { checks = with lint-utils.outputs.linters.${system}; { @@ -63,8 +44,6 @@ nixpkgs-fmt = nixpkgs-fmt { src = self; find = "flake.nix"; }; }; - devShells.default = devShell; - inherit legacyPackages; inherit packages; });