mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-12 10:50:30 +08:00
Compare commits
7 Commits
fix-boost
...
black@2016
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bde2351723 | ||
|
|
9e18b81ded | ||
|
|
78e9bc731b | ||
|
|
d2fd6c1621 | ||
|
|
dfa9df316b | ||
|
|
c9f9147bed | ||
|
|
6d9296c3c7 |
@@ -180,6 +180,16 @@ go.stdenv.mkDerivation (
|
||||
done < <(find $bin/bin -type f 2>/dev/null)
|
||||
'';
|
||||
|
||||
shellHook = ''
|
||||
d=$(mktemp -d "--suffix=-$name")
|
||||
'' + toString (map (dep: ''
|
||||
mkdir -p "$d/src/$(dirname "${dep.goPackagePath}")"
|
||||
ln -s "${dep.src}" "$d/src/${dep.goPackagePath}"
|
||||
''
|
||||
) goPath) + ''
|
||||
export GOPATH="$d:$GOPATH"
|
||||
'';
|
||||
|
||||
disallowedReferences = lib.optional (!allowGoReference) go
|
||||
++ lib.optional (!dontRenameImports) govers;
|
||||
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/cairocffi/test_cairo.py 2016-09-01 07:52:33.303180302 +0200
|
||||
+++ b/cairocffi/test_cairo.py 2016-09-01 09:06:19.595701944 +0200
|
||||
@@ -998,7 +998,7 @@
|
||||
|
||||
font = ScaledFont(ToyFontFace('monospace'))
|
||||
_, _, _, _, x_advance_mono, y_advance = font.text_extents('i' * 10)
|
||||
- assert x_advance_mono > x_advance
|
||||
+ assert x_advance_mono >= x_advance
|
||||
assert y_advance == 0
|
||||
# Not much we can test:
|
||||
# The toy font face was "materialized" into a specific backend.
|
||||
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p "$out"
|
||||
cp -r opt "$out"
|
||||
cp -r usr/bin "$out"
|
||||
wrapProgram "$out/bin/vagrant" --prefix LD_LIBRARY_PATH : "$out/opt/vagrant/embedded/lib"
|
||||
wrapProgram $out/bin/vagrant --prefix LD_LIBRARY_PATH : $out/opt/vagrant/embedded/lib
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
||||
@@ -1169,11 +1169,11 @@ rec {
|
||||
};
|
||||
|
||||
youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "youcompleteme-2016-07-23";
|
||||
name = "youcompleteme-2016-09-01";
|
||||
src = fetchgit {
|
||||
url = "git://github.com/valloric/youcompleteme";
|
||||
rev = "9968a43f7ec058298667c2c56ca86cfbbf1dac51";
|
||||
sha256 = "17fxlflzggzx0mzsbmgvhp7dmkrx760w2pkais2vkafk3xdr1yr7";
|
||||
rev = "e332cdb2a0c8599dead1d362b87bb9fb79c9a955";
|
||||
sha256 = "0lqmdbv2z3rhm6a9c62rhfl3i30mvpg2f7k0cjan7jvrln9588k9";
|
||||
};
|
||||
dependencies = [];
|
||||
buildInputs = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rtl8723bs-${kernel.version}-${rev}";
|
||||
rev = "6918e9b2ff297b1cc7fde193e72452c33c10e1c8";
|
||||
rev = "b0ef98fff09bc091da3fb4157f3118427ecd6dea";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hadess";
|
||||
repo = "rtl8723bs";
|
||||
inherit rev;
|
||||
sha256 = "07srd457wnz29nvvq02wz66s387bhjbydnmbs3qr7ljprabhsgmi";
|
||||
sha256 = "0la1r7vh2klirh1lqq8spyq8wpq3qk25pn2zpr4czdh2lml366x0";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
@@ -3121,6 +3121,7 @@ in modules // {
|
||||
})
|
||||
|
||||
../development/python-modules/cairocffi/dlopen-paths.patch
|
||||
../development/python-modules/cairocffi/fix_test_scaled_font.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -4062,7 +4063,7 @@ in modules // {
|
||||
buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors
|
||||
self.iso8601 self.pyasn1 self.pytest self.py self.hypothesis1 ]
|
||||
++ optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security;
|
||||
propagatedBuildInputs = with self; [ six idna ipaddress pyasn1 cffi pyasn1-modules modules.sqlite3 ]
|
||||
propagatedBuildInputs = with self; [ six idna ipaddress pyasn1 pytz cffi pyasn1-modules modules.sqlite3 ]
|
||||
++ optional (pythonOlder "3.4") self.enum34;
|
||||
|
||||
# IOKit's dependencies are inconsistent between OSX versions, so this is the best we
|
||||
|
||||
Reference in New Issue
Block a user