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

Commits on Apr 7, 2020

  1. python3Packages.flask-reverse-proxy-fix: init at 0.2.1 

    Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
    @matthiasbeyer
    matthiasbeyer authored and Jon committed Apr 7, 2020
    Copy the full SHA
    e4a7fe8 View commit details

  2. buku: 4.2.2 -> 4.3 

    Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
    @matthiasbeyer
    matthiasbeyer authored and Jon committed Apr 7, 2020
    Copy the full SHA
    b9b3cdf View commit details
Showing with 42 additions and 2 deletions.
  1. +3 −2 pkgs/applications/misc/buku/default.nix
  2. +37 −0 pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
  3. +2 −0 pkgs/top-level/python-packages.nix
5 changes: 3 additions & 2 deletions pkgs/applications/misc/buku/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, python3, fetchFromGitHub }:

with python3.pkgs; buildPythonApplication rec {
version = "4.2.2";
version = "4.3";
pname = "buku";

src = fetchFromGitHub {
owner = "jarun";
repo = "buku";
rev = "v${version}";
sha256 = "1wy5i1av1s98yr56ybiq66kv0vg48zci3fp91zfgj04nh2966w1w";
sha256 = "1cq508ymak3g5fhi1n4bdiiqkc86s2l3k4dvzw842vv2x0441cac";
};

checkInputs = [
@@ -31,6 +31,7 @@ with python3.pkgs; buildPythonApplication rec {
flask-api
flask-bootstrap
flask-paginate
flask-reverse-proxy-fix
flask_wtf
arrow
werkzeug
37 changes: 37 additions & 0 deletions pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{ stdenv
, buildPythonPackage
, fetchFromGitHub
, isPy3k
, flask
}:

buildPythonPackage rec {
pname = "flask-reverse-proxy-fix";
version = "0.2.1";

# master fixes flask import syntax and has no major changes
# new release requested: https://github.com/sublee/flask-silk/pull/6
src = fetchFromGitHub {
owner = "antarctica";
repo = "flask-reverse-proxy-fix";
rev = "v${version}";
sha256 = "1jbr67cmnryn0igv05qkvqjwrwj2rsajvvjnv3cdkm9bkgb4h5k5";
};

disabled = !isPy3k;

propagatedBuildInputs = [
flask
];

meta = with stdenv.lib; {
description = "Python Flask middleware for applications running under a reverse proxy";
maintainers = with maintainers; [ matthiasbeyer ];
homepage = "https://github.com/antarctica/flask-reverse-proxy-fix";

license = {
fullName = "Open Government Licence";
url = "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/";
};
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3659,6 +3659,8 @@ in {

flask-restplus = callPackage ../development/python-modules/flask-restplus { };

flask-reverse-proxy-fix = callPackage ../development/python-modules/flask-reverse-proxy-fix { };

flask_script = callPackage ../development/python-modules/flask-script { };

flask-silk = callPackage ../development/python-modules/flask-silk { };