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: a1a448424c47
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d8e7f7e24666
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 6, 2019

  1. paraview: 5.6.0 -> 5.6.3 

    * Use qt wrapper, otherwise it wouldn't find plugins and fail to start
    @JohnAZoidberg
    JohnAZoidberg committed Nov 6, 2019
    Copy the full SHA
    4390b5e View commit details

  2. Merge pull request #72891 from JohnAZoidberg/fix-qt-paraview 

    paraview: 5.6.0 -> 5.6.3 (and fix it)
    @dguibert
    dguibert authored Nov 6, 2019
    Copy the full SHA
    d8e7f7e View commit details
Showing with 4 additions and 3 deletions.
  1. +4 −3 pkgs/applications/graphics/paraview/default.nix
7 changes: 4 additions & 3 deletions pkgs/applications/graphics/paraview/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,19 +2,20 @@
stdenv, fetchFromGitHub, cmake, makeWrapper
,qtbase, qttools, python, libGLU_combined
,libXt, qtx11extras, qtxmlpatterns
, mkDerivation
}:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "paraview";
version = "5.6.0";
version = "5.6.3";

# fetching from GitHub instead of taking an "official" source
# tarball because of missing submodules there
src = fetchFromGitHub {
owner = "Kitware";
repo = "ParaView";
rev = "v${version}";
sha256 = "1j13yfdgcv4yzfr449i4c8r4rs1c9zr6qd3igr4vv3ani8zixkzi";
sha256 = "0zcij59pg47c45gfddnpbin13w16smzhcbivzm1k4pg4366wxq1q";
fetchSubmodules = true;
};