mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(third_party): Expose various other missing dependencies

Browse source
This commit is contained in:
Vincent Ambo 2019-12-09 03:36:50 +00:00
parent 998a2ceb17
commit 7da979124f
5 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
overrides/buildGo.nix
View file

@ -3,4 +3,4 @@
(import "${builtins.fetchGit { (import "${builtins.fetchGit {
url = "https://github.com/tazjin/buildGo.nix"; url = "https://github.com/tazjin/buildGo.nix";
rev = "28e587b348a8aaa7af00a004c05286af9d35ca9a"; rev = "28e587b348a8aaa7af00a004c05286af9d35ca9a";
}}/buildGo.nix") { pkgs = pkgs.third_party.nixpkgs; } }}/buildGo.nix") { pkgs = pkgs.third_party; }

2
overrides/elmPackages.nix
View file

@ -2,7 +2,7 @@
# the newer version is a lot of effort. # the newer version is a lot of effort.
{ pkgs, ... }: { pkgs, ... }:
(import (pkgs.fetchFromGitHub { (import (pkgs.third_party.fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
rev = "14f9ee66e63077539252f8b4550049381a082518"; rev = "14f9ee66e63077539252f8b4550049381a082518";

2
overrides/lispPackages/default.nix
View file

@ -4,5 +4,5 @@
import ./quicklisp.nix { import ./quicklisp.nix {
inherit (pkgs) lib; inherit (pkgs) lib;
inherit (pkgs.third_party.nixpkgs) lispPackages; inherit (pkgs.third_party) lispPackages;
} }

4
services/gemma/default.nix
View file

@ -1,8 +1,8 @@
{ pkgs, ... }: { pkgs, ... }:
let let
inherit (pkgs) lispPackages; inherit (pkgs) elmPackages lispPackages;
inherit (pkgs.third_party.nixpkgs) stdenv sbcl elmPackages makeWrapper openssl; inherit (pkgs.third_party) stdenv sbcl makeWrapper openssl;
frontend = stdenv.mkDerivation { frontend = stdenv.mkDerivation {
name = "gemma-frontend"; name = "gemma-frontend";

5
third_party/default.nix vendored
View file

@ -41,15 +41,20 @@ let
iana-etc iana-etc
jq jq
lib lib
lispPackages
llvmPackages llvmPackages
makeWrapper
mdbook mdbook
nix nix
openssh openssh
openssl
protobuf
remarshal remarshal
rsync rsync
runCommand runCommand
rustPlatform rustPlatform
rustc rustc
sbcl
stdenv stdenv
symlinkJoin symlinkJoin
terraform_0_12 terraform_0_12