Skip to content
Snippets Groups Projects
Commit 0a713a73 authored by Raoul Hidalgo Charman's avatar Raoul Hidalgo Charman
Browse files

Use flake for horizon-gen-nix 

This is more reliable than trying to use the previous horizon-platform
version.
parent f3c4a93c
No related merge requests found
Hide whitespace changes
Inline Side-by-side
flake.lock
+ 260
− 4
View file @ 0a713a73
...@@ -15,6 +15,65 @@ ...@@ -15,6 +15,65 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": {
"lastModified": 1667077288,
"narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"id": "flake-utils",
"type": "indirect"
}
},
"flake-utils_4": {
"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_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": { "locked": {
"lastModified": 1644229661, "lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
...@@ -44,7 +103,114 @@ ...@@ -44,7 +103,114 @@
"type": "github" "type": "github"
} }
}, },
"get-flake_2": {
"locked": {
"lastModified": 1644686428,
"narHash": "sha256-zkhYsURWFrvEZLkIoBeqFBzSu+cA2u5mo6M8vq9LN7M=",
"owner": "ursi",
"repo": "get-flake",
"rev": "703f15558daa56dfae19d1858bb3046afe68831a",
"type": "github"
},
"original": {
"owner": "ursi",
"repo": "get-flake",
"type": "github"
}
},
"get-flake_3": {
"locked": {
"lastModified": 1644686428,
"narHash": "sha256-zkhYsURWFrvEZLkIoBeqFBzSu+cA2u5mo6M8vq9LN7M=",
"owner": "ursi",
"repo": "get-flake",
"rev": "703f15558daa56dfae19d1858bb3046afe68831a",
"type": "github"
},
"original": {
"owner": "ursi",
"repo": "get-flake",
"type": "github"
}
},
"horizon-gen-nix": {
"flake": false,
"locked": {
"lastModified": 1674316125,
"narHash": "sha256-yUsmHUkNR/9eMnd9F/DC/cvSOaHFJDhdbaI4cG2aZcY=",
"ref": "refs/heads/master",
"rev": "32cb94962f2ec84090d0d2d36d9728ef443fe239",
"revCount": 119,
"type": "git",
"url": "https://gitlab.homotopic.tech/horizon/horizon-gen-nix"
},
"original": {
"type": "git",
"url": "https://gitlab.homotopic.tech/horizon/horizon-gen-nix"
}
},
"horizon-gen-nix-flake": {
"inputs": {
"flake-utils": "flake-utils_2",
"get-flake": "get-flake_2",
"horizon-gen-nix": "horizon-gen-nix",
"horizon-platform": "horizon-platform",
"lint-utils": "lint-utils_2",
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1676371953,
"narHash": "sha256-F3TABf4YayjrxVJvZLz0CGCDFtuJqTuRUZ3/VjfbUd4=",
"ref": "refs/heads/master",
"rev": "49c69972aeb859b8f377121475be71bf3cfe2f87",
"revCount": 128,
"type": "git",
"url": "https://gitlab.homotopic.tech/horizon/horizon-gen-nix"
},
"original": {
"type": "git",
"url": "https://gitlab.homotopic.tech/horizon/horizon-gen-nix"
}
},
"horizon-gen-nix_2": {
"flake": false,
"locked": {
"lastModified": 1668479525,
"narHash": "sha256-9mG9K6vcT3cCnAMz1IPKAWQnESMQO730ImoUEqOcTsU=",
"ref": "refs/heads/master",
"rev": "db65485cc0cb0c462b84c21dff3786507de6821c",
"revCount": 50,
"type": "git",
"url": "https://gitlab.homotopic.tech/horizon/horizon-gen-nix"
},
"original": {
"type": "git",
"url": "https://gitlab.homotopic.tech/horizon/horizon-gen-nix"
}
},
"horizon-platform": { "horizon-platform": {
"inputs": {
"flake-utils": "flake-utils_3",
"get-flake": "get-flake_3",
"horizon-gen-nix": "horizon-gen-nix_2",
"lint-utils": "lint-utils",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1668510809,
"narHash": "sha256-e02lJAYXLPdGhJF8yexoiAE6ncUfOSgDxL7bb3a8ci4=",
"ref": "refs/heads/master",
"rev": "51ffeae6e4cb64c4c0b5c2af322990d3d4089ca2",
"revCount": 741,
"type": "git",
"url": "https://gitlab.homotopic.tech/horizon/horizon-platform"
},
"original": {
"type": "git",
"url": "https://gitlab.homotopic.tech/horizon/horizon-platform"
}
},
"horizon-platform_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1672428555, "lastModified": 1672428555,
...@@ -62,9 +228,50 @@ ...@@ -62,9 +228,50 @@
}, },
"lint-utils": { "lint-utils": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": {
"lastModified": 1655192403,
"narHash": "sha256-XyKDvRGDh8VXA6zN8DUTnDaTMrk0MxMKg70MaAX1A2Y=",
"ref": "refs/heads/master",
"rev": "a7ae54afdc4c05a5aabf202d5a76d02705eb6147",
"revCount": 28,
"type": "git",
"url": "https://gitlab.homotopic.tech/nix/lint-utils"
},
"original": {
"type": "git",
"url": "https://gitlab.homotopic.tech/nix/lint-utils"
}
},
"lint-utils_2": {
"inputs": {
"flake-utils": "flake-utils_5",
"nixpkgs": [
"horizon-gen-nix-flake",
"nixpkgs"
]
},
"locked": {
"lastModified": 1670623736,
"narHash": "sha256-CrA/yua5H0NfZ2tu1QZ2WpYi6pkWzyFxiwGk+KoF620=",
"ref": "refs/heads/master",
"rev": "ee76287dc9987dd01ec38d38839b788a26ee5f24",
"revCount": 45,
"type": "git",
"url": "https://gitlab.homotopic.tech/nix/lint-utils"
},
"original": {
"type": "git",
"url": "https://gitlab.homotopic.tech/nix/lint-utils"
}
},
"lint-utils_3": {
"inputs": {
"flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_4"
},
"locked": { "locked": {
"lastModified": 1670623736, "lastModified": 1670623736,
"narHash": "sha256-CrA/yua5H0NfZ2tu1QZ2WpYi6pkWzyFxiwGk+KoF620=", "narHash": "sha256-CrA/yua5H0NfZ2tu1QZ2WpYi6pkWzyFxiwGk+KoF620=",
...@@ -96,6 +303,54 @@ ...@@ -96,6 +303,54 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1665830552,
"narHash": "sha256-qel2bZ9TqfW8WzWCWdjuCy4bVFhhGsEeqFv/bj1ka2s=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "26b7e6ab6a864c3e7e077bcb27a49f0480b9894a",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1667055375,
"narHash": "sha256-xfSTHYxuKRiqF4dcuAFdti1OUvrC2lHpQqCHWUK5/JA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7f9be6a505a31f88499c5d20d11f98accf5ae6ba",
"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": { "locked": {
"lastModified": 1673947312, "lastModified": 1673947312,
"narHash": "sha256-xx/2nRwRy3bXrtry6TtydKpJpqHahjuDB5sFkQ/XNDE=", "narHash": "sha256-xx/2nRwRy3bXrtry6TtydKpJpqHahjuDB5sFkQ/XNDE=",
...@@ -115,9 +370,10 @@ ...@@ -115,9 +370,10 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"get-flake": "get-flake", "get-flake": "get-flake",
"horizon-platform": "horizon-platform", "horizon-gen-nix-flake": "horizon-gen-nix-flake",
"lint-utils": "lint-utils", "horizon-platform": "horizon-platform_2",
"nixpkgs": "nixpkgs_2" "lint-utils": "lint-utils_3",
"nixpkgs": "nixpkgs_5"
} }
} }
}, },
......
flake.nix
+ 3
− 1
View file @ 0a713a73
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
}; };
lint-utils.url = "git+https://gitlab.homotopic.tech/nix/lint-utils"; lint-utils.url = "git+https://gitlab.homotopic.tech/nix/lint-utils";
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
horizon-gen-nix-flake.url = "git+https://gitlab.homotopic.tech/horizon/horizon-gen-nix";
}; };
outputs = outputs =
...@@ -15,6 +16,7 @@ ...@@ -15,6 +16,7 @@
, get-flake , get-flake
, flake-utils , flake-utils
, horizon-platform , horizon-platform
, horizon-gen-nix-flake
, lint-utils , lint-utils
, nixpkgs , nixpkgs
, ... , ...
...@@ -36,7 +38,7 @@ ...@@ -36,7 +38,7 @@
runtimeInputs = with pkgs; [ ghc cabal-install ]; runtimeInputs = with pkgs; [ ghc cabal-install ];
text = '' text = ''
cabal update cabal update
${horizon-platform-prev.legacyPackages.${system}.horizon-gen-nix}/bin/horizon-gen-nix; ${horizon-gen-nix-flake.legacyPackages.${system}.horizon-gen-nix}/bin/horizon-gen-nix;
${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt pkgs/* ${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt pkgs/*
${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt initial-packages.nix ${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt initial-packages.nix
''; '';
......
horizon.dhall
+ 1
− 1
View file @ 0a713a73
...@@ -437,7 +437,7 @@ let packages = ...@@ -437,7 +437,7 @@ let packages =
, ghc-byteorder = H.callHackage "ghc-byteorder" "4.11.0.0.10" , ghc-byteorder = H.callHackage "ghc-byteorder" "4.11.0.0.10"
, ghc-check = H.callHackage "ghc-check" "0.5.0.8" , ghc-check = H.callHackage "ghc-check" "0.5.0.8"
, ghc-exactprint = H.callHackage "ghc-exactprint" "1.6.1.1" , ghc-exactprint = H.callHackage "ghc-exactprint" "1.6.1.1"
, ghc-lib-parser = H.callHackage "ghc-lib-parser" "9.4.4.20220822" , ghc-lib-parser = H.callHackage "ghc-lib-parser" "9.4.4.20221225"
, ghc-lib-parser-ex = H.callHackage "ghc-lib-parser-ex" "9.4.0.0" , ghc-lib-parser-ex = H.callHackage "ghc-lib-parser-ex" "9.4.0.0"
, ghc-paths = H.callHackage "ghc-paths" "0.1.0.12" , ghc-paths = H.callHackage "ghc-paths" "0.1.0.12"
, ghc-tcplugins-extra = H.callHackage "ghc-tcplugins-extra" "0.4.3" , ghc-tcplugins-extra = H.callHackage "ghc-tcplugins-extra" "0.4.3"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment