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: d45ba336b286
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: 9b3e5a3aab72
Choose a head ref
  • 6 commits
  • 6 files changed
  • 5 contributors

Commits on Mar 5, 2019

  1. go_1_12: set meta.branch to 1.12 (#56852)

    @kalbasit
    kalbasit authored Mar 5, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: CA4106B8D7CC79FA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    37d2f71 View commit details

  2. python.pkgs.pykerberos: put krb5 in buildInputs too 

    For the relevant discussion see
NixOS/nixpkgs#55757 (comment)
    Robert Schütz committed Mar 5, 2019
    Copy the full SHA
    82b3892 View commit details

  3. pythonPackages.libarcus: use pkgs.protobuf as input 

    This commit makes pkgs.protobuf the input for libarcus, since the latter
searches for the native protobuf library and not for the Python module.
    @jokogr
    jokogr authored and Robert Schütz committed Mar 5, 2019
    Copy the full SHA
    6a523a1 View commit details

  4. curaengine: add protobuf in buildInputs

    @jokogr
    jokogr authored and Robert Schütz committed Mar 5, 2019
    Copy the full SHA
    c14eed2 View commit details

  5. ocamlPackages.lablgtk3: 3.0.beta4 -> 3.0.beta5

    @vbgl
    vbgl committed Mar 5, 2019
    Copy the full SHA
    01f8821 View commit details

  6. Merge pull request #56696 from jokogr/f/libarcus 

    pythonPackages.libarcus: use pkgs.protobuf as input
    @dotlambda
    dotlambda authored Mar 5, 2019
    Copy the full SHA
    9b3e5a3 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/curaengine/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, libarcus, stb }:
{ stdenv, fetchFromGitHub, fetchpatch, cmake, libarcus, stb, protobuf }:

stdenv.mkDerivation rec {
name = "curaengine-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ cmake ];
buildInputs = [ libarcus stb ];
buildInputs = [ libarcus stb protobuf ];

cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ];

2 changes: 1 addition & 1 deletion pkgs/development/compilers/go/1.12.nix
View file
Original file line number Diff line number Diff line change
@@ -234,7 +234,7 @@ stdenv.mkDerivation rec {
disallowedReferences = [ goBootstrap ];

meta = with stdenv.lib; {
branch = "1.11";
branch = "1.12";
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;
4 changes: 2 additions & 2 deletions pkgs/development/ocaml-modules/lablgtk3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,15 +10,15 @@ let __dune = dune; in
let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; }; in

stdenv.mkDerivation rec {
version = "3.0.beta4";
version = "3.0.beta5";
pname = "lablgtk3";
name = "ocaml${ocaml.version}-${pname}-${version}";

src = fetchFromGitHub {
owner = "garrigue";
repo = "lablgtk";
rev = version;
sha256 = "1lppb7k4xb1a35i7klm9mz98hw8l2f8s7rivgzysi1sviqy1ds5d";
sha256 = "05n3pjy4496gbgxwbypfm2462njv6dgmvkcv26az53ianpwa4vzz";
};

nativeBuildInputs = [ pkgconfig ];
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/libarcus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,8 +15,9 @@ buildPythonPackage rec {

disabled = pythonOlder "3.4.0";

propagatedBuildInputs = [ sip protobuf ];
propagatedBuildInputs = [ sip ];
nativeBuildInputs = [ cmake ];
buildInputs = [ protobuf ];

postPatch = ''
# To workaround buggy SIP detection which overrides PYTHONPATH
4 changes: 3 additions & 1 deletion pkgs/development/python-modules/pykerberos/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,9 @@ buildPythonPackage rec {
sha256 = "0v47p840myqgc7hr4lir72xshcfpa0w8j9n077h3njpqyn6wlbag";
};

nativeBuildInputs = [ krb5 ];
nativeBuildInputs = [ krb5 ]; # for krb5-config

buildInputs = [ krb5 ];

# there are no tests
doCheck = false;
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2996,7 +2996,7 @@ in {

fs-s3fs = callPackage ../development/python-modules/fs-s3fs { };

libarcus = callPackage ../development/python-modules/libarcus { };
libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; };

libcloud = callPackage ../development/python-modules/libcloud { };