Unverified Commit f060a376 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 413994ab c19576bb

.github/CODEOWNERS

+7 −7
Original line number Diff line number Diff line
@@ -82,13 +82,13 @@ 
/pkgs/development/interpreters/python/conda                 @DavHau



# Haskell

/doc/languages-frameworks/haskell.section.md  @cdepillabout @sternenseemann @maralorn

/maintainers/scripts/haskell                  @cdepillabout @sternenseemann @maralorn

/pkgs/development/compilers/ghc               @cdepillabout @sternenseemann @maralorn

/pkgs/development/haskell-modules             @cdepillabout @sternenseemann @maralorn

/pkgs/test/haskell                            @cdepillabout @sternenseemann @maralorn

/pkgs/top-level/release-haskell.nix           @cdepillabout @sternenseemann @maralorn

/pkgs/top-level/haskell-packages.nix          @cdepillabout @sternenseemann @maralorn

/doc/languages-frameworks/haskell.section.md  @cdepillabout @sternenseemann @maralorn @expipiplus1

/maintainers/scripts/haskell                  @cdepillabout @sternenseemann @maralorn @expipiplus1

/pkgs/development/compilers/ghc               @cdepillabout @sternenseemann @maralorn @expipiplus1

/pkgs/development/haskell-modules             @cdepillabout @sternenseemann @maralorn @expipiplus1

/pkgs/test/haskell                            @cdepillabout @sternenseemann @maralorn @expipiplus1

/pkgs/top-level/release-haskell.nix           @cdepillabout @sternenseemann @maralorn @expipiplus1

/pkgs/top-level/haskell-packages.nix          @cdepillabout @sternenseemann @maralorn @expipiplus1



# Perl

/pkgs/development/interpreters/perl @volth @stigtsp

nixos/tests/overlayfs.nix

+27 −30
Original line number Diff line number Diff line
@@ -15,36 +15,33 @@ import ./make-test-python.nix ({ pkgs, ... }: { 


    # Test ext4 + overlayfs

    machine.succeed(

        """

          mkfs.ext4 -F -L overlay-ext4 /dev/vdb

          mount -t ext4 /dev/vdb /tmp/mnt

          mkdir -p /tmp/mnt/upper /tmp/mnt/lower /tmp/mnt/work /tmp/mnt/merged

      'mkfs.ext4 -F -L overlay-ext4 /dev/vdb',

      'mount -t ext4 /dev/vdb /tmp/mnt',

      'mkdir -p /tmp/mnt/upper /tmp/mnt/lower /tmp/mnt/work /tmp/mnt/merged',

      # Setup some existing files

          echo 'Replace' > /tmp/mnt/lower/replace.txt

          echo 'Append' > /tmp/mnt/lower/append.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

      'echo Replace > /tmp/mnt/lower/replace.txt',

      'echo Append > /tmp/mnt/lower/append.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',

      # Test new

          echo 'New' > /tmp/mnt/merged/new.txt

          [[ "\$(cat /tmp/mnt/merged/new.txt)" == "New" ]]

      'echo New > /tmp/mnt/merged/new.txt',

      '[[ "$(cat /tmp/mnt/merged/new.txt)" == New ]]',

      # Test replace

          [[ "\$(cat /tmp/mnt/merged/replace.txt)" == "Replace" ]]

          echo 'Replaced' > /tmp/mnt/merged/replace-tmp.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)" == Replace ]]',

      'echo Replaced > /tmp/mnt/merged/replace-tmp.txt',

      'mv /tmp/mnt/merged/replace-tmp.txt /tmp/mnt/merged/replace.txt',

      '[[ "$(cat /tmp/mnt/merged/replace.txt)" == Replaced ]]',

      # Overwrite

          [[ "\$(cat /tmp/mnt/merged/overwrite.txt)" == "Overwrite" ]]

          echo 'Overwritten' > /tmp/mnt/merged/overwrite.txt

          [[ "\$(cat /tmp/mnt/merged/overwrite.txt)" == "Overwritten" ]]

      '[[ "$(cat /tmp/mnt/merged/overwrite.txt)" == Overwrite ]]',

      'echo Overwritten > /tmp/mnt/merged/overwrite.txt',

      '[[ "$(cat /tmp/mnt/merged/overwrite.txt)" == Overwritten ]]',

      # Test append

          [[ "\$(cat /tmp/mnt/merged/append.txt)" == "Append" ]]

          echo 'ed' >> /tmp/mnt/merged/append.txt

          #"cat /tmp/mnt/merged/append.txt && exit 1

          [[ "\$(cat /tmp/mnt/merged/append.txt)" == "Append\ned" ]]

          umount /tmp/mnt/merged

          umount /tmp/mnt

          udevadm settle

      """

      '[[ "$(cat /tmp/mnt/merged/append.txt)" == Append ]]',

      'echo ed >> /tmp/mnt/merged/append.txt',

      '[[ "$(cat /tmp/mnt/merged/append.txt)" == "Append\ned" ]]',

      'umount /tmp/mnt/merged',

      'umount /tmp/mnt',

      'udevadm settle',

    )

  '';

})

pkgs/applications/audio/bchoppr/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 −2
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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; [