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

Commits on Nov 20, 2016

  1. flask: 0.10.1 -> 0.11.1

    rasendubi committed Nov 20, 2016
    Copy the full SHA
    4058735 View commit details

Commits on Dec 18, 2016

  1. Copy the full SHA
    07950a2 View commit details

Commits on Dec 19, 2016

  1. Merge pull request #20590 from rasendubi/flask-0.11.1

    flask: 0.10.1 -> 0.11.1
    FRidh authored Dec 19, 2016
    Copy the full SHA
    2f91dd3 View commit details
Showing with 4 additions and 3 deletions.
  1. +1 −0 pkgs/applications/misc/octoprint/default.nix
  2. +3 −3 pkgs/top-level/python-packages.nix
1 change: 1 addition & 0 deletions pkgs/applications/misc/octoprint/default.nix
Original file line number Diff line number Diff line change
@@ -70,6 +70,7 @@ in pythonPackages.buildPythonApplication rec {
-e 's,Flask-Login>=[^"]*,Flask-Login,g' \
-e 's,rsa>=[^"]*,rsa,g' \
-e 's,PyYAML>=[^"]*,PyYAML,g' \
-e 's,flask>=[^"]*,flask,g' \
setup.py
'';

6 changes: 3 additions & 3 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -11124,11 +11124,11 @@ in {
};

flask = buildPythonPackage {
name = "flask-0.10.1";
name = "flask-0.11.1";

src = pkgs.fetchurl {
url = "mirror://pypi/F/Flask/Flask-0.10.1.tar.gz";
sha256 = "4c83829ff83d408b5e1d4995472265411d2c414112298f2eb4b359d9e4563373";
url = "mirror://pypi/F/Flask/Flask-0.11.1.tar.gz";
sha256 = "03kbfll4sj3v5z7r31c7bhfpi11r1np076d4p1k2kg4yzcmkywdl";
};

propagatedBuildInputs = with self; [ itsdangerous click werkzeug jinja2 ];