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: dbb85d5a0fb4
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: 57cf4eb83bc7
Choose a head ref
  • 6 commits
  • 4 files changed
  • 4 contributors

Commits on Nov 24, 2019

  1. root: fix setupHook to work with "set -u"

    @veprbl
    veprbl committed Nov 24, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bd0c4dd View commit details

Commits on Nov 25, 2019

  1. applgrid: fix build

    @veprbl
    veprbl committed Nov 25, 2019
    Copy the full SHA
    89074b4 View commit details

Commits on Nov 26, 2019

  1. irony-server: Fix build with 1.4.0 cmake files 

    The irony-server binary package tracks the irony-server elisp package, which was
upgraded to 1.4.0. This is now failing on Hydra because upstream has refactored
the CMake build, and now require CMake files from LLVM.
    Ben Hipple committed Nov 26, 2019
    Copy the full SHA
    33e0ffe View commit details

  2. Merge pull request #74223 from bhpdt/fix/irony-server 

    irony-server: Fix failing build with 1.4.0 cmake files
    @matthewbauer
    matthewbauer authored Nov 26, 2019
    Copy the full SHA
    a6ea6e2 View commit details

  3. Merge pull request #74092 from veprbl/pr/applgrid_fix 

    applgrid: fix build
    @matthewbauer
    matthewbauer authored Nov 26, 2019
    Copy the full SHA
    e010c1b View commit details

  4. python3Packages.xmlschema: 1.0.15 -> 1.0.16

    Jonathan Ringer committed Nov 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    57cf4eb View commit details
6 changes: 5 additions & 1 deletion pkgs/applications/science/misc/root/setup-hook.sh
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
thisroot () {
# Workaround thisroot.sh dependency on man
if [ -z "${MANPATH}" ]; then
if [ -z "${MANPATH-}" ]; then
MANPATH=:
fi
local oldOpts="-u"
shopt -qo nounset || oldOpts="+u"
set +u
source @out@/bin/thisroot.sh
set "$oldOpts"
}

postHooks+=(thisroot)
5 changes: 3 additions & 2 deletions pkgs/development/libraries/physics/applgrid/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5 }:
{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }:

stdenv.mkDerivation rec {
pname = "applgrid";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p";
};

buildInputs = [ gfortran hoppet lhapdf root5 ];
# For some reason zlib was only needed after bump to gfortran8
buildInputs = [ gfortran hoppet lhapdf root5 zlib ];

patches = [
./bad_code.patch
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/xmlschema/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,14 +4,14 @@
}:

buildPythonPackage rec {
version = "1.0.15";
version = "1.0.16";
pname = "xmlschema";

src = fetchFromGitHub {
owner = "sissaschool";
repo = "xmlschema";
rev = "v${version}";
sha256 = "1s8ggvy2s7513cxcal3r37rn1bhpkxhq3hs5m9pgvmrysxjdz8lb";
sha256 = "0mxvpafkaxib3qiz3zl7fbsgjaq9hbx4kb0w646azwhg7n7nxghj";
};

propagatedBuildInputs = [ elementpath ];
14 changes: 6 additions & 8 deletions pkgs/development/tools/irony-server/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,10 +2,10 @@

stdenv.mkDerivation {
pname = "irony-server";
inherit (irony) version;
inherit (irony) src version;

nativeBuildInputs = [ cmake ];
buildInputs = [ llvmPackages.libclang ];
buildInputs = [ llvmPackages.libclang llvmPackages.llvm ];

dontUseCmakeBuildDir = true;

@@ -15,13 +15,11 @@ stdenv.mkDerivation {
"-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}"
];

src = irony.src;

meta = {
meta = with stdenv.lib; {
description = "The server part of irony.";
homepage = "https://melpa.org/#/irony";
maintainers = [ stdenv.lib.maintainers.deepfire ];
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.free;
maintainers = [ maintainers.deepfire ];
platforms = platforms.unix;
license = licenses.free;
};
}