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

Commits on Mar 5, 2020

  1. Copy the full SHA
    bc56175 View commit details

Commits on Mar 6, 2020

  1. xxHash: 0.7.2 -> 0.7.3

    r-ryantm committed Mar 6, 2020
    Copy the full SHA
    ced888a View commit details

Commits on Mar 8, 2020

  1. Copy the full SHA
    3f02faf View commit details
  2. Merge pull request #82037 from r-ryantm/auto-update/etesync-dav

    etesync-dav: 0.14.2 -> 0.15.0
    ryantm authored Mar 8, 2020
    Copy the full SHA
    4120419 View commit details
  3. Merge pull request #81796 from JohnAZoidberg/satallax-gcc9

    satallax: Fix build with GCC9
    Ma27 authored Mar 8, 2020
    Copy the full SHA
    84f862e View commit details
  4. ocsigen-i18n: 3.4.0 → 3.5.0

    vbgl committed Mar 8, 2020
    Copy the full SHA
    5e468ef View commit details
  5. Copy the full SHA
    d008a34 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/etesync-dav/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

python3Packages.buildPythonApplication rec {
pname = "etesync-dav";
version = "0.14.2";
version = "0.15.0";

src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "05kzy74r2hd44sqjgd0bc588ganrzbz5brpiginb8sh8z38igb60";
sha256 = "1rjp4lhxs6g5yw99rrdg5v98vcvagsabkqf51k1fhhsmbj47mdsm";
};

propagatedBuildInputs = with python3Packages; [
5 changes: 5 additions & 0 deletions pkgs/applications/science/logic/satallax/default.nix
Original file line number Diff line number Diff line change
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib";
};

patches = [
# GCC9 doesn't allow default value in friend declaration.
./fix-declaration-gcc9.patch
];

preConfigure = ''
mkdir fake-tools
echo "echo 'Nix-build-host.localdomain'" > fake-tools/hostname
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git i/minisat/core/SolverTypes.h w/minisat/core/SolverTypes.h
--- i/minisat/core/SolverTypes.h
+++ w/minisat/core/SolverTypes.h
@@ -47,7 +47,7 @@ struct Lit {
int x;

// Use this as a constructor:
- friend Lit mkLit(Var var, bool sign = false);
+ friend Lit mkLit(Var var, bool sign);

bool operator == (Lit p) const { return x == p.x; }
bool operator != (Lit p) const { return x != p.x; }
@@ -55,7 +55,7 @@ struct Lit {
};


-inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; }
+inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; }
inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; }
inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; }
inline bool sign (Lit p) { return p.x & 1; }
6 changes: 3 additions & 3 deletions pkgs/development/libraries/xxHash/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "xxHash";
version = "0.7.2";
version = "0.7.3";

src = fetchFromGitHub {
owner = "Cyan4973";
repo = "xxHash";
rev = "v${version}";
sha256 = "1f9gl0cymmi92ihsfan0p4zmyf2hxwx4arjimpbmbp719nbcvdsx";
sha256 = "0bin0jch6lbzl4f8y052a7azfgq2n7iwqihzgqmcccv5vq4vcx5a";
};

outputs = [ "out" "dev" ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
highly portable, and hashes are identical on all platforms (little / big
endian).
'';
homepage = https://github.com/Cyan4973/xxHash;
homepage = "https://github.com/Cyan4973/xxHash";
license = with licenses; [ bsd2 gpl2 ];
maintainers = with maintainers; [ orivej ];
platforms = platforms.unix;
11 changes: 5 additions & 6 deletions pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{ stdenv, fetchurl, ocamlPackages }:
{ stdenv, fetchzip, ocamlPackages }:

stdenv.mkDerivation rec
{
pname = "ocsigen-i18n";
version = "3.4.0";

buildInputs = with ocamlPackages; [ ocaml findlib ];
version = "3.5.0";

buildInputs = with ocamlPackages; [ ocaml findlib ppx_tools ];

dontStrip = true;

@@ -15,9 +14,9 @@ stdenv.mkDerivation rec
make bindir=$out/bin install
'';

src = fetchurl {
src = fetchzip {
url = "https://github.com/besport/${pname}/archive/${version}.tar.gz";
sha256 = "0i7cck6zlgwjpksb4s1jpy193h85jixf4d0nmqj09y3zcpn2i8gb";
sha256 = "1qsgwfl64b53w235wm7nnchqinzgsvd2gb52xm0kra2wlwp69rfq";
};

meta = {