mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-08 06:13:55 +00:00
Compare commits
5 Commits
devShellTo
...
black@2016
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
78e9bc731b | ||
|
|
d2fd6c1621 | ||
|
|
dfa9df316b | ||
|
|
c9f9147bed | ||
|
|
6d9296c3c7 |
@@ -180,6 +180,16 @@ go.stdenv.mkDerivation (
|
|||||||
done < <(find $bin/bin -type f 2>/dev/null)
|
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
|
disallowedReferences = lib.optional (!allowGoReference) go
|
||||||
++ lib.optional (!dontRenameImports) govers;
|
++ lib.optional (!dontRenameImports) govers;
|
||||||
|
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
|
|||||||
mkdir -p "$out"
|
mkdir -p "$out"
|
||||||
cp -r opt "$out"
|
cp -r opt "$out"
|
||||||
cp -r usr/bin "$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 = ''
|
preFixup = ''
|
||||||
|
|||||||
@@ -2,13 +2,13 @@
|
|||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "rtl8723bs-${kernel.version}-${rev}";
|
name = "rtl8723bs-${kernel.version}-${rev}";
|
||||||
rev = "6918e9b2ff297b1cc7fde193e72452c33c10e1c8";
|
rev = "b0ef98fff09bc091da3fb4157f3118427ecd6dea";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hadess";
|
owner = "hadess";
|
||||||
repo = "rtl8723bs";
|
repo = "rtl8723bs";
|
||||||
inherit rev;
|
inherit rev;
|
||||||
sha256 = "07srd457wnz29nvvq02wz66s387bhjbydnmbs3qr7ljprabhsgmi";
|
sha256 = "0la1r7vh2klirh1lqq8spyq8wpq3qk25pn2zpr4czdh2lml366x0";
|
||||||
};
|
};
|
||||||
|
|
||||||
hardeningDisable = [ "pic" ];
|
hardeningDisable = [ "pic" ];
|
||||||
|
|||||||
@@ -4062,7 +4062,7 @@ in modules // {
|
|||||||
buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors
|
buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors
|
||||||
self.iso8601 self.pyasn1 self.pytest self.py self.hypothesis1 ]
|
self.iso8601 self.pyasn1 self.pytest self.py self.hypothesis1 ]
|
||||||
++ optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security;
|
++ 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;
|
++ optional (pythonOlder "3.4") self.enum34;
|
||||||
|
|
||||||
# IOKit's dependencies are inconsistent between OSX versions, so this is the best we
|
# IOKit's dependencies are inconsistent between OSX versions, so this is the best we
|
||||||
|
|||||||
Reference in New Issue
Block a user