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: 9ed722732daf
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: 59c4035e58e0
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Jan 10, 2020

  1. thrift: fix checkPhase on darwin

    @veprbl
    veprbl committed Jan 10, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ef1a865 View commit details

  2. rustracer: 2.1.28 -> 2.1.29 

    https://crates.io/crates/racer/2.1.29

The package is now pinned to the git rev that is published as 2.1.29 on
crates.io (there's no 2.1.29 tag on GitHub unfortunately).
    @Ma27
    Ma27 committed Jan 10, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    41e0619 View commit details

  3. Merge pull request #77467 from veprbl/pr/thrift_darwin_fix 

    thrift: fix checkPhase on darwin
    @veprbl
    veprbl authored Jan 10, 2020

    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
    b74c26a View commit details

  4. nixos/spamassassin: allow initPreConf to be a path 

    Supporting a path here is important because it allows e.g. fetching a
configuration from a URL.  To do this and provide the configuration as
a string, IFD would be necessary.  It's just written into a path
anyway.
    @alyssais
    alyssais committed Jan 10, 2020
    Copy the full SHA
    59c4035 View commit details
Showing with 19 additions and 8 deletions.
  1. +2 −2 nixos/modules/services/mail/spamassassin.nix
  2. +13 −2 pkgs/development/libraries/thrift/default.nix
  3. +4 −4 pkgs/development/tools/rust/racer/default.nix
4 changes: 2 additions & 2 deletions nixos/modules/services/mail/spamassassin.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@ with lib;
let
cfg = config.services.spamassassin;
spamassassin-local-cf = pkgs.writeText "local.cf" cfg.config;
spamassassin-init-pre = pkgs.writeText "init.pre" cfg.initPreConf;

spamdEnv = pkgs.buildEnv {
name = "spamd-env";
@@ -65,8 +64,9 @@ in
};

initPreConf = mkOption {
type = types.str;
type = with types; either str path;
description = "The SpamAssassin init.pre config.";
apply = val: if builtins.isPath val then val else pkgs.writeText "init.pre" val;
default =
''
#
15 changes: 13 additions & 2 deletions pkgs/development/libraries/thrift/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, cmake, pkgconfig
{ stdenv, fetchurl, fetchpatch, boost, zlib, libevent, openssl, python, cmake, pkgconfig
, bison, flex, twisted, static ? false }:

stdenv.mkDerivation rec {
@@ -10,6 +10,15 @@ stdenv.mkDerivation rec {
sha256 = "0yai9c3bdsrkkjshgim7zk0i7malwfprg00l9774dbrkh2w4ilvs";
};

patches = [
# Fix a failing test on darwin
# https://issues.apache.org/jira/browse/THRIFT-4976
(fetchpatch {
url = "https://github.com/apache/thrift/commit/6701dbb8e89f6550c7843e9b75b118998df471c3.diff";
sha256 = "14rqma2b2zv3zxkkl5iv9kvyp3zihvad6fdc2gcdqv37nqnswx9d";
})
];

# Workaround to make the python wrapper not drop this package:
# pythonFull.buildEnv.override { extraLibs = [ thrift ]; }
pythonPath = [];
@@ -32,7 +41,9 @@ stdenv.mkDerivation rec {
doCheck = !static;
checkPhase = ''
runHook preCheck
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib ctest -E PythonTestSSLSocket
${stdenv.lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH=$PWD/lib ctest -E PythonTestSSLSocket
runHook postCheck
'';
enableParallelChecking = false;
8 changes: 4 additions & 4 deletions pkgs/development/tools/rust/racer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "racer";
version = "2.1.28";
version = "2.1.29";

src = fetchFromGitHub {
owner = "racer-rust";
repo = "racer";
rev = "v${version}";
sha256 = "1zifbcqy9hmcdbz7sl046l2631f5a3j65kyin38l7wm7vrqx9s3h";
rev = "5db1d0cf8bd1a1030983337c2079be09a1268c8c";
sha256 = "0kxi0krpc3abanphzpmi3jhmm831bn4wjzyas469q2gvqfhm71dj";
};

cargoSha256 = "1ys1yb939y144lhjr451cpqrayqn66r0zp71xm90fkqxsbv7wkqv";
cargoSha256 = "18hx0dfx6lw3azsnpqzhbjs0fpfya5y0pcyjmfywv42a8n7dr1jc";

buildInputs = [ makeWrapper ]
++ stdenv.lib.optional stdenv.isDarwin Security;