1
0
Fork 0
mirror of https://github.com/edolstra/flake-compat.git synced 2024-12-14 11:47:34 +00:00
Commit graph

68 commits

Author SHA1 Message Date
Robert Hensing
a220b6b7b9 Fix non-fetchTree pure-eval use of builtins.path
This is a rare combination, and it would have been more relevant
before https://github.com/edolstra/flake-compat/pull/67, but it is a
tested fix nonetheless.
(Specifically, for issues like https://github.com/hercules-ci/flake-parts/issues/252)

builtins.path had `sha256` since its introduction, so no problem
there.

This also catches accidental path-based impurities. Flakes are meant
to be pure. "path" inputs do ask for trouble, but that doesn't mean
we should violate purity.
Also note that `fetchTree` will happily use the `narHash` anyway, so
this change makes the behavior more consistent between configurations
with and without `fetchTree`.
2024-12-04 12:23:16 +01:00
Eelco Dolstra
9ed2ac151e
Merge pull request #69 from edolstra/add-outputs-attr
Return all outputs
2024-11-27 16:47:01 +01:00
Eelco Dolstra
a1b45cd4a2 Return all outputs
They were already exposed in `defaultNix` and `shellNix`, but
"polluted" by a `default` attribute and probably not very intuitive to
find.

Issue #15.
2024-11-27 16:44:58 +01:00
Eelco Dolstra
e3408d6ab2
Merge pull request #67 from edolstra/use-fetchTree
Use builtins.fetchTree if available
2024-11-27 16:36:52 +01:00
Eelco Dolstra
ab56b62e2e
Merge pull request #68 from edolstra/revCount
Expose revCount attribute for git inputs
2024-11-27 16:32:56 +01:00
Eelco Dolstra
3980b5e441 Expose revCount attribute for git inputs
Fixes #43.
2024-11-27 16:32:09 +01:00
Eelco Dolstra
4a4fe4634a
Merge pull request #61 from Gerg-L/master
README: fix node name look-up
2024-11-27 16:08:26 +01:00
Eelco Dolstra
0a2144bc43
Merge pull request #65 from 9999years/fix-64
Check for pure eval mode before calling `builtins.storePath`
2024-11-27 16:01:00 +01:00
Eelco Dolstra
520e73f623 Use builtins.fetchTree if available 2024-11-27 15:59:26 +01:00
Rebecca Turner
baa7aa7bd0
Check for pure eval mode before calling builtins.storePath 2024-03-08 16:32:20 -08:00
Gerg-L
b7cd594063
README: fix node name look-up 2023-10-23 21:09:04 -04:00
Eelco Dolstra
0f9255e01c Force root sources like "./." into the Nix store 2023-10-04 15:37:54 +02:00
Eelco Dolstra
5a16547d46 Prevent double copying and work around an apparent Nix bug
Fixes #60.
2023-10-04 12:49:46 +02:00
Eelco Dolstra
4f910c9827 Doh 2023-10-02 19:19:56 +02:00
Eelco Dolstra
7ae5ae625a Drop "flake = false" and suggest flakehub 2023-10-02 19:16:54 +02:00
Eelco Dolstra
e1262c7073
Merge pull request #59 from hercules-ci/port-nix-7796-flake-outPath
nix#7796: Ensure that `self.outPath == ./.`
2023-10-02 19:10:16 +02:00
Robert Hensing
bc5e257a8d nix#7796: Ensure that self.outPath == ./.
Ported from https://github.com/NixOS/nix/pull/7796
First released in Nix 2.14
2023-10-02 18:57:55 +02:00
Eelco Dolstra
2bf43d60c7 Change from rolling to tagged releases 2023-10-02 16:09:08 +02:00
Eelco Dolstra
6256b599c8 Add description 2023-10-02 14:48:41 +02:00
Eelco Dolstra
c30381e188 Add flake.nix 2023-10-02 14:43:40 +02:00
Eelco Dolstra
e654cc30bf
Merge pull request #56 from Alper-Celik/master
add support for sourcehut
2023-10-02 14:15:41 +02:00
Eelco Dolstra
5717e26155
Merge pull request #57 from lucperkins/flakehub-publish
Add FlakeHub publish Action
2023-10-02 14:15:23 +02:00
Luc Perkins
92556b8539
Add FlakeHub publish Action 2023-09-18 14:15:22 +03:00
Alper Çelik
bcb80df051
add support for sourcehut 2023-04-26 10:33:29 +03:00
Eelco Dolstra
35bb57c0c8
Merge pull request #50 from hercules-ci/nix-7207-_type-is-flake
Apply nix#7207 `_type = "flake";`
2023-01-17 12:47:33 +01:00
Robert Hensing
43bfa87aa2 Apply nix#7207 _type = "flake";
https://github.com/NixOS/nix/pull/7207 adds this attribute in order
to help identify flake outputs for the purpose of type checking.
2023-01-16 19:59:47 +01:00
Eelco Dolstra
009399224d
Merge pull request #47 from blaggacao/master
fix: top level functors break legacy nix commands
2022-11-17 11:41:32 +01:00
David Arnold
6f56392cc4
fix: top level functors break legacy nix commands
see: https://github.com/divnix/std/issues/186
2022-11-14 20:28:19 -05:00
Eelco Dolstra
b4a34015c6
Merge pull request #40 from SuperSandro2000/patch-1
Quote url literal
2022-04-19 15:22:48 +02:00
Sandro
246e885130
Quote url literal 2022-04-19 13:59:50 +02:00
Eelco Dolstra
64a525ee38
Merge pull request #37 from Artturin/addsupportfornewshcmea
add support for new style of defaults
2022-03-25 10:10:09 +01:00
Eelco Dolstra
913e1270ff
Merge pull request #36 from charlesbaynham/master
Support submodules fetches for git imports
2022-03-25 10:09:12 +01:00
Artturin
aee797a673 add support for new style of defaults 2022-03-25 04:47:29 +02:00
Charles Baynham
3b935d922d
Pass along submodules flag to fetchGit 2022-03-19 23:30:58 +00:00
Eelco Dolstra
b7547d3eed
Merge pull request #29 from piperswe/patch-1
Add a README.md containing copy & paste helpers
2022-01-03 11:29:42 +01:00
Piper McCorkle
b640d1826b
Add a README.md containing copy & paste helpers 2021-12-30 17:50:53 -05:00
Eelco Dolstra
12c64ca55c
Merge pull request #24 from hercules-ci/issue-16-mit-license
Revert "Revert unlicensed contribution"
2021-08-02 16:09:59 +02:00
Robert Hensing
4112a081ef Revert "Revert unlicensed contribution"
The last contributor has agreed after all. Maybe I acted one day
too soon? In that case, apologies for the drama.

This reverts commit 14dbada01f.
2021-08-02 13:43:28 +02:00
Eelco Dolstra
bef1b74164
Merge pull request #23 from hercules-ci/issue-16-mit-license
Add MIT license
2021-08-01 17:35:36 +02:00
Robert Hensing
14dbada01f Revert unlicensed contribution
Some explanation is in order:

I have tried to contact Zanculmarktum three times in the last
25 days, but I have not received any response.
Meanwhile, others are waiting to be able to use flake-compat, so
I have decided that it is best to move forward with the licensing
effort, considering that everyone else except Eelco has already
agreed, and quickly as well.

I have no hard feelings towards Zanculmarktum and I really do not
like having to make this commit.

This reverts commit e363cffac2 and
subsequent improvements.

I should note that it could be argued that their contribution was
not a creative work in the sense of most copyright law, but I'd
prefer to avoid any confusion by choosing to reimplement their
contribution in a "clean room" manner.
2021-08-01 14:12:05 +02:00
Robert Hensing
2cb6b2d577 Add MIT license 2021-08-01 14:10:57 +02:00
Eelco Dolstra
c6f3b63532
Merge pull request #12 from hercules-ci/pure
Make tarball fetchers pure
2021-07-29 13:15:37 +02:00
Eelco Dolstra
99f1c2157f Don't zero src's lastModified if it has one 2020-11-26 21:59:33 +01:00
Eelco Dolstra
8812d6d109 Don't pass rev/shortRev for dirty trees 2020-11-26 21:53:11 +01:00
Robert Hensing
a2fd0358b1 Make fetchers pure 2020-10-28 12:27:16 +01:00
Eelco Dolstra
19576c2aea
Merge pull request #11 from hercules-ci/git-worktree
Support git worktrees in fetchgit logic
2020-10-27 12:08:32 +01:00
Robert Hensing
5ad681b894 Simplify rootSrc fetchGit logic 2020-10-27 11:48:33 +01:00
Robert Hensing
64de97c480 Use fetchGit on git worktrees
Git worktrees have a file for .git and can be loaded with fetchGit.
2020-10-27 11:45:18 +01:00
Eelco Dolstra
94cf59784c
Merge pull request #9 from Ma27/minor-fixes
Be more consistent with Nix itself when fetching github/gitlab inputs
2020-09-23 11:30:54 +02:00
Maximilian Bosch
0d4ab83c96
Be more consistent with Nix itself when fetching github/gitlab inputs
* `url` got renamed to `host` in Nix[1], so we have to use this key here
  as well.
* It was suggested previously[2] to use the same URL to download from a
  GitLab-server as Nix does.

[1] 56f1e0df05
[2] 0e29814f1e (commitcomment-42619895)
2020-09-22 21:20:22 +02:00