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: 5532cc1641c0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8add42f90c54
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 20, 2018

  1. nix-serve: patch for nix 2.0 (#37459) 

    Fixes incompatible secret file handling. See edolstra/nix-serve#8
    @zimbatm
    zimbatm authored Mar 20, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    pquentin Quentin Pradet
    GPG key ID: E328ACB1EC7E57C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8add42f View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/tools/package-management/nix-serve/default.nix
6 changes: 3 additions & 3 deletions pkgs/tools/package-management/nix-serve/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub,
{ stdenv, fetchFromGitHub, fetchpatch,
bzip2, nix, perl, perlPackages,
}:

with stdenv.lib;

let
rev = "7e09caa2a7a435aeb2cd5446aa590d6f9ae1699d";
sha256 = "0mjzsiknln3isdri9004wwjjjpak5fj8ncizyncf5jv7g4m4q1pj";
rev = "e4675e38ab54942e351c7686e40fabec822120b9";
sha256 = "1wm24p6pkxl1d7hrvf4ph6mwzawvqi22c60z9xzndn5xfyr4v0yr";
in

stdenv.mkDerivation rec {