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

Commits on Nov 13, 2018

  1. isso: 0.10.6 -> 0.11.1 (#50310)

    @fgaz @timokau
    fgaz authored and timokau committed Nov 13, 2018
    Copy the full SHA
    ab4b745 View commit details
Showing with 14 additions and 29 deletions.
  1. +14 −29 pkgs/servers/isso/default.nix
43 changes: 14 additions & 29 deletions pkgs/servers/isso/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,27 @@
{ stdenv, python2, fetchFromGitHub }:

let python = python2.override {
packageOverrides = self: super: {
misaka = super.misaka.overridePythonAttrs (old: rec {
version = "1.0.2";
src = old.src.override {
inherit version;
sha256 = "05rmjxlfhghj90m1kc55lx3z8igabw5y8wmly66p3hphdy4f95v1";
};
propagatedBuildInputs = [ ];
});
html5lib = super.html5lib.overridePythonAttrs (old: rec {
version = "0.9999999";
src = old.src.override {
inherit version;
sha256 = "2612a191a8d5842bfa057e41ba50bbb9dcb722419d2408c78cff4758d0754868";
};
checkInputs = with self; [ nose flake8 ];
propagatedBuildInputs = with self; [ six ];
checkPhase = ''
nosetests
'';
});
};
};

in with python.pkgs; buildPythonApplication rec {
with python2.pkgs; buildPythonApplication rec {
pname = "isso";
version = "0.10.6";
version = "0.11.1";

# no tests on PyPI
src = fetchFromGitHub {
owner = "posativ";
repo = pname;
rev = version;
sha256 = "19x9xbwd15fikhchyl4i1wrqx589hdmh279xhnxdszrq898igywb";
sha256 = "0545vh0sb5i4cz9c0qgch77smpwgav3rhl1dxk9ij6rx4igjk03j";
};

propagatedBuildInputs = [ misaka werkzeug ipaddr configparser html5lib ];
propagatedBuildInputs = [
bleach
cffi
configparser
html5lib
ipaddr
jinja2
misaka
werkzeug
];

checkInputs = [ nose ];

@@ -52,3 +36,4 @@ in with python.pkgs; buildPythonApplication rec {
maintainers = with maintainers; [ fgaz ];
};
}