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: 517303dd6fb8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c2b4e80d51de
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Oct 18, 2020

  1. cppzmq: 4.6.0 -> 4.7.1

    @r-ryantm
    r-ryantm committed Oct 18, 2020
    Copy the full SHA
    48c7d89 View commit details

Commits on Nov 27, 2020

  1. ursadb: mark broken on darwin

    @SuperSandro2000
    SuperSandro2000 committed Nov 27, 2020
    Copy the full SHA
    d607ea4 View commit details

  2. irods: mark platforms.linux 

    cause upstream does not mention darwin anywhere
    @SuperSandro2000
    SuperSandro2000 committed Nov 27, 2020
    Copy the full SHA
    1d2d127 View commit details

  3. Merge pull request #100908 from r-ryantm/auto-update/cppzmq

    @SuperSandro2000
    SuperSandro2000 authored Nov 27, 2020
    Copy the full SHA
    c2b4e80 View commit details
Showing with 4 additions and 3 deletions.
  1. +2 −2 pkgs/development/libraries/cppzmq/default.nix
  2. +1 −0 pkgs/servers/ursadb/default.nix
  3. +1 −1 pkgs/tools/filesystems/irods/common.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/cppzmq/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "cppzmq";
version = "4.6.0";
version = "4.7.1";

src = fetchFromGitHub {
owner = "zeromq";
repo = "cppzmq";
rev = "v${version}";
sha256 = "19acx2bzi4n6fdnfgkja1nds7m1bwg8lw5vfcijrx9fv75pa7m8h";
sha256 = "00lb3pv923nbpaf7ric2cv6lbpspknj0pxj6yj5jyah7r3zw692m";
};

nativeBuildInputs = [ cmake ];
1 change: 1 addition & 0 deletions pkgs/servers/ursadb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -31,5 +31,6 @@ stdenv.mkDerivation {
license = licenses.bsd3;
maintainers = with maintainers; [ msm ];
platforms = platforms.unix;
broken = stdenv.isDarwin;
};
}
2 changes: 1 addition & 1 deletion pkgs/tools/filesystems/irods/common.nix
View file
Original file line number Diff line number Diff line change
@@ -51,6 +51,6 @@ with stdenv;
homepage = "https://irods.org";
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.bzizou ];
platforms = stdenv.lib.platforms.all;
platforms = stdenv.lib.platforms.linux;
};
}