Merge branch 'use-upstream-crane' into 'next'

switch crane input back to upstream

See merge request famedly/conduit!576
This commit is contained in:
Charles Hall 2024-01-28 21:54:38 +00:00
commit 10542a1d70
2 changed files with 7 additions and 10 deletions

View file

@ -51,16 +51,16 @@
]
},
"locked": {
"lastModified": 1706070683,
"narHash": "sha256-iQoXIFviH5QbSKDkWyFJKKUtTcSiCvl1tW18ax+pKfI=",
"owner": "CobaltCause",
"lastModified": 1706473964,
"narHash": "sha256-Fq6xleee/TsX6NbtoRuI96bBuDHMU57PrcK9z1QEKbk=",
"owner": "ipetkov",
"repo": "crane",
"rev": "8060686afabc5b042e8982200cb2cc3fd22cf416",
"rev": "c798790eabec3e3da48190ae3698ac227aab770c",
"type": "github"
},
"original": {
"owner": "CobaltCause",
"ref": "crimes-for-cross",
"owner": "ipetkov",
"ref": "master",
"repo": "crane",
"type": "github"
}

View file

@ -9,10 +9,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
crane = {
# TODO: Switch back to upstream after [this issue][0] is fixed
#
# [0]: https://github.com/ipetkov/crane/issues/497
url = "github:CobaltCause/crane?ref=crimes-for-cross";
url = "github:ipetkov/crane?ref=master";
inputs.nixpkgs.follows = "nixpkgs";
};
attic.url = "github:zhaofengli/attic?ref=main";