Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 732e3d05deb9
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bccc513396e6
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 26, 2018

  1. dockerTools.tarsum: Fix upstream import 

    (cherry picked from commit 4874ce1)
Backport of #37877
    @srhb
    srhb committed Mar 26, 2018
    Copy the full SHA
    d610810 View commit details

  2. Merge pull request #37879 from srhb/backport-#37877 

    Backport: dockerTools.tarsum: Fix upstream import
    @srhb
    srhb authored Mar 26, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5d817cf View commit details

  3. haskellPackages.lenz: Remove outdated patch. 

    (cherry picked from commit 2b3ba40)
    @shlevy
    shlevy committed Mar 26, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    shlevy Shea Levy
    GPG key ID: 5C0BD6957D86FE27
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bccc513 View commit details
Showing with 3 additions and 14 deletions.
  1. +2 −2 pkgs/build-support/docker/default.nix
  2. +1 −1 pkgs/build-support/docker/tarsum.go
  3. +0 −11 pkgs/development/haskell-modules/configuration-common.nix
4 changes: 2 additions & 2 deletions pkgs/build-support/docker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -44,8 +44,8 @@ rec {
cp ${./tarsum.go} tarsum.go
export GOPATH=$(pwd)
mkdir src
ln -sT ${docker.src}/components/engine/pkg/tarsum src/tarsum
mkdir -p src/github.com/docker/docker/pkg
ln -sT ${docker.src}/components/engine/pkg/tarsum src/github.com/docker/docker/pkg/tarsum
go build
cp tarsum $out
2 changes: 1 addition & 1 deletion pkgs/build-support/docker/tarsum.go
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import (
"io"
"io/ioutil"
"os"
"tarsum"
"github.com/docker/docker/pkg/tarsum"
)

func main() {
11 changes: 0 additions & 11 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -916,17 +916,6 @@ self: super: {
# https://github.com/bos/text-icu/issues/32
text-icu = dontCheck super.text-icu;

# https://github.com/strake/lenz.hs/issues/2
lenz =
let patch = pkgs.fetchpatch
{ url = https://github.com/strake/lenz.hs/commit/4b9b79104759b9c6b24484455e1eb0d962eb3cff.patch;
sha256 = "02i0w9i55a4r251wgjzl5vbk6m2qhilwl7bfp5jwmf22z66sglyn";
};
in overrideCabal super.lenz (drv:
{ patches = (drv.patches or []) ++ [ patch ];
editedCabalFile = null;
});

# https://github.com/haskell/cabal/issues/4969
haddock-library_1_4_4 = dontHaddock super.haddock-library_1_4_4;
haddock-api = super.haddock-api.override { haddock-library = self.haddock-library_1_4_4; };