Befator-Inc-Firmen-Netzwerk/nix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,824 Commits 207 Branches 226 Tags
d9e23bfee2f1995b3047d67e578e2cfd4e94dea6
Commit Graph

8824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eelco Dolstra
8cb3bbd504 Fix handling of bare flakerefs containing a colon 2019-05-31 22:17:39 +02:00
Eelco Dolstra
8abb8647a3 Automatically determine subdir for path flakes 
This means that in a flake in a subdirectory of a Git repo, you can
now do

  $ nix build

rather than the inconvenient

  $ nix build ../..?dir=foo/bar
 2019-05-31 21:52:02 +02:00
Eelco Dolstra
ccb1bad612 Allow bare flakerefs as installables 
So now

  $ nix build blender-bin

works and builds the default package from that flake. You don't need
to add a colon at the end anymore.
 2019-05-31 21:42:23 +02:00
Eelco Dolstra
7adb10d29b Fix reading the lockfile of a flake in a subdirectory 2019-05-31 20:12:59 +02:00
Eelco Dolstra
9169046e64 Add operator << for LockFile 
Useful for debugging.
 2019-05-31 20:10:56 +02:00
Eelco Dolstra
b971e406de Support 'dir' and other parameters in path flakerefs 2019-05-31 19:01:11 +02:00
Eelco Dolstra
63c5c91cc0 Show hash mismatch warnings in SRI format 2019-05-31 18:48:28 +02:00
Eelco Dolstra
134942f56a Merge pull request #2904 from NixOS/flake-terminology 
Rename requires -> inputs, provides -> outputs
 2019-05-31 10:00:51 +02:00
Eelco Dolstra
094539ef4a Rename requires -> inputs, provides -> outputs 
Issue #2828.
 2019-05-31 09:59:48 +02:00
Eelco Dolstra
65e88694c2 Merge pull request #2903 from NixOS/check-flake 
Add "nix flake check"
 2019-05-31 09:57:04 +02:00
Eelco Dolstra
2b62928905 Merge pull request #2905 from ln-nl/patch-1 
release-common: fix build with `config.allowAliases = false`
 2019-05-31 09:56:47 +02:00
ln-nl
3b1cc8b0cb release-common: fix build with config.allowAliases = false 
```sh
> nix build -f release.nix build.x86_64-linux
error: undefined variable 'docbook5_xsl' at /vcs/nix/release-common.nix:45:7
```
 2019-05-30 18:08:33 +03:00
Eelco Dolstra
d8abee9bc6 Merge pull request #2892 from johannes-climacus/master 
Replace `type` with `command -v` in install script
 2019-05-30 14:15:23 +02:00
Eelco Dolstra
49436bdbb7 nix flake info --json: List the "provides" 
It also lists the contents of "checks" and "packages".

For example:

  $ nix flake info --json | jq
  {
    "branch": "HEAD",
    "description": "The purely functional package manager",
    "epoch": 2019,
    "id": "nix",
    "lastModified": 1559161142,
    "path": "/nix/store/2w2qla8735dbxah8gai8r1nsbf5x4f5d-source",
    "provides": {
      "checks": {
        "binaryTarball": {},
        "nix-copy-closure": {},
        "perlBindings": {},
        "remoteBuilds": {},
        "setuid": {}
      },
      "defaultPackage": {},
      "devShell": {},
      "hydraJobs": {},
      "packages": {
        "nix": {},
        "nix-perl-bindings": {}
      }
    },
    "revCount": 6955,
    "revision": "8cb24e04e8b6cc60e2504733afe78e0eadafcd98",
    "uri": "/home/eelco/Dev/nix"
  }

Fixes #2820.
 2019-05-29 22:22:28 +02:00
Eelco Dolstra
3488fa7c6c Hack: Use legacyPackages from Nixpkgs 
Nixpkgs doesn't provide a clean "packages" set yet, so until that's
the case, look for packages in "legacyPackages" as well.
 2019-05-29 22:22:28 +02:00
Eelco Dolstra
b70fc8f30c flake.nix: Add more checks 2019-05-29 22:22:28 +02:00
Eelco Dolstra
a9d3524e1f nix flake check: Use read-only mode if we're not building 2019-05-29 21:00:44 +02:00
Eelco Dolstra
0e32b32fa3 nix flake check: Check defaultPackage, devShell and packages 2019-05-29 20:57:08 +02:00
Eelco Dolstra
e0aaf05f4f Add 'nix flake check' command 
This evaluates all the 'provides' of a flake and builds the 'check'
attributes.
 2019-05-29 17:25:41 +02:00
Eelco Dolstra
de00ed15d3 Doh 2019-05-29 16:30:00 +02:00
Johannes Climacus
a8251ba2ed Replace type with command -v in install script 
In POSIX sh, `type` is undefined.

cf. https://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html#tag_20_22_04
 2019-05-29 10:08:21 -04:00
Eelco Dolstra
6ae4437acb Remove makeFlakeValue() 2019-05-29 15:44:48 +02:00
Eelco Dolstra
6e4a8c47f4 Put flake-related stuff in its own namespace 2019-05-29 15:31:07 +02:00
Eelco Dolstra
c356d034f3 Make unsupported flake attributes a fatal error 2019-05-29 15:12:22 +02:00
Eelco Dolstra
6636808e90 Merge remote-tracking branch 'origin/master' into flakes 2019-05-29 12:36:44 +02:00
Eelco Dolstra
17ef3e6f41 Enable more fromTOML tests 
cpptoml now parses almost all examples from the spec.
 2019-05-29 12:22:52 +02:00
Eelco Dolstra
cfd74aef1e Fix eval-okay-fromTOML test 
Turns out we were mis-parsing single-quoted attributes, e.g. 'key2'.
 2019-05-29 12:12:02 +02:00
Ding Xiang Fei
abdedcdb38 bump cpptoml to v0.1.1 2019-05-29 17:01:39 +08:00
Eelco Dolstra
315f1980ca Merge pull request #2898 from NixOS/last-modified 
Expose lastModified attribute
 2019-05-29 10:14:40 +02:00
Eelco Dolstra
ae7b56cd9a Get last commit time of github flakes 2019-05-29 10:10:40 +02:00
Eelco Dolstra
0f840483c7 Add date of last commit to SourceInfo 
This is primarily useful for version string generation, where we need
a monotonically increasing number. The revcount is the preferred thing
to use, but isn't available for GitHub flakes (since it requires
fetching the entire history). The last commit timestamp OTOH can be
extracted from GitHub tarballs.
 2019-05-29 10:10:36 +02:00
Eelco Dolstra
479757dc15 Merge pull request #2897 from NixOS/source-info 
Store SourceInfo in Flake/NonFlake
 2019-05-29 10:08:45 +02:00
Eelco Dolstra
22f2744afd Iterate over references 2019-05-28 23:05:08 +02:00
Eelco Dolstra
9eaebbf575 Merge branch 'attrPaths' of https://github.com/NinjaTrappeur/nix 2019-05-28 22:59:05 +02:00
Eelco Dolstra
444786e6d3 nix flake info: Add missing newline 2019-05-28 14:11:19 +02:00
Eelco Dolstra
46294d60cd printFlakeInfo: Separate JSON output 2019-05-28 14:01:57 +02:00
Eelco Dolstra
ecee759b80 callFlake(): Emit source info attributes for non-flake dependencies 2019-05-28 14:01:08 +02:00
Eelco Dolstra
e7e7a03baf nix flake deps: Remove --json flag for now 
It doesn't produce valid JSON at the moment (but a concatenation of
JSON objects). Anyway we probably should merge this command info 'nix
flake info'.
 2019-05-28 13:22:11 +02:00
Eelco Dolstra
fdf06ce72f printFlakeInfo/printNonFlakeInfo: Factor out commonality 2019-05-28 13:21:06 +02:00
Eelco Dolstra
25e497bf9c nix flake info/deps: Stop progress bar before printing output 2019-05-28 13:14:27 +02:00
Eelco Dolstra
dda4f7167b Remove redundant resolvedRef fields since they're already in SourceInfo 2019-05-28 13:12:43 +02:00
Eelco Dolstra
4846304541 Rename contentHash -> narHash for consistency 2019-05-28 13:08:40 +02:00
Eelco Dolstra
894e007445 Move hash into SourceInfo and rename to narHash to avoid ambiguity 2019-05-28 13:07:15 +02:00
Eelco Dolstra
6d7efcfaeb Store SourceInfo in Flake and NonFlake 
This deduplicates some shared fields. Factoring out the commonality is
useful in places like makeFlakeValue().
 2019-05-28 13:06:43 +02:00
Eelco Dolstra
de36cf3db9 Merge branch 'nonFlakeRequiresTest' of https://github.com/CSVdB/nix into flakes 2019-05-28 12:05:11 +02:00
Nick Van den Broeck
4d030a8d96 Added nonFlakeRequires test 
Fixes #2888
 2019-05-28 10:51:45 +02:00
Eelco Dolstra
2950014535 Merge pull request #2895 from CSVdB/fixRelativePaths 
Fixed relative path parsing
 2019-05-28 10:24:43 +02:00
Nick Van den Broeck
6fb7545fa1 Fixed relative path parsing 
Fixed #2821
 2019-05-28 10:17:28 +02:00
Eelco Dolstra
638c56caed Remove outdated fetchGit test 
It's no longer an error if we can't update our clone.
 2019-05-26 15:59:50 +02:00
Eelco Dolstra
981f686259 Merge pull request #2890 from NixOS/offline-flakes 
Offline flakes
 2019-05-25 10:25:39 +02:00