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

Commits on Mar 5, 2019

  1. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    cd1dc8a View commit details
  2. Copy the full SHA
    9d9c599 View commit details
  3. Copy the full SHA
    98f69ed View commit details
  4. Copy the full SHA
    ddac10a View commit details
  5. 9
    Copy the full SHA
    8225474 View commit details
  6. Copy the full SHA
    1c6a193 View commit details
1 change: 0 additions & 1 deletion pkgs/applications/misc/xpdf/default.nix
Original file line number Diff line number Diff line change
@@ -59,6 +59,5 @@ stdenv.mkDerivation {
'';
license = with licenses; [ gpl2 gpl3 ];
platforms = platforms.unix;
maintainers = [ maintainers.peti ];
};
}
20 changes: 14 additions & 6 deletions pkgs/applications/science/math/maxima/default.nix
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

let
name = "maxima";
version = "5.41.0";
version = "5.42.2";

searchPath =
stdenv.lib.makeBinPath
@@ -16,11 +16,12 @@ stdenv.mkDerivation ({

src = fetchurl {
url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
sha256 = "0x0n81z0s4pl8nwpf7ivlsbvsdphm9w42250g7qdkizl0132by6s";
sha256 = "0kdncy6137sg3rradirxzj10mkcvafxd892zlclwhr9sa7b12zhn";
};

buildInputs = stdenv.lib.filter (x: x != null) [
sbcl ecl texinfo perl python makeWrapper
gnuplot # required in the test suite
];

postInstall = ''
@@ -75,10 +76,17 @@ stdenv.mkDerivation ({
./known-ecl-failures.patch
];

# Failures in the regression test suite won't abort the build process. We run
# the suite only so that potential errors show up in the build log. See also:
# https://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933.
doCheck = true;
# The test suite is disabled since 5.42.2 because of the following issues:
#
# Errors found in /build/maxima-5.42.2/share/linearalgebra/rtest_matrixexp.mac, problems:
# (20 21 22)
# Error found in rtest_arag, problem:
# (error break)
# 3 tests failed out of 3,881 total tests.
#
# These failures don't look serious. It would be nice to fix them, but I
# don't know how and probably won't have the time to find out.
doCheck = false; # try to re-enable after next version update

enableParallelBuilding = true;

4 changes: 2 additions & 2 deletions pkgs/applications/science/math/wxmaxima/default.nix
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

stdenv.mkDerivation rec {
name = "wxmaxima-${version}";
version = "18.02.0";
version = "19.03.0";

src = fetchFromGitHub {
owner = "andrejv";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Cross platform GUI for the computer algebra system Maxima";
license = licenses.gpl2;
homepage = http://wxmaxima.sourceforge.net;
homepage = https://wxmaxima-developers.github.io/wxmaxima/;
platforms = platforms.linux;
maintainers = [ maintainers.peti ];
};
2 changes: 1 addition & 1 deletion pkgs/development/compilers/swi-prolog/default.nix
Original file line number Diff line number Diff line change
@@ -47,6 +47,6 @@ stdenv.mkDerivation {
license = "LGPL";

platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.meditans ];
maintainers = [ stdenv.lib.maintainers.meditans ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/libraries/tbb/default.nix
Original file line number Diff line number Diff line change
@@ -41,6 +41,6 @@ with stdenv.lib; stdenv.mkDerivation rec {
details and threading mechanisms for scalability and performance.
'';
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ peti thoughtpolice dizfer ];
maintainers = with maintainers; [ thoughtpolice dizfer ];
};
}
4 changes: 2 additions & 2 deletions pkgs/servers/mail/spamassassin/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perlPackages, makeWrapper, gnupg1 }:

perlPackages.buildPerlPackage rec {
name = "SpamAssassin-3.4.1";
name = "SpamAssassin-3.4.2";

src = fetchurl {
url = "mirror://apache/spamassassin/source/Mail-${name}.tar.bz2";
sha256 = "0la6s5ilamf9129kyjckcma8cr6fpb6b5f2fb64v7106iy0ckhd0";
sha256 = "1np8h293bzg33i0xn9gj9krwgr7k6xbyf1yhxr2j2xci95d080yg";
};

# https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7434