Merge master into staging-next

.github/CODEOWNERS

@@ -82,13 +82,13 @@
 /pkgs/development/interpreters/python/conda                 @DavHau
 
 # Haskell
-/doc/languages-frameworks/haskell.section.md  @cdepillabout @sternenseemann @maralorn
+/doc/languages-frameworks/haskell.section.md  @cdepillabout @sternenseemann @maralorn @expipiplus1
-/maintainers/scripts/haskell                  @cdepillabout @sternenseemann @maralorn
+/maintainers/scripts/haskell                  @cdepillabout @sternenseemann @maralorn @expipiplus1
-/pkgs/development/compilers/ghc               @cdepillabout @sternenseemann @maralorn
+/pkgs/development/compilers/ghc               @cdepillabout @sternenseemann @maralorn @expipiplus1
-/pkgs/development/haskell-modules             @cdepillabout @sternenseemann @maralorn
+/pkgs/development/haskell-modules             @cdepillabout @sternenseemann @maralorn @expipiplus1
-/pkgs/test/haskell                            @cdepillabout @sternenseemann @maralorn
+/pkgs/test/haskell                            @cdepillabout @sternenseemann @maralorn @expipiplus1
-/pkgs/top-level/release-haskell.nix           @cdepillabout @sternenseemann @maralorn
+/pkgs/top-level/release-haskell.nix           @cdepillabout @sternenseemann @maralorn @expipiplus1
-/pkgs/top-level/haskell-packages.nix          @cdepillabout @sternenseemann @maralorn
+/pkgs/top-level/haskell-packages.nix          @cdepillabout @sternenseemann @maralorn @expipiplus1
 
 # Perl
 /pkgs/development/interpreters/perl @volth @stigtsp

nixos/tests/overlayfs.nix

@@ -15,36 +15,33 @@ import ./make-test-python.nix ({ pkgs, ... }: {
 
     # Test ext4 + overlayfs
     machine.succeed(
-        """
+      'mkfs.ext4 -F -L overlay-ext4 /dev/vdb',
-          mkfs.ext4 -F -L overlay-ext4 /dev/vdb
+      'mount -t ext4 /dev/vdb /tmp/mnt',
-          mount -t ext4 /dev/vdb /tmp/mnt
+      'mkdir -p /tmp/mnt/upper /tmp/mnt/lower /tmp/mnt/work /tmp/mnt/merged',
-          mkdir -p /tmp/mnt/upper /tmp/mnt/lower /tmp/mnt/work /tmp/mnt/merged
+      # Setup some existing files
-          # Setup some existing files
+      'echo Replace > /tmp/mnt/lower/replace.txt',
-          echo 'Replace' > /tmp/mnt/lower/replace.txt
+      'echo Append > /tmp/mnt/lower/append.txt',
-          echo 'Append' > /tmp/mnt/lower/append.txt
+      'echo Overwrite > /tmp/mnt/lower/overwrite.txt',
-          echo 'Overwrite' > /tmp/mnt/lower/overwrite.txt
+      'mount -t overlay overlay -o lowerdir=/tmp/mnt/lower,upperdir=/tmp/mnt/upper,workdir=/tmp/mnt/work /tmp/mnt/merged',
-          mount -t overlay overlay -o lowerdir=/tmp/mnt/lower,upperdir=/tmp/mnt/upper,workdir=/tmp/mnt/work /tmp/mnt/merged
+      # Test new
-          # Test new
+      'echo New > /tmp/mnt/merged/new.txt',
-          echo 'New' > /tmp/mnt/merged/new.txt
+      '[[ "$(cat /tmp/mnt/merged/new.txt)" == New ]]',
-          [[ "\$(cat /tmp/mnt/merged/new.txt)" == "New" ]]
+      # Test replace
-          # Test replace
+      '[[ "$(cat /tmp/mnt/merged/replace.txt)" == Replace ]]',
-          [[ "\$(cat /tmp/mnt/merged/replace.txt)" == "Replace" ]]
+      'echo Replaced > /tmp/mnt/merged/replace-tmp.txt',
-          echo 'Replaced' > /tmp/mnt/merged/replace-tmp.txt
+      'mv /tmp/mnt/merged/replace-tmp.txt /tmp/mnt/merged/replace.txt',
-          mv /tmp/mnt/merged/replace-tmp.txt /tmp/mnt/merged/replace.txt
+      '[[ "$(cat /tmp/mnt/merged/replace.txt)" == Replaced ]]',
-          [[ "\$(cat /tmp/mnt/merged/replace.txt)" == "Replaced" ]]
+      # Overwrite
-          # Overwrite
+      '[[ "$(cat /tmp/mnt/merged/overwrite.txt)" == Overwrite ]]',
-          [[ "\$(cat /tmp/mnt/merged/overwrite.txt)" == "Overwrite" ]]
+      'echo Overwritten > /tmp/mnt/merged/overwrite.txt',
-          echo 'Overwritten' > /tmp/mnt/merged/overwrite.txt
+      '[[ "$(cat /tmp/mnt/merged/overwrite.txt)" == Overwritten ]]',
-          [[ "\$(cat /tmp/mnt/merged/overwrite.txt)" == "Overwritten" ]]
+      # Test append
-          # Test append
+      '[[ "$(cat /tmp/mnt/merged/append.txt)" == Append ]]',
-          [[ "\$(cat /tmp/mnt/merged/append.txt)" == "Append" ]]
+      'echo ed >> /tmp/mnt/merged/append.txt',
-          echo 'ed' >> /tmp/mnt/merged/append.txt
+      '[[ "$(cat /tmp/mnt/merged/append.txt)" == "Append\ned" ]]',
-          #"cat /tmp/mnt/merged/append.txt && exit 1
+      'umount /tmp/mnt/merged',
-          [[ "\$(cat /tmp/mnt/merged/append.txt)" == "Append\ned" ]]
+      'umount /tmp/mnt',
-          umount /tmp/mnt/merged
+      'udevadm settle',
-          umount /tmp/mnt
-          udevadm settle
-      """
     )
   '';
 })

pkgs/applications/audio/bchoppr/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bchoppr";
-  version = "1.10.6";
+  version = "1.10.8";
 
   src = fetchFromGitHub {
     owner = "sjaehn";
     repo = pname;
     rev = version;
-    sha256 = "sha256-iCDAIV2p1OkZxOMo8A6zBrOGd49FXAGqLZWk0Kbvgec=";
+    sha256 = "sha256-F2J9TBONluhBuoEnpff3tLZEHFDbmllILqbZvu+PGGI=";
   };
 
   nativeBuildInputs = [ pkg-config ];

pkgs/applications/blockchains/ergo/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ergo";
-  version = "4.0.11";
+  version = "4.0.12";
 
   src = fetchurl {
     url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
-    sha256 = "sha256-GzpYwytkWZBEIVmsOmK5RTJ7lPUfDeC1204FbK4O+XQ=";
+    sha256 = "sha256-cIMaCouzuI7UQ6UY4caGcTzA+Xp7vLdoOwIfGG+ahsU=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/applications/graphics/avocode/default.nix

@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "avocode";
-  version = "4.14.0";
+  version = "4.14.1";
 
   src = fetchurl {
     url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
-    sha256 = "sha256-BDW87UVN1Jub0sJFvtkZr5ssz835Yf2CNn5kHCn70cE=";
+    sha256 = "sha256-OXSxfNCwbZ1RjjoxDlsREtKtbzlQcuPylvD1/ehfgsI=";
   };
 
   libPath = lib.makeLibraryPath (with xorg; [

pkgs/applications/misc/free42/default.nix

@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "free42";
-  version = "3.0.3";
+  version = "3.0.4";
 
   src = fetchFromGitHub {
     owner = "thomasokken";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-2TOYvZBI2EW9xjbjA4Bh+TgjbyEXRzOByalLYBW8Ba8=";
+    sha256 = "sha256-ZoW5gBAUp/5U8Is3Nhx+SHY4d0F3PGOS1/WOokKRnCU=";
   };
 
   nativeBuildInputs = [ copyDesktopItems pkg-config ];

pkgs/applications/version-management/git-and-tools/lefthook/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "lefthook";
-  version = "0.7.5";
+  version = "0.7.6";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "evilmartians";
     repo = "lefthook";
-    sha256 = "sha256-IKrutZJhs2iuwhXoV+81rDoaSi/xdYRpIlF1YjGFGY4=";
+    sha256 = "sha256-qCj6FsbzxnMISCITKFcIIYtqMiHzSNYNjlpgpE9S/Ss=";
   };
 
   vendorSha256 = "sha256-Rp67FnFU27u85t02MIs7wZQoOa8oGsHVVPQ9OdIyTJg=";

pkgs/development/python-modules/georss-ign-sismologia-client/default.nix

@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "georss-ign-sismologia-client";
-  version = "0.2";
+  version = "0.3";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-georss-ign-sismologia-client";
     rev = "v${version}";
-    sha256 = "1xylgvbdrpl3wxa6qqc8jma4c9520rld0pv28y3b6b0m07ab6ijl";
+    sha256 = "sha256-7Jj6uWb4HyPAh3/XtVTy0N23bk33mlIiqlt9z/PW+4Y=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/hg-evolve/default.nix

@@ -1,19 +1,54 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, isPy3k
+, mercurial
 }:
 
 buildPythonPackage rec {
   pname = "hg-evolve";
-  version = "10.3.1";
+  version = "10.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "03xwnadpvgna70n6pfxb7xdrszppdqrx5qmkbr1v0jzbh5rnzi6b";
+    sha256 = "ba819732409d39ddd4ff2fc507dc921408bf30535d2d78313637b29eeac98860";
   };
 
-  doCheck = false;
+  checkInputs = [
+    mercurial
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    export TESTTMP=$(mktemp -d)
+    export HOME=$TESTTMP
+    cat <<EOF >$HOME/.hgrc
+    [extensions]
+    evolve =
+    topic =
+    EOF
+
+    # Shipped tests use the mercurial testing framework, and produce inconsistent results.
+    # Do a quick smoke-test to see if things do what we expect.
+    hg init $TESTTMP/repo
+    pushd $TESTTMP/repo
+    touch a
+    hg add a
+    hg commit -m "init a"
+    hg topic something
+
+    touch b
+    hg add b
+    hg commit -m "init b"
+
+    echo hi > b
+    hg amend
+
+    hg obslog
+    popd
+
+    runHook postCheck
+  '';
 
   meta = with lib; {
     description = "Enables the “changeset evolution” feature of Mercurial core";

pkgs/development/tools/analysis/checkstyle/default.nix

@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  version = "8.42";
+  version = "8.43";
   pname = "checkstyle";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "sha256-SYLr6qQp/kHzviwzCaXEnYTHHuH3j5ZzRLi8gs8xAao=";
+    sha256 = "sha256-jb864Kr5Hx/e2OIRYPLJGkRIsxT/cebLnOGGy1YtJY8=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/tools/system/bfs/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bfs";
-  version = "2.2";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     repo = "bfs";
     owner = "tavianator";
     rev = version;
-    sha256 = "sha256-YxQBKXjYITVy8c6DJ3GwDR0ESgzghqJCcj1GEv8Lp2Q=";
+    sha256 = "sha256-3E1EXtI8QvHRDoVSV21K1/Rknp3E+GV1n5iorrv5jNY=";
   };
 
   buildInputs = lib.optionals stdenv.isLinux [ libcap acl ];