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: e497fc10e82c
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: c21f08bfedde
Choose a head ref
  • 4 commits
  • 2 files changed
  • 4 contributors

Commits on May 15, 2019

  1. nasc: 0.5.1 -> 0.5.2 

    Main improvment is that libqalculatenasc.so is now properly linked

Changelog: parnoldx/nasc@0.5.1...0.5.2
(cherry picked from commit 0353967)
    @worldofpeace
    worldofpeace committed May 15, 2019
    Copy the full SHA
    c5a7d0b View commit details

  2. nasc: 0.5.2 -> 0.5.4 

    https://github.com/parnold-x/nasc/releases/tag/0.5.4
https://github.com/parnold-x/nasc/releases/tag/0.5.3
(cherry picked from commit 51202e9)
    @dtzWill @worldofpeace
    dtzWill authored and worldofpeace committed May 15, 2019
    Copy the full SHA
    efc84cb View commit details

  3. pythonPackages.rednose: disable test suite 

    python test suite stalls when building rednose. The test suite had previously been disabled for Darwin because of a similar error. This commit disables it for all systems using python 2.7.

(cherry picked from commit 6600115a03b3046f401e464d101ef8dc13dc048c)

Reason: Building nixops without substitutes fails if the test suite stalls for rednose. This should be included in stable to prevent people building from release 19.03 from having stalled installations.
    @nixbitcoin @worldofpeace
    nixbitcoin authored and worldofpeace committed May 15, 2019
    Copy the full SHA
    921d40d View commit details

Commits on May 16, 2019

  1. Merge pull request #61542 from nixbitcoin/backport/1903/rednose 

    [19.03] pythonPackages.rednose: disable test suite
    @worldofpeace
    worldofpeace authored May 16, 2019
    Copy the full SHA
    c21f08b View commit details
Showing with 18 additions and 20 deletions.
  1. +15 −17 pkgs/applications/science/math/nasc/default.nix
  2. +3 −3 pkgs/development/python-modules/rednose/default.nix
32 changes: 15 additions & 17 deletions pkgs/applications/science/math/nasc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,47 +2,45 @@
, fetchFromGitHub
, pkgconfig
, gtk3
, glib
, pantheon
, gnome3
, libsoup
, gtksourceview
, libgee
, cmake
, libqalculate
, gobject-introspection
, wrapGAppsHook }:
, cln
, wrapGAppsHook
}:

stdenv.mkDerivation rec {
name = "nasc-${version}";
version = "0.5.1";
pname = "nasc";
version = "0.5.4";

src = fetchFromGitHub {
owner = "parnold-x";
repo = "nasc";
repo = pname;
rev = version;
sha256 = "13y5fnm7g3xgdxmdydlgly73nigh8maqbf9d6c9bpyzxkxq1csy5";
sha256 = "036v3dx8yasp19j88lflibqnpfi5d0nk7qkcnr80zn1lvawf4wgn";
};

postPatch = ''
# libqalculatenasc.so is not installed, and nasc fails to start
substituteInPlace libqalculatenasc/CMakeLists.txt --replace SHARED STATIC
'';

nativeBuildInputs = [
cmake
pantheon.vala
gobject-introspection # for setup-hook
pkgconfig
wrapGAppsHook
];

buildInputs = [
pantheon.elementary-icon-theme
cln
libsoup
gtk3
glib
gtksourceview
libgee
gnome3.libsoup
pantheon.granite
gtk3
libqalculate
pantheon.elementary-icon-theme
pantheon.granite
];

meta = with stdenv.lib; {
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/rednose/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,9 +13,9 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0"
'';

# Do not test on Python 2 darwin because the tests suite gets stuck
# https://github.com/JBKahn/rednose/issues/23
doCheck = !(stdenv.isDarwin && isPy27);
# Do not test on Python 2 because the tests suite gets stuck
# https://github.com/NixOS/nixpkgs/issues/60786
doCheck = !(isPy27);

checkInputs = [ six ];
propagatedBuildInputs = [ nose colorama termstyle ];