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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c15c29ee31eb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9627ef0283e9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 23, 2020

  1. flake.nix: use lib.extend 

    This preserves the nixosSystem function if another flake uses lib.extend
itself.
    @B4dM4n
    B4dM4n committed Jul 23, 2020
    Copy the full SHA
    74430a8 View commit details

Commits on Jul 24, 2020

  1. Merge pull request #93707 from B4dM4n/flake-nix-lib-extend 

    flake.nix: use lib.extend
    @Ma27
    Ma27 authored Jul 24, 2020
    Copy the full SHA
    9627ef0 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 flake.nix
8 changes: 4 additions & 4 deletions flake.nix
View file
Original file line number Diff line number Diff line change
@@ -18,17 +18,17 @@

in
{
lib = lib // {
lib = lib.extend (final: prev: {
nixosSystem = { modules, ... } @ args:
import ./nixos/lib/eval-config.nix (args // {
modules = modules ++
[ { system.nixos.versionSuffix =
".${lib.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}";
system.nixos.revision = lib.mkIf (self ? rev) self.rev;
".${final.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}";
system.nixos.revision = final.mkIf (self ? rev) self.rev;
}
];
});
};
});

checks.x86_64-linux.tarball = jobs.tarball;