Skip to content

Commit

Permalink
Merge pull request #4 from DeterminateSystems/revert-3-flake-schemas-…
Browse files Browse the repository at this point in the history 
…v0.1.3

Revert "Update flake-schemas to 0.1.3"
  • Loading branch information
@grahamc
grahamc authored Jul 18, 2024
2 parents 8e5bab0 + eea9557 commit e4f6fce
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 75 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
nix eval --json \
--override-input flake https://flakehub.com/f/DeterminateSystems/flake-checker/=0.1.19 \
--no-write-lock-file '.#contents.excludingOutputPaths' \
| nix run nixpkgs#gron > corpus/DeterminateSystems/flake-checker/=0.1.19/excluding.output
| nix run nixpkgs\#gron > corpus/DeterminateSystems/flake-checker/=0.1.19/excluding.output
diff corpus/DeterminateSystems/flake-checker/=0.1.19/excluding.expect corpus/DeterminateSystems/flake-checker/=0.1.19/excluding.output
- name: Ensure evaluating DeterminateSystems/fh/=0.1.12 without output paths produces the right result
Expand All @@ -33,14 +33,14 @@ jobs:
nix eval --json \
--override-input flake https://flakehub.com/f/DeterminateSystems/fh/=0.1.12 \
--no-write-lock-file '.#contents.excludingOutputPaths' \
| nix run nixpkgs#gron > corpus/DeterminateSystems/fh/=0.1.12/excluding.output
| nix run nixpkgs\#gron > corpus/DeterminateSystems/fh/=0.1.12/excluding.output
diff corpus/DeterminateSystems/fh/=0.1.12/excluding.expect corpus/DeterminateSystems/fh/=0.1.12/excluding.output
- name: Ensure evaluating DeterminateSystems/fh/=0.1.12 with output paths produces the right result
if: success() || failure()
run: |
nix eval --json \
--override-input flake https://flakehub.com/f/DeterminateSystems/fh/=0.1.12 \
--no-write-lock-file '.#contents.includingOutputPaths' \
| nix run nixpkgs#gron > corpus/DeterminateSystems/fh/=0.1.12/including.output
--override-input flake https://flakehub.com/f/DeterminateSystems/fh/=0.1.12 \
--no-write-lock-file '.#contents.includingOutputPaths' \
| nix run nixpkgs\#gron > corpus/DeterminateSystems/fh/=0.1.12/including.output
diff corpus/DeterminateSystems/fh/=0.1.12/including.expect corpus/DeterminateSystems/fh/=0.1.12/including.output
48 changes: 24 additions & 24 deletions corpus/DeterminateSystems/fh/=0.1.12/including.expect
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,41 +9,41 @@ json.inventory.devShells.children = {};
json.inventory.devShells.children["aarch64-darwin"] = {};
json.inventory.devShells.children["aarch64-darwin"].children = {};
json.inventory.devShells.children["aarch64-darwin"].children["default"] = {};
json.inventory.devShells.children["aarch64-darwin"].children["default"].derivation = "/nix/store/libj83vph27kj72rxhg4fwdvpl59921y-dev.drv";
json.inventory.devShells.children["aarch64-darwin"].children["default"].derivation = "/nix/store/jm4yhcbad5wkbl33rjvxrz8nshdkpdrq-dev.drv";
json.inventory.devShells.children["aarch64-darwin"].children["default"].forSystems = [];
json.inventory.devShells.children["aarch64-darwin"].children["default"].forSystems[0] = "aarch64-darwin";
json.inventory.devShells.children["aarch64-darwin"].children["default"].outputs = {};
json.inventory.devShells.children["aarch64-darwin"].children["default"].outputs.out = "/nix/store/c4nz19kgvxw4qadym376ai4rgs9ap0qh-dev";
json.inventory.devShells.children["aarch64-darwin"].children["default"].outputs.out = "/nix/store/lx2bak7nxy1wclzk30iysfd15yln9mza-dev";
json.inventory.devShells.children["aarch64-darwin"].children["default"].shortDescription = "";
json.inventory.devShells.children["aarch64-darwin"].children["default"].what = "development environment";
json.inventory.devShells.children["aarch64-linux"] = {};
json.inventory.devShells.children["aarch64-linux"].children = {};
json.inventory.devShells.children["aarch64-linux"].children["default"] = {};
json.inventory.devShells.children["aarch64-linux"].children["default"].derivation = "/nix/store/lb11g5y8vzibyk250pbx5fxszhr2g0ka-dev.drv";
json.inventory.devShells.children["aarch64-linux"].children["default"].derivation = "/nix/store/k10c2zwzqg3c6f7iw05nfyh9xbg346fj-dev.drv";
json.inventory.devShells.children["aarch64-linux"].children["default"].forSystems = [];
json.inventory.devShells.children["aarch64-linux"].children["default"].forSystems[0] = "aarch64-linux";
json.inventory.devShells.children["aarch64-linux"].children["default"].outputs = {};
json.inventory.devShells.children["aarch64-linux"].children["default"].outputs.out = "/nix/store/2pcwl0czckh4w62qn7i3sqbhaajx1fs9-dev";
json.inventory.devShells.children["aarch64-linux"].children["default"].outputs.out = "/nix/store/fr6kpjjfp4z96l9w3b8a89i55qy320b9-dev";
json.inventory.devShells.children["aarch64-linux"].children["default"].shortDescription = "";
json.inventory.devShells.children["aarch64-linux"].children["default"].what = "development environment";
json.inventory.devShells.children["x86_64-darwin"] = {};
json.inventory.devShells.children["x86_64-darwin"].children = {};
json.inventory.devShells.children["x86_64-darwin"].children["default"] = {};
json.inventory.devShells.children["x86_64-darwin"].children["default"].derivation = "/nix/store/kry2hggh1c5rcw0k7iv20ipp51p2b2wp-dev.drv";
json.inventory.devShells.children["x86_64-darwin"].children["default"].derivation = "/nix/store/3g8q65gkdfxalbqvg6xnrqr1paaqkzya-dev.drv";
json.inventory.devShells.children["x86_64-darwin"].children["default"].forSystems = [];
json.inventory.devShells.children["x86_64-darwin"].children["default"].forSystems[0] = "x86_64-darwin";
json.inventory.devShells.children["x86_64-darwin"].children["default"].outputs = {};
json.inventory.devShells.children["x86_64-darwin"].children["default"].outputs.out = "/nix/store/y91zprfc82kky2r3nq4znx42spbjnx8q-dev";
json.inventory.devShells.children["x86_64-darwin"].children["default"].outputs.out = "/nix/store/1isd6idp3f0ynv3w60r7a0lfs6al4d2j-dev";
json.inventory.devShells.children["x86_64-darwin"].children["default"].shortDescription = "";
json.inventory.devShells.children["x86_64-darwin"].children["default"].what = "development environment";
json.inventory.devShells.children["x86_64-linux"] = {};
json.inventory.devShells.children["x86_64-linux"].children = {};
json.inventory.devShells.children["x86_64-linux"].children["default"] = {};
json.inventory.devShells.children["x86_64-linux"].children["default"].derivation = "/nix/store/bg4lifqvyx1zxvvlyr11j9mlv0sgwdwa-dev.drv";
json.inventory.devShells.children["x86_64-linux"].children["default"].derivation = "/nix/store/6k28sdhx3vwhfcn6vkxq5zjwmj07p2g4-dev.drv";
json.inventory.devShells.children["x86_64-linux"].children["default"].forSystems = [];
json.inventory.devShells.children["x86_64-linux"].children["default"].forSystems[0] = "x86_64-linux";
json.inventory.devShells.children["x86_64-linux"].children["default"].outputs = {};
json.inventory.devShells.children["x86_64-linux"].children["default"].outputs.out = "/nix/store/c6b94n3y0i44n6gd1769wn2il3rlywxx-dev";
json.inventory.devShells.children["x86_64-linux"].children["default"].outputs.out = "/nix/store/9qqgrvvwl1a4y22idkrxnrzr533qigd5-dev";
json.inventory.devShells.children["x86_64-linux"].children["default"].shortDescription = "";
json.inventory.devShells.children["x86_64-linux"].children["default"].what = "development environment";
json.inventory.overlays = {};
Expand All @@ -59,73 +59,73 @@ json.inventory.packages.children = {};
json.inventory.packages.children["aarch64-darwin"] = {};
json.inventory.packages.children["aarch64-darwin"].children = {};
json.inventory.packages.children["aarch64-darwin"].children.fh = {};
json.inventory.packages.children["aarch64-darwin"].children.fh.derivation = "/nix/store/zdxikbicz533k4k8h2672rv3wirikm9p-fh-20240616-5b7e079-0.1.12.drv";
json.inventory.packages.children["aarch64-darwin"].children.fh.derivation = "/nix/store/ab38ngzsf9xkhbfwj052fysdn69xzh3k-fh-20240616-5b7e079-0.1.12.drv";
json.inventory.packages.children["aarch64-darwin"].children.fh.forSystems = [];
json.inventory.packages.children["aarch64-darwin"].children.fh.forSystems[0] = "aarch64-darwin";
json.inventory.packages.children["aarch64-darwin"].children.fh.outputs = {};
json.inventory.packages.children["aarch64-darwin"].children.fh.outputs.out = "/nix/store/zi6p051lr93yh4xjksb204893srndii9-fh-20240616-5b7e079-0.1.12";
json.inventory.packages.children["aarch64-darwin"].children.fh.outputs.out = "/nix/store/wpx4jd2h6sm4wq8gbcn1hppfkfp6alxp-fh-20240616-5b7e079-0.1.12";
json.inventory.packages.children["aarch64-darwin"].children.fh.shortDescription = "";
json.inventory.packages.children["aarch64-darwin"].children.fh.what = "package";
json.inventory.packages.children["aarch64-darwin"].children["default"] = {};
json.inventory.packages.children["aarch64-darwin"].children["default"].derivation = "/nix/store/zdxikbicz533k4k8h2672rv3wirikm9p-fh-20240616-5b7e079-0.1.12.drv";
json.inventory.packages.children["aarch64-darwin"].children["default"].derivation = "/nix/store/ab38ngzsf9xkhbfwj052fysdn69xzh3k-fh-20240616-5b7e079-0.1.12.drv";
json.inventory.packages.children["aarch64-darwin"].children["default"].forSystems = [];
json.inventory.packages.children["aarch64-darwin"].children["default"].forSystems[0] = "aarch64-darwin";
json.inventory.packages.children["aarch64-darwin"].children["default"].outputs = {};
json.inventory.packages.children["aarch64-darwin"].children["default"].outputs.out = "/nix/store/zi6p051lr93yh4xjksb204893srndii9-fh-20240616-5b7e079-0.1.12";
json.inventory.packages.children["aarch64-darwin"].children["default"].outputs.out = "/nix/store/wpx4jd2h6sm4wq8gbcn1hppfkfp6alxp-fh-20240616-5b7e079-0.1.12";
json.inventory.packages.children["aarch64-darwin"].children["default"].shortDescription = "";
json.inventory.packages.children["aarch64-darwin"].children["default"].what = "package";
json.inventory.packages.children["aarch64-linux"] = {};
json.inventory.packages.children["aarch64-linux"].children = {};
json.inventory.packages.children["aarch64-linux"].children.fh = {};
json.inventory.packages.children["aarch64-linux"].children.fh.derivation = "/nix/store/41kypvhj3ld0ndzbqrb5vkxhv6f05sfj-fh-20240616-5b7e079-0.1.12.drv";
json.inventory.packages.children["aarch64-linux"].children.fh.derivation = "/nix/store/v2v0k0lqap0gbg41nd09f2xsy9wgis44-fh-20240616-5b7e079-0.1.12.drv";
json.inventory.packages.children["aarch64-linux"].children.fh.forSystems = [];
json.inventory.packages.children["aarch64-linux"].children.fh.forSystems[0] = "aarch64-linux";
json.inventory.packages.children["aarch64-linux"].children.fh.outputs = {};
json.inventory.packages.children["aarch64-linux"].children.fh.outputs.out = "/nix/store/awzb6w8ipzy3g3hw226h09fmi8d8msdb-fh-20240616-5b7e079-0.1.12";
json.inventory.packages.children["aarch64-linux"].children.fh.outputs.out = "/nix/store/505xdcyl2p94f2zqh6zss9k5hpdp0iqg-fh-20240616-5b7e079-0.1.12";
json.inventory.packages.children["aarch64-linux"].children.fh.shortDescription = "";
json.inventory.packages.children["aarch64-linux"].children.fh.what = "package";
json.inventory.packages.children["aarch64-linux"].children["default"] = {};
json.inventory.packages.children["aarch64-linux"].children["default"].derivation = "/nix/store/41kypvhj3ld0ndzbqrb5vkxhv6f05sfj-fh-20240616-5b7e079-0.1.12.drv";
json.inventory.packages.children["aarch64-linux"].children["default"].derivation = "/nix/store/v2v0k0lqap0gbg41nd09f2xsy9wgis44-fh-20240616-5b7e079-0.1.12.drv";
json.inventory.packages.children["aarch64-linux"].children["default"].forSystems = [];
json.inventory.packages.children["aarch64-linux"].children["default"].forSystems[0] = "aarch64-linux";
json.inventory.packages.children["aarch64-linux"].children["default"].outputs = {};
json.inventory.packages.children["aarch64-linux"].children["default"].outputs.out = "/nix/store/awzb6w8ipzy3g3hw226h09fmi8d8msdb-fh-20240616-5b7e079-0.1.12";
json.inventory.packages.children["aarch64-linux"].children["default"].outputs.out = "/nix/store/505xdcyl2p94f2zqh6zss9k5hpdp0iqg-fh-20240616-5b7e079-0.1.12";
json.inventory.packages.children["aarch64-linux"].children["default"].shortDescription = "";
json.inventory.packages.children["aarch64-linux"].children["default"].what = "package";
json.inventory.packages.children["x86_64-darwin"] = {};
json.inventory.packages.children["x86_64-darwin"].children = {};
json.inventory.packages.children["x86_64-darwin"].children.fh = {};
json.inventory.packages.children["x86_64-darwin"].children.fh.derivation = "/nix/store/96anghc9cva8y8khsasn7g9hyj01x0w4-fh-20240616-5b7e079-0.1.12.drv";
json.inventory.packages.children["x86_64-darwin"].children.fh.derivation = "/nix/store/337lapvy7ap54fdl4myc5v33f1yym13v-fh-20240616-5b7e079-0.1.12.drv";
json.inventory.packages.children["x86_64-darwin"].children.fh.forSystems = [];
json.inventory.packages.children["x86_64-darwin"].children.fh.forSystems[0] = "x86_64-darwin";
json.inventory.packages.children["x86_64-darwin"].children.fh.outputs = {};
json.inventory.packages.children["x86_64-darwin"].children.fh.outputs.out = "/nix/store/a4rs7h2pqqx862gnwnrl7xxfhzld7fcy-fh-20240616-5b7e079-0.1.12";
json.inventory.packages.children["x86_64-darwin"].children.fh.outputs.out = "/nix/store/1c7d5ahs8yh5hj9mlcll157l64y2if67-fh-20240616-5b7e079-0.1.12";
json.inventory.packages.children["x86_64-darwin"].children.fh.shortDescription = "";
json.inventory.packages.children["x86_64-darwin"].children.fh.what = "package";
json.inventory.packages.children["x86_64-darwin"].children["default"] = {};
json.inventory.packages.children["x86_64-darwin"].children["default"].derivation = "/nix/store/96anghc9cva8y8khsasn7g9hyj01x0w4-fh-20240616-5b7e079-0.1.12.drv";
json.inventory.packages.children["x86_64-darwin"].children["default"].derivation = "/nix/store/337lapvy7ap54fdl4myc5v33f1yym13v-fh-20240616-5b7e079-0.1.12.drv";
json.inventory.packages.children["x86_64-darwin"].children["default"].forSystems = [];
json.inventory.packages.children["x86_64-darwin"].children["default"].forSystems[0] = "x86_64-darwin";
json.inventory.packages.children["x86_64-darwin"].children["default"].outputs = {};
json.inventory.packages.children["x86_64-darwin"].children["default"].outputs.out = "/nix/store/a4rs7h2pqqx862gnwnrl7xxfhzld7fcy-fh-20240616-5b7e079-0.1.12";
json.inventory.packages.children["x86_64-darwin"].children["default"].outputs.out = "/nix/store/1c7d5ahs8yh5hj9mlcll157l64y2if67-fh-20240616-5b7e079-0.1.12";
json.inventory.packages.children["x86_64-darwin"].children["default"].shortDescription = "";
json.inventory.packages.children["x86_64-darwin"].children["default"].what = "package";
json.inventory.packages.children["x86_64-linux"] = {};
json.inventory.packages.children["x86_64-linux"].children = {};
json.inventory.packages.children["x86_64-linux"].children.fh = {};
json.inventory.packages.children["x86_64-linux"].children.fh.derivation = "/nix/store/il3hbbwmhjmra3nfq8wh1kgsvf0dh9pp-fh-20240616-5b7e079-0.1.12.drv";
json.inventory.packages.children["x86_64-linux"].children.fh.derivation = "/nix/store/asd6wf6zq2sl1xl0gw2vq8s6394lspqg-fh-20240616-5b7e079-0.1.12.drv";
json.inventory.packages.children["x86_64-linux"].children.fh.forSystems = [];
json.inventory.packages.children["x86_64-linux"].children.fh.forSystems[0] = "x86_64-linux";
json.inventory.packages.children["x86_64-linux"].children.fh.outputs = {};
json.inventory.packages.children["x86_64-linux"].children.fh.outputs.out = "/nix/store/1fkkfx698zn65z70r8j00z5r99nbp05c-fh-20240616-5b7e079-0.1.12";
json.inventory.packages.children["x86_64-linux"].children.fh.outputs.out = "/nix/store/s1xj006crvv6hm5kwq0hcyr2q2h21bdy-fh-20240616-5b7e079-0.1.12";
json.inventory.packages.children["x86_64-linux"].children.fh.shortDescription = "";
json.inventory.packages.children["x86_64-linux"].children.fh.what = "package";
json.inventory.packages.children["x86_64-linux"].children["default"] = {};
json.inventory.packages.children["x86_64-linux"].children["default"].derivation = "/nix/store/il3hbbwmhjmra3nfq8wh1kgsvf0dh9pp-fh-20240616-5b7e079-0.1.12.drv";
json.inventory.packages.children["x86_64-linux"].children["default"].derivation = "/nix/store/asd6wf6zq2sl1xl0gw2vq8s6394lspqg-fh-20240616-5b7e079-0.1.12.drv";
json.inventory.packages.children["x86_64-linux"].children["default"].forSystems = [];
json.inventory.packages.children["x86_64-linux"].children["default"].forSystems[0] = "x86_64-linux";
json.inventory.packages.children["x86_64-linux"].children["default"].outputs = {};
json.inventory.packages.children["x86_64-linux"].children["default"].outputs.out = "/nix/store/1fkkfx698zn65z70r8j00z5r99nbp05c-fh-20240616-5b7e079-0.1.12";
json.inventory.packages.children["x86_64-linux"].children["default"].outputs.out = "/nix/store/s1xj006crvv6hm5kwq0hcyr2q2h21bdy-fh-20240616-5b7e079-0.1.12";
json.inventory.packages.children["x86_64-linux"].children["default"].shortDescription = "";
json.inventory.packages.children["x86_64-linux"].children["default"].what = "package";
json.version = 1;
40 changes: 0 additions & 40 deletions flake.lock
View file

This file was deleted.

12 changes: 6 additions & 6 deletions flake.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
{
# This input is overridden by flake-iter and other upstream tools
inputs.flake.url = "https://flakehub.com/f/DeterminateSystems/flake-schemas/*";
# This input provides the default schemas
inputs.flake-schemas.url = "https://flakehub.com/f/DeterminateSystems/flake-schemas/*";

outputs = inputs:
let
getFlakeOutputs = flake: includeOutputPaths:
let

# Helper functions.

mapAttrsToList = f: attrs: map (name: f name attrs.${name}) (builtins.attrNames attrs);

try = e: default:
Expand All @@ -17,12 +15,14 @@

mkChildren = children: { inherit children; };

lock = builtins.fromJSON (builtins.readFile ./flake.lock);
in

rec {

allSchemas = (flake.outputs.schemas or defaultSchemas) // schemaOverrides;

defaultSchemas = inputs.flake-schemas.outputs.schemas;
# FIXME: make this configurable
defaultSchemas = (builtins.getFlake "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.3/0190b841-54d3-7b7a-8550-24942bc38caf/source.tar.gz?narHash=sha256-c2AZH9cOnSpPXV8Lwy19%2FI8EgW7G%2BE%2BZh6YQBZZwzxI%3D").schemas;

# Ignore legacyPackages for now, since it's very big and throws uncatchable errors.
schemaOverrides.legacyPackages = {
Expand Down

0 comments on commit e4f6fce

Please sign in to comment.