Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ad1d58c6227a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 151f52bf96a8
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Aug 31, 2019

  1. Fixup merge by removing incorrect emacsXXPackages

    @FRidh
    FRidh committed Aug 31, 2019
    Copy the full SHA
    06af54c View commit details

  2. e2fsprogs: disable failing tests (#65471) 

    Disable several tests that often fail on Hydra but not locally.
    @FRidh
    FRidh committed Aug 31, 2019
    Copy the full SHA
    151f52b View commit details
Showing with 8 additions and 3 deletions.
  1. +8 −0 pkgs/tools/filesystems/e2fsprogs/default.nix
  2. +0 −3 pkgs/top-level/all-packages.nix
8 changes: 8 additions & 0 deletions pkgs/tools/filesystems/e2fsprogs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -26,6 +26,14 @@ stdenv.mkDerivation rec {
})
];

postPatch = ''
# Remove six failing tests
# https://github.com/NixOS/nixpkgs/issues/65471
for test in m_image_mmp m_mmp m_mmp_bad_csum m_mmp_bad_magic t_mmp_1on t_mmp_2off; do
rm -r "tests/$test"
done
'';

configureFlags =
if stdenv.isLinux then [
"--enable-elf-shlibs"
3 changes: 0 additions & 3 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -17970,9 +17970,6 @@ in
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
};

emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25 pkgs.emacs25Packages);
emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26 pkgs.emacs26Packages);

emacsPackagesFor = emacs: import ./emacs-packages.nix {
inherit lib newScope stdenv pkgs;
inherit fetchFromGitHub fetchurl;