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: 89ae3d6a8397
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: 079b004aaa54
Choose a head ref
  • 6 commits
  • 3 files changed
  • 4 contributors

Commits on May 11, 2019

  1. python3Packages.pyaxmlparser: 0.3.13 -> 0.3.15 

    Minor bugfix releases with several improvements and more checks for APK
files to parse.

appknox/pyaxmlparser@v0.3.13...v0.3.15
    @Ma27
    Ma27 committed May 11, 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
    187d6fe View commit details

Commits on May 12, 2019

  1. Merge pull request #61289 from Ma27/bump-pyaxmlparser 

    python3Packages.pyaxmlparser: 0.3.13 -> 0.3.15
    @worldofpeace
    worldofpeace authored May 12, 2019

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    8f5c4f6 View commit details

  2. python37Packages.geopandas: 0.4.1 -> 0.5.0 

    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-geopandas/versions
    @r-ryantm @marsam
    r-ryantm authored and marsam committed May 12, 2019

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    315be87 View commit details

  3. Merge pull request #60716 from r-ryantm/auto-update/python3.7-geopandas 

    python37Packages.geopandas: 0.4.1 -> 0.5.0
    @marsam
    marsam authored May 12, 2019
    Copy the full SHA
    f8d1cf2 View commit details

  4. bfs: 1.3.3 -> 1.4.1 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bfs/versions
    @r-ryantm @marsam
    r-ryantm authored and marsam committed May 12, 2019
    Copy the full SHA
    21b1d6e View commit details

  5. Merge pull request #60474 from r-ryantm/auto-update/bfs 

    bfs: 1.3.3 -> 1.4.1
    @marsam
    marsam authored May 12, 2019
    Copy the full SHA
    079b004 View commit details
Showing with 11 additions and 6 deletions.
  1. +2 −2 pkgs/development/python-modules/geopandas/default.nix
  2. +2 −2 pkgs/development/python-modules/pyaxmlparser/default.nix
  3. +7 −2 pkgs/tools/system/bfs/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/geopandas/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,14 +4,14 @@

buildPythonPackage rec {
pname = "geopandas";
version = "0.4.1";
version = "0.5.0";
name = pname + "-" + version;

src = fetchFromGitHub {
owner = "geopandas";
repo = "geopandas";
rev = "v${version}";
sha256 = "02v3lszxvhpsb0qrqk0kcnf9jss9gdj8az2r97aqx7ya8cwaccxa";
sha256 = "0gmqksjgxrng52jvjk0ylkpsg0qriygb10b7n80l28kdz6c0givj";
};

checkInputs = [ pytest Rtree ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pyaxmlparser/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ buildPythonPackage, stdenv, lxml, click, fetchFromGitHub, pytest, isPy3k }:

buildPythonPackage rec {
version = "0.3.13";
version = "0.3.15";
pname = "pyaxmlparser";

# the PyPI tarball doesn't ship tests.
src = fetchFromGitHub {
owner = "appknox";
repo = pname;
rev = "v${version}";
sha256 = "0jfjhxc6b57npsidknxmhj1x813scg47aaw90ybyr90fpdz5rlwk";
sha256 = "0p4x21rg8h7alrg2zk6rbgc3fj77fiyky4zzvziz2bp5jpx1pvzp";
};

disabled = !isPy3k;
9 changes: 7 additions & 2 deletions pkgs/tools/system/bfs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,17 +2,22 @@

stdenv.mkDerivation rec {
name = "bfs-${version}";
version = "1.3.3";
version = "1.4.1";

src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
sha256 = "0yjbv6j5sn2yq57rx50h284krxyx5gcviwv8ac7zxwr2qggn8lqy";
sha256 = "1y5w8gws4j1i334ap4rsl64scr0hlyrdkdl7ffaghs8fqa6mjmsb";
};

buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ];

# Disable LTO on darwin. See https://github.com/NixOS/nixpkgs/issues/19098
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile --replace "-flto -DNDEBUG" "-DNDEBUG"
'';

makeFlags = [ "PREFIX=$(out)" ];
buildFlags = [ "release" ]; # "release" enables compiler optimizations