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: 231e67175809
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f597a885424d
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Nov 10, 2018

  1. gmsh: 4.0.2 -> 4.0.4 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gmsh/versions
    @r-ryantm
    r-ryantm committed Nov 10, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6f2bb3c View commit details

Commits on Nov 14, 2018

  1. gmsh: use openblas instead of atlas/lapack 

    * openblas is properly recognized by cmake
* the cmake patch is no longer neccessary
    @markuskowa
    markuskowa committed Nov 14, 2018
    Copy the full SHA
    ced40ea View commit details

  2. gmsh: restrict platform to x86_64-linux

    @markuskowa
    markuskowa committed Nov 14, 2018
    Copy the full SHA
    644ab70 View commit details

  3. Merge pull request #50101 from r-ryantm/auto-update/gmsh 

    gmsh: 4.0.2 -> 4.0.4
    @markuskowa
    markuskowa authored Nov 14, 2018
    Copy the full SHA
    f597a88 View commit details
Showing with 5 additions and 46 deletions.
  1. +0 −37 pkgs/applications/science/math/gmsh/CMakeLists.txt.patch
  2. +5 −9 pkgs/applications/science/math/gmsh/default.nix
37 changes: 0 additions & 37 deletions pkgs/applications/science/math/gmsh/CMakeLists.txt.patch
View file

This file was deleted.

14 changes: 5 additions & 9 deletions pkgs/applications/science/math/gmsh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
{ stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg
{ stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg
, zlib, libGLU_combined, libGLU, xorg }:

let version = "4.0.2"; in
let version = "4.0.4"; in

stdenv.mkDerivation {
name = "gmsh-${version}";

src = fetchurl {
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
sha256 = "03aw3sbz4x998rk29az7mgm0mrdb6614aqnppg81p5jkh5097jgk";
sha256 = "1hvrls3xyxvn69kwicpvndrs0zhifcfkhfsxr8zkmhmn6fhnjhha";
};

# The original CMakeLists tries to use some version of the Lapack lib
# that is supposed to work without Fortran but didn't for me.
patches = [ ./CMakeLists.txt.patch ];

buildInputs = [ cmake blas liblapack gmm fltk libjpeg zlib libGLU_combined
buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined
libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext
xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE
];
@@ -27,7 +23,7 @@ stdenv.mkDerivation {
meta = {
description = "A three-dimensional finite element mesh generator";
homepage = http://gmsh.info/;
platforms = stdenv.lib.platforms.all;
platforms = [ "x86_64-linux" ];
license = stdenv.lib.licenses.gpl2Plus;
};
}