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: ef9e8bd9335e
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: 18a7c1df643a
Choose a head ref
  • 3 commits
  • 3 files changed
  • 3 contributors

Commits on Sep 23, 2018

  1. pythonPackages.pyftgl: fix build (#47232) 

    See https://hydra.nixos.org/build/80705583

Recent `boost` versions with `python` enabled have changed their naming
scheme for `boost_python` shared objects which causes issues with the
proper linking when building `pyftgl`.

Previously the library was named `boost_python3`, no it's named
`boost_python36` for current python (3.6.x).

The same issue applies for the `python2`.

Addresses #45960

(cherry picked from commit 5ad7aed)
    @Ma27 @xeji
    Ma27 authored and xeji committed Sep 23, 2018
    Copy the full SHA
    c49fa22 View commit details

  2. haskellPackages.Euterpea: fix build by using PortMidi == 0.2 

    (cherry picked from commit 9b67908)
    @basvandijk
    basvandijk committed Sep 23, 2018

    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
    9b4d87c View commit details

  3. hdf4: fix build on aarch64-linux (#47209) 

    Pull in the Debian patches for AArch64 support, and a bonus patch for
reproducible builds while we're at it.

(cherry picked from commit 104014c)
    @andrew-d @xeji
    andrew-d authored and xeji committed Sep 23, 2018
    Copy the full SHA
    18a7c1d View commit details
Showing with 40 additions and 5 deletions.
  1. +10 −0 pkgs/development/haskell-modules/configuration-common.nix
  2. +13 −5 pkgs/development/python-modules/pyftgl/default.nix
  3. +17 −0 pkgs/tools/misc/hdf4/default.nix
10 changes: 10 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1146,4 +1146,14 @@ self: super: {
# Can be removed once vinyl >= 0.10 is in the LTS.
Frames = super.Frames.override { vinyl = super.vinyl_0_10_0; };

# https://github.com/Euterpea/Euterpea2/pull/22
Euterpea = overrideSrc super.Euterpea {
src = pkgs.fetchFromGitHub {
owner = "Euterpea";
repo = "Euterpea2";
rev = "6f49b790adfb8b65d95a758116c20098fb0cd34c";
sha256 = "0qz1svb96n42nmig16vyphwxas34hypgayvwc91ri7w7xd6yi1ba";
};
};

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
18 changes: 13 additions & 5 deletions pkgs/development/python-modules/pyftgl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k
, boost, freetype, ftgl, libGLU_combined }:
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
, boost, freetype, ftgl, libGLU_combined
, python
}:

let

pythonVersion = with lib.versions; "${major python.version}${minor python.version}";

in

buildPythonPackage rec {
pname = "pyftgl";
@@ -13,13 +21,13 @@ buildPythonPackage rec {
sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r";
};

postPatch = stdenv.lib.optional isPy3k ''
sed -i "s,'boost_python','boost_python3',g" setup.py
postPatch = ''
sed -i "s,'boost_python','boost_python${pythonVersion}',g" setup.py
'';

buildInputs = [ boost freetype ftgl libGLU_combined ];

meta = with stdenv.lib; {
meta = with lib; {
description = "Python bindings for FTGL (FreeType for OpenGL)";
license = licenses.gpl2Plus;
};
17 changes: 17 additions & 0 deletions pkgs/tools/misc/hdf4/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv
, fetchpatch
, fetchurl
, cmake
, libjpeg
@@ -14,6 +15,22 @@ stdenv.mkDerivation rec {
sha256 = "0n29klrrbwan9307np0d9hr128dlpc4nnlf57a140080ll3jmp8l";
};

patches = let
# The Debian patch revision to fetch from; this may differ from our package
# version, but older patches should still apply.
patchRev = "4.2.13-4";
getPatch = name: sha256: fetchpatch {
inherit sha256;
url = "https://salsa.debian.org/debian-gis-team/hdf4/raw/debian/${patchRev}/debian/patches/${name}";
};

in [
(getPatch "64bit" "1xqk9zpch4m6ipa0f3x2cm8rwaz4p0ppp1vqglvz18j6q91p8b5y")
(getPatch "hdfi.h" "01fr9csylnvk9jd9jn9y23bvxy192s07p32pr76mm3gwhgs9h7r4")
(getPatch "hdf-4.2.10-aarch64.patch" "1hl0xw5pd9xhpq49xpwgg7c4z6vv5p19x6qayixw0myvgwj1r4zn")
(getPatch "reproducible-builds.patch" "02j639w26xkxpxx3pdhbi18ywz8w3qmjpqjb83n47gq29y4g13hc")
];

buildInputs = [
cmake
libjpeg