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: 3e1f64b9bece
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: 0a9d9946ed3e
Choose a head ref
  • 18 commits
  • 10 files changed
  • 7 contributors

Commits on Jul 2, 2020

  1. Copy the full SHA
    5818654 View commit details
  2. Copy the full SHA
    8ec0275 View commit details
  3. apache-airflow: unbreak

    Unpins some dependencies to unbreak. Removes unused python dependencies,
    and corrects some dependency replacements
    drewrisinger committed Jul 2, 2020
    Copy the full SHA
    4ab1c2b View commit details
  4. flow: 0.127.0 -> 0.128.0

    r-ryantm committed Jul 2, 2020
    Copy the full SHA
    5b846f1 View commit details
  5. ft2-clone: 1.25_fix -> 1.26

    r-ryantm committed Jul 2, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    chris-huxtable Chris Huxtable
    Copy the full SHA
    9b64b11 View commit details
  6. janet: 1.10.0 -> 1.10.1

    r-ryantm committed Jul 2, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    chris-huxtable Chris Huxtable
    Copy the full SHA
    426bf48 View commit details
  7. kube-router: 0.4.0 -> 1.0.0

    r-ryantm committed Jul 2, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    chris-huxtable Chris Huxtable
    Copy the full SHA
    743c023 View commit details
  8. kubeless: 1.0.6 -> 1.0.7

    r-ryantm committed Jul 2, 2020
    Copy the full SHA
    338ab5c View commit details
  9. lean: 3.16.2 -> 3.16.5

    r-ryantm committed Jul 2, 2020
    Copy the full SHA
    39ee2ab View commit details
  10. Merge pull request #92044 from r-ryantm/auto-update/lean

    lean: 3.16.2 -> 3.16.5
    gebner authored Jul 2, 2020
    Copy the full SHA
    ab4bc95 View commit details
  11. Merge pull request #92003 from r-ryantm/auto-update/flow

    flow: 0.127.0 -> 0.128.0
    marsam authored Jul 2, 2020
    Copy the full SHA
    4ee9de0 View commit details
  12. kubeless: install completion

    marsam committed Jul 2, 2020
    Copy the full SHA
    3c543a1 View commit details
  13. Merge pull request #92041 from r-ryantm/auto-update/kube-router

    kube-router: 0.4.0 -> 1.0.0
    marsam authored Jul 2, 2020
    Copy the full SHA
    7a6dafc View commit details
  14. Merge pull request #92011 from r-ryantm/auto-update/janet

    janet: 1.10.0 -> 1.10.1
    marsam authored Jul 2, 2020
    Copy the full SHA
    55f5268 View commit details
  15. Merge pull request #92005 from r-ryantm/auto-update/ft2-clone

    ft2-clone: 1.25_fix -> 1.26
    ryantm authored Jul 2, 2020
    Copy the full SHA
    1c698ca View commit details
  16. Merge pull request #92042 from r-ryantm/auto-update/kubeless

    kubeless: 1.0.6 -> 1.0.7
    marsam authored Jul 2, 2020
    Copy the full SHA
    498f3d8 View commit details
  17. Merge pull request #91982 from drewrisinger/dr-pr-semver-bump

    pythonPackages.semver: 2.8.1 -> 2.10.2
    bhipple authored Jul 2, 2020
    Copy the full SHA
    a54cd1c View commit details
  18. tremor: fix src link

    fomichevmi authored and FRidh committed Jul 2, 2020
    Copy the full SHA
    0a9d994 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/audio/ft2-clone/default.nix
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@

stdenv.mkDerivation rec {
pname = "ft2-clone";
version = "1.25_fix";
version = "1.26";

src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "ft2-clone";
rev = "v${version}";
sha256 = "0q2mcp3xpgwilmiwzr9nnxlyg9c1kynh6cxzlyd95n520j00s6i7";
sha256 = "0fqb4415qy2nwjz7ahi43nk795ifswb2b37sc7p5n9m4yc8h53wv";
};

nativeBuildInputs = [ cmake ];
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/kube-router/default.nix
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

buildGoPackage rec {
pname = "kube-router";
version = "0.4.0";
version = "1.0.0";

goPackagePath = "github.com/cloudnativelabs/kube-router";

src = fetchFromGitHub {
owner = "cloudnativelabs";
repo = pname;
rev = "v${version}";
sha256 = "1g1y3l87a4il9g2yrl1ryx8xfd4x220azxhr3rxm5l9vhnnjwswa";
sha256 = "0b6rsiq3pwp7wknmblgd8kszh9bd7nhvlsnyyamqnhlfjl97929x";
};

buildFlagsArray = ''
17 changes: 13 additions & 4 deletions pkgs/applications/networking/cluster/kubeless/default.nix
Original file line number Diff line number Diff line change
@@ -1,22 +1,31 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }:

buildGoPackage rec {
pname = "kubeless";
version = "1.0.6";
version = "1.0.7";

src = fetchFromGitHub {
owner = "kubeless";
repo = "kubeless";
rev = "v${version}";
sha256 = "1fcdyd1jf0yibfx9jc16m0vmazm2jymps92llh3vh5zqd36bxbyd";
sha256 = "0x2hydywnnlh6arzz71p7gg9yzq5z2y2lppn1jszvkbgh11kkqfr";
};

goPackagePath = "github.com/kubeless/kubeless";

nativeBuildInputs = [ installShellFiles ];

subPackages = [ "cmd/kubeless" ];

buildFlagsArray = ''
-ldflags=-X github.com/kubeless/kubeless/pkg/version.Version=${version}
-ldflags=-s -w -X github.com/kubeless/kubeless/pkg/version.Version=${version}
'';

postInstall = ''
for shell in bash; do
$out/bin/kubeless completion $shell > kubeless.$shell
installShellCompletion kubeless.$shell
done
'';

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/applications/science/logic/lean/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "lean";
version = "3.16.2";
version = "3.16.5";

src = fetchFromGitHub {
owner = "leanprover-community";
repo = "lean";
rev = "v${version}";
sha256 = "0fvm7gvbr5kn258sqpnxa7dvzz84iv1dx1n066vih5gz80plz4lh";
sha256 = "0s1ay6qgpkxhygfbfrl1cw2pd8bpgw2dw71rzhza20ndqwk8nqs5";
};

nativeBuildInputs = [ cmake ];
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/janet/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "janet";
version = "1.10.0";
version = "1.10.1";

src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
sha256 = "0kx3c4v0481b4xx239w10ajwp8ngq8smxzh3m77dazd89r997n1g";
sha256 = "18k6dzxzr149p0bby4r0z6kybylig87rwj7gk3z6a98zf6k4xmsw";
};

nativeBuildInputs = [ meson ninja ];
8 changes: 5 additions & 3 deletions pkgs/development/libraries/tremor/default.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }:
{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, libogg }:

stdenv.mkDerivation {
name = "tremor-unstable-2018-03-16";

src = fetchgit {
url = "https://git.xiph.org/tremor.git";
src = fetchFromGitLab {
owner = "xiph";
repo = "tremor";
domain = "gitlab.xiph.org";
rev = "562307a4a7082e24553f3d2c55dab397a17c4b4f";
sha256 = "0m07gq4zfgigsiz8b518xyb19v7qqp76qmp7lb262825vkqzl3zq";
};
11 changes: 5 additions & 6 deletions pkgs/development/python-modules/apache-airflow/default.nix
Original file line number Diff line number Diff line change
@@ -46,7 +46,6 @@
, thrift
, tzlocal
, unicodecsv
, werkzeug
, zope_deprecation
, enum34
, typing
@@ -127,7 +126,6 @@ buildPythonPackage rec {
thrift
tzlocal
unicodecsv
werkzeug
zope_deprecation
];

@@ -143,24 +141,25 @@ buildPythonPackage rec {
--replace "pandas>=0.17.1, <1.0.0" "pandas" \
--replace "flask-caching>=1.3.3, <1.4.0" "flask-caching" \
--replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \
--replace "flask-admin==1.5.3" "flask-admin" \
--replace "flask-login>=0.3, <0.5" "flask-login" \
--replace "pendulum==1.4.4" "pendulum" \
--replace "cached_property~=1.5" "cached_property" \
--replace "dill>=0.2.2, <0.3" "dill" \
--replace "configparser>=3.5.0, <3.6.0" "configparser" \
--replace "jinja2>=2.7.3, <=2.10.0" "jinja2" \
--replace "jinja2>=2.10.1, <2.11.0" "jinja2" \
--replace "colorlog==4.0.2" "colorlog" \
--replace "funcsigs==1.0.0" "funcsigs" \
--replace "flask-swagger==0.2.13" "flask-swagger" \
--replace "python-daemon>=2.1.1, <2.2" "python-daemon" \
--replace "alembic>=0.9, <1.0" "alembic" \
--replace "alembic>=1.0, <2.0" "alembic" \
--replace "markdown>=2.5.2, <3.0" "markdown" \
--replace "future>=0.16.0, <0.17" "future" \
--replace "tenacity==4.12.0" "tenacity" \
--replace "text-unidecode==1.2" "text-unidecode" \
--replace "tzlocal>=1.4,<2.0.0" "tzlocal" \
--replace "sqlalchemy~=1.3" "sqlalchemy" \
--replace "gunicorn>=19.5.0, <20.0" "gunicorn" \
--replace "werkzeug>=0.14.1, <0.15.0" "werkzeug"
--replace "gunicorn>=19.5.0, <20.0" "gunicorn"
# dumb-init is only needed for CI and Docker, not relevant for NixOS.
substituteInPlace setup.py \
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/flask-appbuilder/default.nix
Original file line number Diff line number Diff line change
@@ -66,7 +66,8 @@ buildPythonPackage rec {
--replace "marshmallow>=2.18.0, <4.0.0" "marshmallow" \
--replace "PyJWT>=1.7.1" "PyJWT" \
--replace "Flask-SQLAlchemy>=2.4, <3" "Flask-SQLAlchemy" \
--replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended"
--replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended" \
--replace "Flask-Login>=0.3, <0.5" "Flask-Login"
'';

# majority of tests require network access or mongo
25 changes: 14 additions & 11 deletions pkgs/development/python-modules/semver/default.nix
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }:
{ stdenv
, fetchFromGitHub
, buildPythonPackage
, pytestCheckHook
, pytestcov
}:

buildPythonPackage {
buildPythonPackage rec {
pname = "semver";
version = "2.8.1";
version = "2.10.2";

src = fetchFromGitHub {
owner = "k-bx";
owner = "python-semver";
repo = "python-semver";
rev = "41775dd5f143dfa6ca94885056c9ef5b3ed4e6e1"; # not tagged in repository
sha256 = "1rqaakha4sw06k9h0h4g1wmk66zkmhpq92y2rw0kyfpp6xk1zbk2";
rev = version;
sha256 = "0yxjmcgk5iwp53l9z1cg0ajrj18i09ircs11ifpdrggzm8n1blf3";
};

checkInputs = [ pytest ];
checkPhase = ''
py.test
'';
preCheck = "rm -rf dist"; # confuses source vs dist imports in pytest
checkInputs = [ pytestCheckHook pytestcov ];

meta = with stdenv.lib; {
description = "Python package to work with Semantic Versioning (http://semver.org/)";
homepage = "https://github.com/k-bx/python-semver";
homepage = "https://python-semver.readthedocs.io/en/latest/";
license = licenses.bsd3;
maintainers = with maintainers; [ np ];
};
4 changes: 2 additions & 2 deletions pkgs/development/tools/analysis/flow/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "flow";
version = "0.127.0";
version = "0.128.0";

src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
sha256 = "0daacbb4il3mm8fkbk5qlpvzp3pmrqagq2hr1gsjaf8vnmissvvm";
sha256 = "1psplmqd1l6mxw0rbji2h73fvqhpp1zf9clzgc8khmkh0bbhc5ss";
};

installPhase = ''