Compare commits

...

5 Commits

Author SHA1 Message Date
Kamil Chmielewski
78e9bc731b python-cryptography: FIX missing pytz dependency 2016-08-31 19:03:39 +02:00
Kamil Chmielewski
d2fd6c1621 vagrant: cleanup FIX plugin install from #17614 2016-08-31 18:41:18 +02:00
Kamil Chmielewski
dfa9df316b vagrant: FIX #16837 vagrant plugin install 2016-08-31 18:40:33 +02:00
Kamil Chmielewski
c9f9147bed buildGoPackage: include goDeps in nix-shell GOPATH 2016-08-31 18:38:49 +02:00
Kamil Chmielewski
6d9296c3c7 rtl8723bs: version bump 2016-08-31 18:38:49 +02:00
4 changed files with 14 additions and 4 deletions

View File

@@ -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;

View File

@@ -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 = ''

View File

@@ -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" ];

View File

@@ -4062,7 +4062,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