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

Commits on Mar 8, 2019

  1. python2Packages.moinmoin: 1.9.9 -> 1.9.10 (#56970) 

    Changes:

https://github.com/moinwiki/moin-1.9/blob/1.9.10/docs/CHANGES#L13

This commit also replaces a ISO-8859-1 character in setup.cfg to fix the
build.

(cherry picked from commit 449e7f9)
    @xeji
    Daniël de Kok authored and xeji committed Mar 8, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6c34eaf View commit details
Showing with 6 additions and 6 deletions.
  1. +6 −6 pkgs/development/python-modules/moinmoin/default.nix
12 changes: 6 additions & 6 deletions pkgs/development/python-modules/moinmoin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,25 +4,25 @@

buildPythonPackage rec {
pname = "moinmoin";
version = "1.9.9";
version = "1.9.10";

# SyntaxError in setup.py
disabled = isPy3k;

src = fetchurl {
url = "http://static.moinmo.in/files/moin-${version}.tar.gz";
sha256 = "197ga41qghykmir80ik17f9hjpmixslv3zjgj7bj9qvs1dvdg5s3";
sha256 = "0g05lnl1s8v61phi3z1g3b6lfj4g98grj9kw8nyjl246x0c489ja";
};

patches = [
# Recommended to install on their download page.
(fetchpatch {
url = "https://bitbucket.org/thomaswaldmann/moin-1.9/commits/561b7a9c2bd91b61d26cd8a5f39aa36bf5c6159e/raw";
sha256 = "1nscnl9nspnrwyf3n95ig0ihzndryinq9kkghliph6h55cncfc65";
})
./fix_tests.patch
];

prePatch = ''
sed -i "s/\xfc/ü/" setup.cfg
'';

checkInputs = [ pytest werkzeug pygments ];

meta = with lib; {