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: 68d0d556b946
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: bbd8dbe43b50
Choose a head ref
  • 7 commits
  • 7 files changed
  • 7 contributors

Commits on May 2, 2019

  1. python37Packages.jupyterlab: 0.35.4 -> 0.35.6 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-jupyterlab/versions
    @r-ryantm @marsam
    r-ryantm authored and marsam committed May 2, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    39e686f View commit details

Commits on May 19, 2019

  1. phpPackages.phpstan: 0.11.6 -> 0.11.7 

    Changelog: https://github.com/phpstan/phpstan/releases/tag/0.11.7
    @etu
    etu committed May 19, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    etu Elis Hirwing
    GPG key ID: D57EFA625C9A925F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    45afc64 View commit details

  2. chit: 0.1.13 -> 0.1.14

    @lilyball
    lilyball committed May 19, 2019
    Copy the full SHA
    16e37f0 View commit details

  3. buildbot: 2.1.0 -> 2.3.0 (#61723)

    @lopsided98 @veprbl
    lopsided98 authored and veprbl committed May 19, 2019
    Copy the full SHA
    f6d2df3 View commit details

Commits on May 20, 2019

  1. Merge pull request #61727 from lilyball/chit 

    chit: 0.1.13 -> 0.1.14
    @worldofpeace
    worldofpeace authored May 20, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    971b731 View commit details

  2. Merge pull request #61720 from etu/update-phpstan 

    phpPackages.phpstan: 0.11.6 -> 0.11.7
    @aanderse
    aanderse authored May 20, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    01dba63 View commit details

  3. Merge pull request #60721 from r-ryantm/auto-update/python3.7-jupyterlab 

    python37Packages.jupyterlab: 0.35.4 -> 0.35.5
    @marsam
    marsam authored May 20, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bbd8dbe View commit details
19 changes: 5 additions & 14 deletions pkgs/development/python-modules/buildbot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, buildPythonPackage, /*fetchPypi,*/ fetchFromGitHub, makeWrapper, isPy3k,
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
python, twisted, jinja2, zope_interface, future, sqlalchemy,
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
txrequests, txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
@@ -25,21 +25,12 @@ let

package = buildPythonPackage rec {
pname = "buildbot";
version = "2.1.0";
version = "2.3.0";

/*src = fetchPypi {
src = fetchPypi {
inherit pname version;
sha256 = "1745hj9s0c0fcdjv6w05bma76xqg1fv42v0dslmi4d8yz9phf37w";
};*/
# Temporarily use GitHub source because PyPi archive is missing some files
# needed for the tests to pass. This has been fixed upstream.
# See: https://github.com/buildbot/buildbot/commit/30f5927cf9a80f98ed909241a149469dec3ce68d
src = fetchFromGitHub {
owner = "buildbot";
repo = "buildbot";
rev = "v${version}";
sha256 = "022ybhdvp0hp2z0cwgx7n41jyh56bpxj3fwm4z7ppzj1qhm7lb65";
} + "/master";
sha256 = "1fdahbpihs93pj640y2079yilca6w7vlwirfcz221885ih148257";
};

propagatedBuildInputs = [
# core
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/buildbot/pkg.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "buildbot-pkg";
version = "2.1.0";
version = "2.3.0";

src = fetchPypi {
inherit pname version;
sha256 = "03lv97q4pp2izjfbwfv4zmf2fyiz7jyp537bi3gc6rhfbrfgib1i";
sha256 = "1ajgvnhwvryi10q9bklpfazi7vxw2my9jlqgwnjccycbr6yznzsw";
};

postPatch = ''
10 changes: 5 additions & 5 deletions pkgs/development/python-modules/buildbot/plugins.nix
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
src = fetchPypi {
inherit pname version format;
python = "py3";
sha256 = "011sagw8zp1z12vzkxi44w3w2lbxncz5yahkrbxj8hp6iwfzfm5v";
sha256 = "134b8y498bq5fp4863hj9058wr7mcw0xgl74br0f1dy9n7jdcl39";
};

meta = with lib; {
@@ -28,7 +28,7 @@

src = fetchPypi {
inherit pname version;
sha256 = "11gz4ry1law3l64ii383cj5fnbw9409czp2ybzkqafr4xi1qbk9h";
sha256 = "1yh8xij3wizz0f88chjpdijm7i35ql87g84ph3f76sqyr6aj6ckw";
};

propagatedBuildInputs = [ buildbot-pkg ];
@@ -48,7 +48,7 @@

src = fetchPypi {
inherit pname version;
sha256 = "0w4iwpj1rg20fbli0ppqz70l1mc9ilg0crq8g3xrf29f9z8d1w27";
sha256 = "04iihy1s9r4n5jlk57pdjy3yvp6zym2iv2bgqjhw6fy0hff5j8ys";
};

propagatedBuildInputs = [ buildbot-pkg ];
@@ -68,7 +68,7 @@

src = fetchPypi {
inherit pname version;
sha256 = "0xyvxamw45qhnfml3x5hfg9nai1jhdwbmq4pm8csf3ad0cw6vqya";
sha256 = "0bcilhcz9xnr8799d5j4sm6qz8pdjlckdck7a282nfs64liajsrh";
};

propagatedBuildInputs = [ buildbot-pkg ];
@@ -88,7 +88,7 @@

src = fetchPypi {
inherit pname version;
sha256 = "1szcrx8vslskifzxaq7lrfg2arilaq1w1aqr0nc8pjclj7idp92c";
sha256 = "13lr7lzi9sv0s6xrfalq0dkcys6fp7hn0787rjhnz9gc7x83aqjv";
};

propagatedBuildInputs = [ buildbot-pkg ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/buildbot/worker.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage (rec {
pname = "buildbot-worker";
version = "2.1.0";
version = "2.3.0";

src = fetchPypi {
inherit pname version;
sha256 = "14qimaf513h2hklcpix8vscrawvr1qiyn1vy88ycpsbz9mcqbhps";
sha256 = "0nldf4ws1nrkhbapxiy2s8j9fjfbkhp17c5912p6qy3ximfcfa93";
};

propagatedBuildInputs = [ twisted future ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/jupyterlab/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,12 +9,12 @@

buildPythonPackage rec {
pname = "jupyterlab";
version = "0.35.4";
version = "0.35.6";
disabled = pythonOlder "3.5";

src = fetchPypi {
inherit pname version;
sha256 = "deba0b2803640fcad72c61366bff11d5945173015961586d5e3b2f629ffeb455";
sha256 = "2ec845845d51221e39d0d753884a19342c953f39febf3148a68631bf57ecb774";
};

propagatedBuildInputs = [ jupyterlab_server notebook ];
4 changes: 2 additions & 2 deletions pkgs/development/tools/chit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@ with rustPlatform;

buildRustPackage rec {
pname = "chit";
version = "0.1.13";
version = "0.1.14";

src = fetchFromGitHub {
owner = "peterheesterman";
repo = pname;
rev = version;
sha256 = "1qp5ad83lvfz9l4ihz1l500p8bgf7q0z1k4f3i13nd5n7i3ksdjc";
sha256 = "1rzy15xwlf87c8kpy9pwvir6s9z3qc8d9iz4pk0gfdj2il3vmjwv";
};

cargoSha256 = "1jqnnf4jgjpm1i310hda15423nxfw9frgpmc2kbrs66qcsj7avaw";
4 changes: 2 additions & 2 deletions pkgs/top-level/php-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -367,12 +367,12 @@ let
};

phpstan = mkDerivation rec {
version = "0.11.6";
version = "0.11.7";
pname = "phpstan";

src = pkgs.fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
sha256 = "016zm9ynh0zi40kclvzql7zxs3pl69cacln2c7n3gsicpswr0qa4";
sha256 = "0148ygnmj8wwal432isfq3zhf7qw902sfd2llwl6nw4wf0a6kf73";
};

phases = [ "installPhase" ];