build(deps): bump http-cache-semantics from 4.1.0 to 4.1.1 in /pkgs/tools/admin/meshcentral

pkgs/applications/editors/emacs/generic.nix

@@ -87,6 +87,8 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation
     })
   ];
 
+  appName = "Emacs";            # used by Darwin systems in emacs/wrapper.nix
+
   src = if macportVersion != null then fetchFromBitbucket {
     owner = "mituharu";
     repo = "emacs-mac";

pkgs/build-support/emacs/wrapper.nix

@@ -51,6 +51,8 @@ let
     if lib.isFunction packagesFun
       then packagesFun self
     else packagesFun;
+
+  appName = emacs.appName or "Emacs";
 in
 
 runCommand
@@ -204,20 +206,20 @@ runCommand
     # Wrap MacOS app
     # this has to pick up resources and metadata
     # to recognize it as an "app"
-    if [ -d "$emacs/Applications/Emacs.app" ]; then
-      mkdir -p $out/Applications/Emacs.app/Contents/MacOS
-      cp -r $emacs/Applications/Emacs.app/Contents/Info.plist \
-            $emacs/Applications/Emacs.app/Contents/PkgInfo \
-            $emacs/Applications/Emacs.app/Contents/Resources \
-            $out/Applications/Emacs.app/Contents
+    if [ -d "$emacs/Applications/${appName}.app" ]; then
+      mkdir -p $out/Applications/${appName}.app/Contents/MacOS
+      cp -r $emacs/Applications/${appName}.app/Contents/Info.plist \
+            $emacs/Applications/${appName}.app/Contents/PkgInfo \
+            $emacs/Applications/${appName}.app/Contents/Resources \
+            $out/Applications/${appName}.app/Contents
 
 
-      substitute ${./wrapper.sh} $out/Applications/Emacs.app/Contents/MacOS/Emacs \
+      substitute ${./wrapper.sh} $out/Applications/${appName}.app/Contents/MacOS/${appName} \
         --subst-var-by bash ${emacs.stdenv.shell} \
         --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
         --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp:" \
-        --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs"
-      chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs
+        --subst-var-by prog "$emacs/Applications/${appName}.app/Contents/MacOS/${appName}"
+      chmod +x $out/Applications/${appName}.app/Contents/MacOS/${appName}
     fi
 
     mkdir -p $out/share

pkgs/development/python2-modules/pyyaml/default.nix

@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, cython
+, libyaml
+, isPy27
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "PyYAML";
+  version = "5.4.1.1";
+
+  src = fetchFromGitHub {
+    owner = "yaml";
+    repo = "pyyaml";
+    rev = version;
+    sha256 = "1v386gzdvsjg0mgix6v03rd0cgs9dl81qvn3m547849jm8r41dx8";
+  };
+
+  nativeBuildInputs = [ cython ];
+
+  buildInputs = [ libyaml ];
+
+  checkPhase = ''
+    runHook preCheck
+    PYTHONPATH=""tests/lib":$PYTHONPATH" ${python.interpreter} -m test_all
+    runHook postCheck
+  '';
+
+  pythonImportsCheck = [ "yaml" ];
+
+  meta = with lib; {
+    description = "The next generation YAML parser and emitter for Python";
+    homepage = "https://github.com/yaml/pyyaml";
+    license = licenses.mit;
+  };
+}

pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix

@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz";
-    hash = "sha256-rjK9SHDqLBMorgm6IG6ewSEoBG1q/KUvu8nvf3VhfJg=";
+    hash = "sha256:163wc5spzvy9pcpsbz3adl22h8f1krp21fh9mql16b7af14bscmf";
   };
 
   buildInputs = [ dovecot openssl ];

pkgs/tools/admin/meshcentral/yarn.lock

@@ -5469,9 +5469,9 @@ htmlparser2@^6.1.0:
     entities "^2.0.0"
 
 http-cache-semantics@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
-  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
 
 http-errors@2.0.0:
   version "2.0.0"

pkgs/tools/backup/sanoid/default.nix

@@ -31,17 +31,17 @@ stdenv.mkDerivation rec {
     # incompatibilities with the ZFS kernel module.
     wrapProgram "$out/bin/sanoid" \
       --prefix PERL5LIB : "$PERL5LIB" \
-      --prefix PATH : "${lib.makeBinPath [ procps "/run/booted-system/sw" zfs ]}"
+      --prefix PATH : "${lib.makeBinPath [ procps ]}"
 
     install -m755 syncoid "$out/bin/syncoid"
     wrapProgram "$out/bin/syncoid" \
       --prefix PERL5LIB : "$PERL5LIB" \
-      --prefix PATH : "${lib.makeBinPath [ openssh procps which pv mbuffer lzop gzip pigz "/run/booted-system/sw" zfs ]}"
+      --prefix PATH : "${lib.makeBinPath [ openssh procps which pv lzop gzip pigz ]}"
 
     install -m755 findoid "$out/bin/findoid"
     wrapProgram "$out/bin/findoid" \
       --prefix PERL5LIB : "$PERL5LIB" \
-      --prefix PATH : "${lib.makeBinPath [ "/run/booted-system/sw" zfs ]}"
+      --prefix PATH : "${lib.makeBinPath [ ]}"
 
     runHook postInstall
   '';

pkgs/tools/system/tree/default.nix

@@ -5,7 +5,7 @@ let
   # way to select one ore the other setting other than editing the file
   # manually, so we have to duplicate the know how here.
   systemFlags = lib.optionalString stdenv.isDarwin ''
-    CFLAGS="-O2 -Wall -fomit-frame-pointer -no-cpp-precomp"
+    CFLAGS=-O2
     LDFLAGS=
   '' + lib.optionalString stdenv.isCygwin ''
     CFLAGS="-O2 -Wall -fomit-frame-pointer"

pkgs/top-level/dotnet-packages.nix

@@ -152,6 +152,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
     postFixup = ''
         ln -s "$out/bin/BoogieDriver" "$out/bin/boogie"
+        rm -f "$out/bin"/System.* "$out/bin"/Microsoft.*
+        rm -f "$out/bin"/NUnit3.*
+        rm -f "$out/bin"/*Tests
     '';
 
     meta = with lib; {
@@ -169,107 +172,23 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     };
   };
 
-  Boogie_2_4_1 = buildDotnetPackage rec {
-    pname = "Boogie";
-    version = "2.4.1";
-
-    src = fetchFromGitHub {
-      owner = "boogie-org";
-      repo = "boogie";
-      rev = "v${version}";
-      sha256 = "13f6ifkh6gpy4bvx5zhgwmk3wd5rfxzl9wxwfhcj1c90fdrhwh1b";
-    };
-
-    # emulate `nuget restore Source/Boogie.sln`
-    # which installs in $srcdir/Source/packages
-    preBuild = ''
-      mkdir -p Source/packages/NUnit.2.6.3
-      ln -sn ${dotnetPackages.NUnit}/lib/dotnet/NUnit Source/packages/NUnit.2.6.3/lib
-    '';
-
-    buildInputs = [
-      dotnetPackages.NUnit
-      dotnetPackages.NUnitRunners
-    ];
-
-    xBuildFiles = [ "Source/Boogie.sln" ];
-
-    outputFiles = [ "Binaries/*" ];
-
-    postInstall = ''
-        mkdir -pv "$out/lib/dotnet/${pname}"
-        ln -sv "${pkgs.z3}/bin/z3" "$out/lib/dotnet/${pname}/z3.exe"
-
-        # so that this derivation can be used as a vim plugin to install syntax highlighting
-        vimdir=$out/share/vim-plugins/boogie
-        install -Dt $vimdir/syntax/ Util/vim/syntax/boogie.vim
-        mkdir $vimdir/ftdetect
-        echo 'au BufRead,BufNewFile *.bpl set filetype=boogie' > $vimdir/ftdetect/bpl.vim
-    '';
-
-    meta = with lib; {
-      description = "An intermediate verification language";
-      homepage = "https://github.com/boogie-org/boogie";
-      longDescription = ''
-        Boogie is an intermediate verification language (IVL), intended as a
-        layer on which to build program verifiers for other languages.
-
-        This derivation may be used as a vim plugin to provide syntax highlighting.
-      '';
-      license = licenses.mspl;
-      maintainers = [ maintainers.taktoa ];
-      platforms = with platforms; (linux ++ darwin);
-    };
-  };
-
-  Dafny = let
-    z3 = pkgs.z3.overrideAttrs (oldAttrs: rec {
-      version = "4.8.4";
-      name = "z3-${version}";
-
-      src = fetchFromGitHub {
-        owner = "Z3Prover";
-        repo = "z3";
-        rev = "z3-${version}";
-        sha256 = "014igqm5vwswz0yhz0cdxsj3a6dh7i79hvhgc3jmmmz3z0xm1gyn";
-      };
-    });
-    self' = pkgs.dotnetPackages.override ({
-      pkgs = pkgs // { inherit z3; };
-    });
-    Boogie = assert self'.Boogie_2_4_1.version == "2.4.1"; self'.Boogie_2_4_1;
-  in buildDotnetPackage rec {
+  Dafny =  buildDotnetModule rec {
     pname = "Dafny";
-    version = "2.3.0";
+    version = "3.7.3";
 
     src = fetchurl {
       url = "https://github.com/Microsoft/dafny/archive/v${version}.tar.gz";
-      sha256 = "0s6ihx32kda7400lvdrq60l46c11nki8b6kalir2g4ic508f6ypa";
+      sha256 = "0w9g8smx54pvg1y5zs90awv9plgyz5nkrnqbzi9m6dymhybblvx5";
     };
 
-    postPatch = ''
-      sed -i \
-        -e 's/ Visible="False"//' \
-        -e "s/Exists(\$(CodeContractsInstallDir))/Exists('\$(CodeContractsInstallDir)')/" \
-        Source/*/*.csproj
-    '';
-
     preBuild = ''
-      ln -s ${z3} Binaries/z3
+      ln -s ${pkgs.z3} Binaries/z3
     '';
 
-    buildInputs = [ Boogie ];
-
-    xBuildFiles = [ "Source/Dafny.sln" ];
-    xBuildFlags = [ "/p:Configuration=Checked" "/p:Platform=Any CPU" "/t:Rebuild" ];
-
-    outputFiles = [ "Binaries/*" ];
+    buildInputs = [ Boogie pkgs.jdk11 ];
+    nugetDeps = ../development/dotnet-modules/dafny-deps.nix;
 
-    # Do not wrap the z3 executable, only dafny-related ones.
-    exeFiles = [ "Dafny*.exe" ];
-
-    # Dafny needs mono in its path.
-    makeWrapperArgs = "--set PATH ${mono}/bin";
+    projectFile = [ "Source/Dafny.sln" ];
 
     # Boogie as an input is not enough. Boogie libraries need to be at the same
     # place as Dafny ones. Same for "*.dll.mdb". No idea why or how to fix.
@@ -279,6 +198,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
       done
       # We generate our own executable scripts
       rm -f $out/lib/dotnet/${pname}/dafny{,-server}
+
+      mv "$out/bin/Dafny" "$out/bin/dafny"
+
+      rm -f "$out/bin"/System.* "$out/bin"/Microsoft.*
+      rm -f "$out/bin"/NUnit3.* "$out/bin"/coverlet.*
+      rm -f "$out/bin"/ThirdPartyNotices.txt
+      rm -f "$out/bin"/XUnitExtensions
     '';
 
     meta = with lib; {

pkgs/top-level/python2-packages.nix

@@ -63,6 +63,8 @@ with self; with super; {
 
   pytest-xdist = callPackage ../development/python2-modules/pytest-xdist { };
 
+  pyyaml = callPackage ../development/python2-modules/pyyaml { };
+
   recoll = disabled super.recoll;
 
   rivet = disabled super.rivet;