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: 25544be8315e
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: dae532c44571
Choose a head ref
  • 8 commits
  • 7 files changed
  • 7 contributors

Commits on Sep 19, 2019

  1. httpie: add missing 'setuptools' to propagatedBuildInputs 

    As a side-effect of f7e28bf, the build no longer propagated 'setuptools', which
is a run-time dependency. See #68314 for further details.
    @madjar
    madjar committed Sep 19, 2019
    Copy the full SHA
    55bf3b4 View commit details

  2. libfido2: 1.1.0 -> 1.2.0

    @prusnak
    prusnak committed Sep 19, 2019
    Copy the full SHA
    1325976 View commit details

Commits on Sep 20, 2019

  1. ocamlPackages.ocaml-protoc: init at 1.2.0 (#68962)

    @vyorkin @vbgl
    vyorkin authored and vbgl committed Sep 20, 2019
    Copy the full SHA
    fac7453 View commit details

  2. ip2unix: 2.1.0 -> 2.1.1 

    This is just a small bugfix release (essentially adds two lines of code)
which fixes a segfault if using with a program that doesn't pass a
sockaddr buffer to accept() or accept4().

Signed-off-by: aszlig <aszlig@nix.build>
    @aszlig
    aszlig committed Sep 20, 2019
    Copy the full SHA
    d69bc56 View commit details

  3. ocamlPackages.ppx_deriving_rpc: init at 5.9.0

    @vyorkin @vbgl
    vyorkin authored and vbgl committed Sep 20, 2019
    Copy the full SHA
    0cf81af View commit details

  4. kicad: fix build 

    Fix configure time error:
  ...
  ImportError: No module named wx
  CMake Error at CMakeModules/FindwxPython.cmake:52 (message):
    wxPython/Phoenix does not appear to be installed on the system

Only build tested.

Fixes: f7e28bf ("Split buildPythonPackage into setup hooks")
    @bjornfor
    bjornfor committed Sep 20, 2019
    Copy the full SHA
    5af0d0b View commit details

  5. Merge pull request #69094 from madjar/fix-httpie 

    httpie: add missing 'setuptools' to propagatedBuildInputs
    @Ma27
    Ma27 authored Sep 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
    d50d581 View commit details

  6. Merge pull request #69106 from prusnak/libfido2 

    libfido2: 1.1.0 -> 1.2.0
    @mmahut
    mmahut authored Sep 20, 2019
    Copy the full SHA
    dae532c View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/science/electronics/kicad/default.nix
View file
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
libGLU_combined zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs
cairo curl openssl boost
swig python
swig (python.withPackages (ps: with ps; [ wxPython ]))
] ++ optional (oceSupport) opencascade
++ optional (ngspiceSupport) libngspice;

4 changes: 2 additions & 2 deletions pkgs/development/libraries/libfido2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,10 +2,10 @@

stdenv.mkDerivation rec {
pname = "libfido2";
version = "1.1.0";
version = "1.2.0";
src = fetchurl {
url = "https://developers.yubico.com/libfido2/Releases/libfido2-${version}.tar.gz";
sha256 = "1h51q9pgv54czf7k6v90b02gnvqw4dlxmz6vi0n06shpkdzv5jh1";
sha256 = "1pbllhzcrzkgxad00bai7lna8dpkwiv8khx8p20miy661abv956v";
};

nativeBuildInputs = [ cmake pkgconfig ];
38 changes: 38 additions & 0 deletions pkgs/development/ocaml-modules/ocaml-protoc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{ stdenv, ocaml, fetchFromGitHub, ocamlbuild, findlib, ppx_deriving_protobuf }:

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ocaml-protoc-${version}";
version = "1.2.0";

minimumOCamlVersion = "4.02";

src = fetchFromGitHub {
owner = "mransan";
repo = "ocaml-protoc";
rev = "60d2d4dd55f73830e1bed603cc44d3420430632c";
sha256 = "1d1p8ch723z2qa9azmmnhbcpwxbpzk3imh1cgkjjq4p5jwzj8amj";
};

installPhase = ''
mkdir -p tmp/bin
export PREFIX=`pwd`/tmp
make all.install.build
make check_install
make lib.install
make bin.install
'';

buildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ ppx_deriving_protobuf ];

createFindlibDestdir = true;

doCheck = true;

meta = with stdenv.lib; {
homepage = "https://github.com/mransan/ocaml-protoc";
description = "A Protobuf Compiler for OCaml";
license = licenses.mit;
maintainers = [ maintainers.vyorkin ];
};
}
18 changes: 18 additions & 0 deletions pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{ lib, buildDunePackage, rpclib, ppxfind, ppx_deriving, cppo }:

buildDunePackage rec {
pname = "ppx_deriving_rpc";

inherit (rpclib) version src;

buildInputs = [ ppxfind cppo ];

propagatedBuildInputs = [ rpclib ppx_deriving ];

meta = with lib; {
homepage = "https://github.com/mirage/ocaml-rpc";
description = "Ppx deriver for ocaml-rpc";
license = licenses.isc;
maintainers = [ maintainers.vyorkin ];
};
}
2 changes: 1 addition & 1 deletion pkgs/tools/networking/httpie/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
sha256 = "103fcigpxf4nqmrdqjnyz7d9n4n16906slwmmqqc0gkxv8hnw6vd";
};

propagatedBuildInputs = with pythonPackages; [ pygments requests ];
propagatedBuildInputs = with pythonPackages; [ pygments requests setuptools ];

doCheck = false;

4 changes: 2 additions & 2 deletions pkgs/tools/networking/ip2unix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

stdenv.mkDerivation rec {
pname = "ip2unix";
version = "2.1.0";
version = "2.1.1";

src = fetchFromGitHub {
owner = "nixcloud";
repo = "ip2unix";
rev = "v${version}";
sha256 = "1hbc7csicgza1w43aq1q189w8gzwkc2v5mxpnhaiwggwsa5vvkl0";
sha256 = "121ygj50i7ja9bv76y51qsjbjmmydhpi0sd3xb6pysmlzv0bxn17";
};

nativeBuildInputs = [
4 changes: 4 additions & 0 deletions pkgs/top-level/ocaml-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -664,6 +664,8 @@ let
then sexplib_108_08_00
else null;

ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { };

ocaml_extlib = callPackage ../development/ocaml-modules/extlib { };

ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { };
@@ -696,6 +698,8 @@ let

ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {};

ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc {};

ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {};

ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {};