Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 7197c191c4a1
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0acab870da25
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 13, 2020

  1. flake.nix: allow inclusion of nixpkgs as path:/.../ 

    When adding `nixpkgs` as flake-input using the `path`-fetcher, you
currently get the following error since neither `lastModifiedDate` nor
`lastModified` are stored in `flake.lock` for paths:

```
error: --- EvalError --------------------------------------------------------------------------- nix-build
at: (48:71) in file: /nix/store/147clg8svaxyj7pl80ra9kmmm72mdg94-source/flake.nix

    47|                   system.nixos.versionSuffix =
    48|                     ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}";
      |                                                                       ^
    49|                   system.nixos.revision = final.mkIf (self ? rev) self.rev;

attribute 'lastModified' missing
```

This patch adds the fallback-value `19700101` to `versionSuffix` if none
of `lastModified{,Date}` are set in the lockfile.
    @Ma27
    Ma27 committed Oct 13, 2020
    Copy the full SHA
    3743c42 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #100363 from Ma27/flake-no-modification-rev 

    flake.nix: allow inclusion of `nixpkgs` as `path:/.../`
    @edolstra
    edolstra committed Oct 13, 2020
    Copy the full SHA
    0acab87 View commit details
    Browse the repository at this point in the history