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: 5c3401b60534
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c22dc1ef3638
Choose a head ref
  • 11 commits
  • 10 files changed
  • 5 contributors

Commits on Oct 22, 2019

  1. nauty: 26r11 -> 26r12

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/nauty/versions
    r-ryantm committed Oct 22, 2019
    Copy the full SHA
    d93659f View commit details
  2. Merge pull request #71694 from r-ryantm/auto-update/nauty

    nauty: 26r11 -> 26r12
    timokau authored Oct 22, 2019
    Copy the full SHA
    ed145e8 View commit details
  3. nlohmann_json: 3.6.1 -> 3.7.0

    Also install multiple headers (in particular to get json_fwd.hpp,
    which Nix needs).
    edolstra committed Oct 22, 2019
    Copy the full SHA
    e89e038 View commit details
  4. Copy the full SHA
    fc2592b View commit details
  5. dcm2niix: 1.0.20190410 -> 1.0.20190902

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/dcm2niix/versions
    r-ryantm authored and Jon committed Oct 22, 2019
    Copy the full SHA
    a9551de View commit details
  6. Copy the full SHA
    404f148 View commit details

Commits on Oct 23, 2019

  1. memcached: 1.5.18 -> 1.5.19

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/memcached/versions
    r-ryantm authored and Jon committed Oct 23, 2019
    Copy the full SHA
    1631d79 View commit details
  2. mimalloc: 1.0.8 -> 1.1.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/mimalloc/versions
    r-ryantm authored and Jon committed Oct 23, 2019
    Copy the full SHA
    5596317 View commit details
  3. openapi-generator-cli: 4.1.2 -> 4.1.3

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/openapi-generator-cli/versions
    r-ryantm authored and Jon committed Oct 23, 2019
    Copy the full SHA
    a79f75c View commit details
  4. flow: 0.109.0 -> 0.110.0

    marsam authored and Jon committed Oct 23, 2019
    Copy the full SHA
    ded9ac3 View commit details
  5. openvdb: 6.2.0 -> 6.2.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/openvdb/versions
    r-ryantm authored and Jon committed Oct 23, 2019
    Copy the full SHA
    c22dc1e View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/science/biology/dcm2niix/default.nix
Original file line number Diff line number Diff line change
@@ -6,14 +6,14 @@
}:

stdenv.mkDerivation rec {
version = "1.0.20190410";
version = "1.0.20190902";
pname = "dcm2niix";

src = fetchFromGitHub {
owner = "rordenlab";
repo = "dcm2niix";
rev = "v${version}";
sha256 = "1prwpvbi76xlpkhc4kadjhyyx0s71cs30hi6anknhfm6hdyd26ms";
sha256 = "0h8jsadgv831lqb0jhnaxm7lldirmnp5agrhgg5bcxvn860fl15b";
};

enableParallelBuilding = true;
4 changes: 2 additions & 2 deletions pkgs/applications/science/math/nauty/default.nix
Original file line number Diff line number Diff line change
@@ -4,10 +4,10 @@
}:
stdenv.mkDerivation rec {
pname = "nauty";
version = "26r11";
version = "26r12";
src = fetchurl {
url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz";
sha256 = "05z6mk7c31j70md83396cdjmvzzip1hqb88pfszzc6k4gy8h3m2y";
sha256 = "1p4mxf8q5wm47nxyskxbqwa5p1vvkycv1zgswvnk9nsn6vff0al6";
};
outputs = [ "out" "dev" ];
configureFlags = {
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/apps/elementary-files/default.nix
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
, meson
, ninja
, gettext
, vala
, vala_0_44
, python3
, desktop-file-utils
, libcanberra
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
ninja
pkgconfig
python3
vala
vala_0_44 # https://github.com/elementary/files/issues/1081
wrapGAppsHook
];

4 changes: 2 additions & 2 deletions pkgs/development/libraries/mimalloc/default.nix
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@ let
in
stdenv.mkDerivation rec {
name = "mimalloc-${version}";
version = "1.0.8";
version = "1.1.0";

src = fetchFromGitHub {
owner = "microsoft";
repo = "mimalloc";
rev = "refs/tags/v${version}";
sha256 = "04k2d3x84q2jfqdjxngy98hlw6czmigsqlf7gi3mhs6682n127r5";
sha256 = "1i8pwzpcmbf7dxncb984xrnczn1737xqhf1jaizlyw0k1hpiam4v";
};

nativeBuildInputs = [ cmake ];
7 changes: 5 additions & 2 deletions pkgs/development/libraries/nlohmann_json/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
pname = "nlohmann_json";
version = "3.6.1";
version = "3.7.0";

src = fetchFromGitHub {
owner = "nlohmann";
repo = "json";
rev = "v${version}";
sha256 = "1dgx3j9pb0f52dh73z8dpwdy79bra1qi5vpl66b9inq4gamf813z";
sha256 = "0v7xih4zjixxxfvkfbs7a8j9qcvpwlsv4vrkbyns3hc7b44nb8ap";
};

nativeBuildInputs = [ cmake ];
@@ -18,10 +18,13 @@ stdenv.mkDerivation rec {

cmakeFlags = [
"-DBuildTests=${if doCheck then "ON" else "OFF"}"
"-DJSON_MultipleHeaders=ON"
];

doCheck = stdenv.hostPlatform == stdenv.buildPlatform;

postInstall = "rm -rf $out/lib64";

meta = with stdenv.lib; {
description = "Header only C++ library for the JSON file format";
homepage = https://github.com/nlohmann/json;
4 changes: 2 additions & 2 deletions pkgs/development/libraries/openvdb/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec
{
pname = "openvdb";
version = "6.2.0";
version = "6.2.1";

src = fetchFromGitHub {
owner = "dreamworksanimation";
repo = "openvdb";
rev = "v${version}";
sha256 = "0ms7jmx9nsza46bky42vyb6n6p29kfjfidqg51kccvirzi07crvq";
sha256 = "1ypkzdkgsbcczfvrqblnxfzm13w0mdkskgqmgvmbfi66vpaazdrf";
};

outputs = [ "out" ];
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.109.0";
version = "0.110.0";

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

installPhase = ''
4 changes: 2 additions & 2 deletions pkgs/servers/memcached/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{stdenv, fetchurl, cyrus_sasl, libevent}:

stdenv.mkDerivation rec {
version = "1.5.18";
version = "1.5.19";
pname = "memcached";

src = fetchurl {
url = "https://memcached.org/files/${pname}-${version}.tar.gz";
sha256 = "127g4l0ilb376dpgz6qby24vc72ban35c938dzmp1nh6bdqddgcy";
sha256 = "1q2bb858iwc1jncav5vfl8c7dic9r1wqni5724qmy8ads6idmp1x";
};

configureFlags = [
4 changes: 2 additions & 2 deletions pkgs/tools/networking/openapi-generator-cli/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, jre, makeWrapper }:

stdenv.mkDerivation rec {
version = "4.1.2";
version = "4.1.3";
pname = "openapi-generator-cli";

jarfilename = "${pname}-${version}.jar";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}";
sha256 = "18f5ksngx6afh7rrw9aiw7q6yx801qflbbbqc7i28b68l9dh5qy4";
sha256 = "0bqdjparv12wscq4qhm9xnryyfmdnn3w77hrhnsy8mlvxk2vnk13";
};

phases = [ "installPhase" ];
10 changes: 5 additions & 5 deletions pkgs/tools/package-management/nix/default.nix
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ let

common =
{ lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz
, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline
, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns, jq
, busybox-sandbox-shell
, storeDir
@@ -39,7 +39,7 @@ common =
++ lib.optionals (!is20) [ curl perl ]
++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns jq ];

buildInputs = [ curl openssl sqlite xz bzip2 ]
buildInputs = [ curl openssl sqlite xz bzip2 nlohmann_json ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is20 [ brotli boost editline ]
++ lib.optional withLibseccomp libseccomp
@@ -201,12 +201,12 @@ in rec {

nixFlakes = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
suffix = "pre20190922_382aa05";
suffix = "pre20191022_9cac895";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "382aa05ff71b61379f5c2792eaf517bdf4a5c5bf";
hash = "sha256-k4vV3Q1YVmLd+49AETnsSGetpDjD6sdd9yBrnpi8Q3g=";
rev = "9cac895406724e0304dff140379783c4d786e855";
hash = "sha256-Y1cdnCNoJmjqyC/a+Nt2N+5L3Ttg7K7zOD7gmtg1QzA=";
};
fromGit = true;