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: 386e8324d313
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: 7177defdf1ea
Choose a head ref
  • 5 commits
  • 4 files changed
  • 3 contributors

Commits on Apr 4, 2018

  1. gsl: Disable tests on aarch64 

    https://hydra.nixos.org/build/70700906

I opened an upstream bug, but their bug system is e-mail based and I
haven't got a single reply which contains an web link :(

(cherry picked from commit af16d71)
    @dezgeg
    dezgeg committed Apr 4, 2018
    Copy the full SHA
    4b07fbd View commit details

  2. gcc45: Not supported on aarch64 

    https://hydra.nixos.org/build/70699663

This package is already dropped on master, after the 18.03 cut-off.
    @dezgeg
    dezgeg committed Apr 4, 2018
    Copy the full SHA
    046f49d View commit details

  3. mailutils: disable parallel building 

    to avoid sporadic build failures

(cherry picked from commit b913e36)
    @xeji @dezgeg
    xeji authored and dezgeg committed Apr 4, 2018
    Copy the full SHA
    cb1b28f View commit details

  4. nixos/tests/openldap: Fix name 

    (cherry picked from commit bbc8022)
    @dezgeg
    dezgeg committed Apr 4, 2018
    Copy the full SHA
    b0ca63c View commit details

  5. openldap: Fix test 

    (cherry picked from commit 5fbf9db)
    @NeQuissimus @dezgeg
    NeQuissimus authored and dezgeg committed Apr 4, 2018
    Copy the full SHA
    7177def View commit details
4 changes: 2 additions & 2 deletions nixos/tests/openldap.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ./make-test.nix {
name = "dovecot";
name = "openldap";

machine = { pkgs, ... }: {
services.openldap = {
@@ -28,8 +28,8 @@ import ./make-test.nix {
};

testScript = ''
$machine->succeed('systemctl status openldap.service');
$machine->waitForUnit('openldap.service');
$machine->succeed('systemctl status openldap.service');
$machine->succeed('ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"');
'';
}
2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/4.5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -467,7 +467,7 @@ stdenv.mkDerivation ({
license = stdenv.lib.licenses.gpl2Plus;
description = "Complete VHDL simulator, using the GCC technology (gcc ${version})";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
platforms = ["i686-linux" "x86_64-linux"];
};

})
3 changes: 2 additions & 1 deletion pkgs/development/libraries/gsl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
];

doCheck = stdenv.system != "i686-linux"; # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html
# https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html
doCheck = stdenv.system != "i686-linux" && stdenv.system != "aarch64-linux";

meta = {
description = "The GNU Scientific Library, a large numerical library";
2 changes: 1 addition & 1 deletion pkgs/tools/networking/mailutils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
];

doCheck = true;
enableParallelBuilding = true;
enableParallelBuilding = false;
hardeningDisable = [ "format" ];

configureFlags = [