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

refactor(third_party): Consistent use of depot.third_party vs. pkgs

Browse source 
In preparation for the solution of b/108, we need to consistently use
`depot.third_party` for packages that are only packed in the TVL depot
and `pkgs` for things that come from nixpkgs.

This commit cleans up a huge chunk of these uses in //third_party

Change-Id: Ic382c0cdea7330a84d5f0b7d109c824ddceb94e7
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2912
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2021-04-10 02:13:18 +02:00 committed by tazjin
parent 8d4b2f3d54
commit 8361b82d0a
47 changed files with 111 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
third_party/buzz/default.nix vendored
View file

@ -1,6 +1,6 @@
{ pkgs, ... }:
{ depot, pkgs, ... }:
pkgs.naersk.buildPackage {
depot.third_party.naersk.buildPackage {
src = pkgs.fetchFromGitHub {
owner = "jonhoo";
repo = "buzz";

7
third_party/cgit/default.nix vendored
View file

@ -1,9 +1,8 @@
{ depot, ... }:
{ depot, lib, pkgs, ... }:
let
inherit (depot.third_party) lib stdenv gzip bzip2 xz luajit zlib autoconf openssl pkgconfig;
in
stdenv.mkDerivation rec {
inherit (pkgs) stdenv gzip bzip2 xz luajit zlib autoconf openssl pkgconfig;
in stdenv.mkDerivation rec {
pname = "cgit";
version = "master";
src = ./.;

4
third_party/gopkgs/github.com/cenkalti/backoff/default.nix vendored
View file

@ -1,9 +1,9 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.nix.buildGo.external {
path = "github.com/cenkalti/backoff/v4";
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "cenkalti";
repo = "backoff";
rev = "18fe4ce5a8550e0d0919b680ad3c080a5455bddf";

4
third_party/gopkgs/github.com/davecgh/go-spew/default.nix vendored
View file

@ -1,8 +1,8 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.nix.buildGo.external {
path = "github.com/davecgh/go-spew";
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "davecgh";
repo = "go-spew";
rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73";

4
third_party/gopkgs/github.com/emirpasic/gods/default.nix vendored
View file

@ -1,9 +1,9 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.nix.buildGo.external {
path = "github.com/emirpasic/gods";
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "emirpasic";
repo = "gods";
rev = "4e23915b9a82f35f320a68a395a7a5045c826932";

4
third_party/gopkgs/github.com/golang/glog/default.nix vendored
View file

@ -1,8 +1,8 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.nix.buildGo.external {
path = "github.com/golang/glog";
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "golang";
repo = "glog";
rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";

4
third_party/gopkgs/github.com/google/uuid/default.nix vendored
View file

@ -1,9 +1,9 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.nix.buildGo.external {
path = "github.com/google/uuid";
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "google";
repo = "uuid";
rev = "c2e93f3ae59f2904160ceaab466009f965df46d6";

4
third_party/gopkgs/github.com/jbenet/go-context/default.nix vendored
View file

@ -1,9 +1,9 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.nix.buildGo.external {
path = "github.com/jbenet/go-context";
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "jbenet";
repo = "go-context";
rev = "d14ea06fba99483203c19d92cfcd13ebe73135f4";

4
third_party/gopkgs/github.com/kevinburke/ssh_config/default.nix vendored
View file

@ -1,9 +1,9 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.nix.buildGo.external {
path = "github.com/kevinburke/ssh_config";
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "kevinburke";
repo = "ssh_config";
rev = "01f96b0aa0cdcaa93f9495f89bbc6cb5a992ce6e";

4
third_party/gopkgs/github.com/mitchellh/go-homedir/default.nix vendored
View file

@ -1,9 +1,9 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.nix.buildGo.external {
path = "github.com/mitchellh/go-homedir";
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "mitchellh";
repo = "go-homedir";
rev = "af06845cf3004701891bf4fdb884bfe4920b3727";

4
third_party/gopkgs/github.com/pkg/browser/default.nix vendored
View file

@ -1,9 +1,9 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.nix.buildGo.external {
path = "github.com/pkg/browser";
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "pkg";
repo = "browser";
rev = "0a3d74bf9ce488f035cf5bc36f753a711bc74334";

4
third_party/gopkgs/github.com/sergi/go-diff/default.nix vendored
View file

@ -1,9 +1,9 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.nix.buildGo.external {
path = "github.com/sergi/go-diff";
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "sergi";
repo = "go-diff";
rev = "58c5cb1602ee9676b5d3590d782bedde80706fcc";

4
third_party/gopkgs/github.com/src-d/gcfg/default.nix vendored
View file

@ -1,9 +1,9 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.nix.buildGo.external {
path = "github.com/src-d/gcfg";
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "src-d";
repo = "gcfg";
rev = "1ac3a1ac202429a54835fe8408a92880156b489d";

4
third_party/gopkgs/github.com/xanzy/ssh-agent/default.nix vendored
View file

@ -1,9 +1,9 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.nix.buildGo.external {
path = "github.com/xanzy/ssh-agent";
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "xanzy";
repo = "ssh-agent";
rev = "6a3e2ff9e7c564f36873c2e36413f634534f1c44";

4
third_party/gopkgs/googlemaps.github.io/maps.nix vendored
View file

@ -1,9 +1,9 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.nix.buildGo.external {
path = "googlemaps.github.io/maps";
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "googlemaps";
repo = "google-maps-services-go";
rev = "a46d9fca56ac82caa79408b2417ea93a75e3b986";

4
third_party/gopkgs/gopkg.in/irc.v3/default.nix vendored
View file

@ -1,9 +1,9 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.nix.buildGo.external {
path = "gopkg.in/irc.v3";
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "go-irc";
repo = "irc";
rev = "21a5301d6035ea204b2a7bb522a7b4598e5f6b28";

4
third_party/gopkgs/gopkg.in/src-d/go-billy/default.nix vendored
View file

@ -1,9 +1,9 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.nix.buildGo.external {
path = "gopkg.in/src-d/go-billy.v4";
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "src-d";
repo = "go-billy";
rev = "fd409ff12f33d0d60af0ce0abeb8d93df360af49";

4
third_party/gopkgs/gopkg.in/src-d/go-git/default.nix vendored
View file

@ -1,11 +1,11 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.nix.buildGo.external {
# .v4 is used throughout the codebase and I can't be bothered to do
# anything else about it other than using that package path here.
path = "gopkg.in/src-d/go-git.v4";
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "src-d";
repo = "go-git";
rev = "1a7db85bca7027d90afdb5ce711622aaac9feaed";

4
third_party/gopkgs/gopkg.in/warnings/default.nix vendored
View file

@ -1,9 +1,9 @@
{ depot, ... }:
{ depot, pkgs, ... }:
depot.nix.buildGo.external {
path = "gopkg.in/warnings.v0";
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "go-warnings";
repo = "warnings";
rev = "27b9fabbdaf131d2169ec3ff7db8ffc4d839635e";

2
third_party/lisp/checkl.nix vendored
View file

@ -12,7 +12,7 @@ let
in depot.nix.buildLisp.library {
name = "checkl";
deps = with pkgs.lisp; [
deps = with depot.third_party.lisp; [
(bundled "asdf")
marshal
fiveam

10
third_party/lisp/chipz.nix vendored
View file

@ -1,17 +1,15 @@
# Common Lisp library for decompressing deflate, zlib, gzip, and bzip2 data
{ depot, ... }:
{ depot, pkgs, ... }:
with depot.nix;
let src = depot.third_party.fetchFromGitHub {
let src = pkgs.fetchFromGitHub {
owner = "froydnj";
repo = "chipz";
rev = "75dfbc660a5a28161c57f115adf74c8a926bfc4d";
sha256 = "0plx4rs39zbs4gjk77h4a2q11zpy75fh9v8hnxrvsf8fnakajhwg";
};
in buildLisp.library {
in depot.nix.buildLisp.library {
name = "chipz";
deps = [ (buildLisp.bundled "asdf") ];
deps = [ (depot.nix.buildLisp.bundled "asdf") ];
srcs = map (f: src + ("/" + f)) [
"chipz.asd"

4
third_party/lisp/chunga.nix vendored
View file

@ -1,7 +1,7 @@
# Portable chunked streams for Common Lisp
{ depot, ... }:
{ depot, pkgs, ... }:
let src = depot.third_party.fetchFromGitHub {
let src = pkgs.fetchFromGitHub {
owner = "edicl";
repo = "chunga";
rev = "16330852d01dfde4dd97dee7cd985a88ea571e7e";

4
third_party/lisp/cl-fad.nix vendored
View file

@ -1,9 +1,9 @@
# Portable pathname library
{ depot, ...}:
{ depot, pkgs, ...}:
with depot.nix;
let src = depot.third_party.fetchFromGitHub {
let src = pkgs.fetchFromGitHub {
owner = "edicl";
repo = "cl-fad";
rev = "c13d81c4bd9ba3a172631fd05dd213ab90e7d4cb";

10
third_party/lisp/cl-json.nix vendored
View file

@ -1,13 +1,15 @@
# JSON encoder & decoder
{ depot, ... }:
{ depot, pkgs, ... }:
with depot.nix;
let src = depot.third_party.fetchFromGitHub {
let
inherit (depot.nix) buildLisp;
src = pkgs.fetchFromGitHub {
owner = "hankhero";
repo = "cl-json";
rev = "6dfebb9540bfc3cc33582d0c03c9ec27cb913e79";
sha256 = "0fx3m3x3s5ji950yzpazz4s0img3l6b3d6l3jrfjv0lr702496lh";
};
};
in buildLisp.library {
name = "cl-json";
deps = [ (buildLisp.bundled "asdf") ];

4
third_party/lisp/cl-plus-ssl.nix vendored
View file

@ -1,5 +1,5 @@
# Common Lisp bindings to OpenSSL
{ depot, ... }:
{ depot, pkgs, ... }:
with depot.nix;
@ -21,7 +21,7 @@ in buildLisp.library {
(buildLisp.bundled "sb-posix")
];
native = [ depot.third_party.openssl ];
native = [ pkgs.openssl ];
srcs = map (f: src + ("/src/" + f)) [
"package.lisp"

4
third_party/lisp/cl-prevalence.nix vendored
View file

@ -1,8 +1,8 @@
# cl-prevalence is an implementation of object prevalence for CL (i.e.
# an in-memory database)
{ depot, ... }:
{ depot, pkgs, ... }:
let src = depot.third_party.fetchFromGitHub {
let src = pkgs.fetchFromGitHub {
owner = "40ants";
repo = "cl-prevalence";
rev = "da3ed6c4594b1c2fca90c178c1993973c4bf16c9";

2
third_party/lisp/cl-smtp.nix vendored
View file

@ -11,7 +11,7 @@ let
in depot.nix.buildLisp.library {
name = "cl-smtp";
deps = with pkgs.lisp; [
deps = with depot.third_party.lisp; [
usocket
trivial-gray-streams
flexi-streams

4
third_party/lisp/closer-mop.nix vendored
View file

@ -1,9 +1,9 @@
# Closer to MOP is a compatibility layer that rectifies many of the
# absent or incorrect CLOS MOP features across a broad range of Common
# Lisp implementations
{ depot, ... }:
{ depot, pkgs, ... }:
let src = depot.third_party.fetchFromGitHub {
let src = pkgs.fetchFromGitHub {
owner = "pcostanza";
repo = "closer-mop";
rev = "e1d1430524086709a7ea8e0eede6849aa29d6276";

10
third_party/lisp/drakma.nix vendored
View file

@ -1,15 +1,13 @@
# Drakma is an HTTP client for Common Lisp.
{ depot, ... }:
{ depot, pkgs, ... }:
with depot.nix;
let src = depot.third_party.fetchFromGitHub {
let src = pkgs.fetchFromGitHub {
owner = "edicl";
repo = "drakma";
rev = "87feb02bef00b11a753d5fb21a5fec526b0d0bbb";
sha256 = "01b80am2vrw94xmdj7f21qm7p5ys08mmpzv4nc4icql81hqr1w2m";
};
in buildLisp.library {
in depot.nix.buildLisp.library {
name = "drakma";
deps = with depot.third_party.lisp; [
chipz
@ -20,7 +18,7 @@ in buildLisp.library {
flexi-streams
puri
usocket
(buildLisp.bundled "asdf")
(depot.nix.buildLisp.bundled "asdf")
];
srcs = map (f: src + ("/" + f)) [

4
third_party/lisp/hunchentoot.nix vendored
View file

@ -1,8 +1,8 @@
# Hunchentoot is a web framework for Common Lisp.
{ depot, ...}:
{ depot, pkgs, ...}:
let
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "edicl";
repo = "hunchentoot";
rev = "585b45b6b873f2da421fdf456b61860ab5868207";

4
third_party/lisp/lisp-binary.nix vendored
View file

@ -1,7 +1,7 @@
# A library to easily read and write complex binary formats.
{ depot, ... }:
{ depot, pkgs, ... }:
let src = depot.third_party.fetchFromGitHub {
let src = pkgs.fetchFromGitHub {
owner = "j3pic";
repo = "lisp-binary";
rev = "1aefc8618b7734f68697ddf59bc93cb8522aa0bf";

4
third_party/lisp/local-time.nix vendored
View file

@ -1,7 +1,7 @@
# Library for manipulating dates & times
{ depot, ... }:
{ depot, pkgs, ... }:
let src = depot.third_party.fetchFromGitHub {
let src = pkgs.fetchFromGitHub {
owner = "dlowe-net";
repo = "local-time";
rev = "dc54f61415c76ee755a6f69d4154a3a282f2789f";

4
third_party/lisp/md5.nix vendored
View file

@ -1,9 +1,9 @@
# MD5 hash implementation
{ depot, ... }:
{ depot, pkgs, ... }:
with depot.nix;
let src = depot.third_party.fetchFromGitHub {
let src = pkgs.fetchFromGitHub {
owner = "pmai";
repo = "md5";
rev = "b1412600f60d526ee34a7ba1596ec483da7894ab";

4
third_party/lisp/moptilities.nix vendored
View file

@ -1,7 +1,7 @@
# Compatibility layer for minor MOP implementation differences
{ depot, ... }:
{ depot, pkgs, ... }:
let src = depot.third_party.fetchFromGitHub {
let src = pkgs.fetchFromGitHub {
owner = "gwkkwg";
repo = "moptilities";
rev = "a436f16b357c96b82397ec018ea469574c10dd41";

6
third_party/lisp/postmodern.nix vendored
View file

@ -12,7 +12,7 @@ let
cl-postgres = depot.nix.buildLisp.library {
name = "cl-postgres";
deps = with pkgs.lisp; [
deps = with depot.third_party.lisp; [
md5
split-sequence
ironclad
@ -44,7 +44,7 @@ let
s-sql = depot.nix.buildLisp.library {
name = "s-sql";
deps = with pkgs.lisp; [
deps = with depot.third_party.lisp; [
cl-postgres
alexandria
];
@ -58,7 +58,7 @@ let
postmodern = depot.nix.buildLisp.library {
name = "postmodern";
deps = with pkgs.lisp; [
deps = with depot.third_party.lisp; [
alexandria
cl-postgres
s-sql

4
third_party/lisp/puri.nix vendored
View file

@ -1,7 +1,7 @@
# Portable URI library
{ depot, ... }:
{ depot, pkgs, ... }:
let src = depot.third_party.fetchgit {
let src = pkgs.fetchgit {
url = "http://git.kpe.io/puri.git";
rev = "4bbab89d9ccbb26346899d1f496c97604fec567b";
sha256 = "0gq2rsr0aihs0z20v4zqvmdl4szq53b52rh97pvnmwrlbn4mapmd";

4
third_party/lisp/rfc2388.nix vendored
View file

@ -1,7 +1,7 @@
# Implementation of RFC2388 (multipart/form-data)
{ depot, ... }:
{ depot, pkgs, ... }:
let src = depot.third_party.fetchFromGitHub {
let src = pkgs.fetchFromGitHub {
owner = "jdz";
repo = "rfc2388";
rev = "591bcf7e77f2c222c43953a80f8c297751dc0c4e";

4
third_party/lisp/s-sysdeps.nix vendored
View file

@ -1,7 +1,7 @@
# A Common Lisp abstraction layer over platform dependent functionality.
{ depot, ... }:
{ depot, pkgs, ... }:
let src = depot.third_party.fetchFromGitHub {
let src = pkgs.fetchFromGitHub {
owner = "svenvc";
repo = "s-sysdeps";
rev = "d28246b5dffef9e73a0e0e6cfbc4e878006fe34d";

2
third_party/lisp/trivial-ldap.nix vendored
View file

@ -9,7 +9,7 @@ let src = pkgs.fetchFromGitHub {
in depot.nix.buildLisp.library {
name = "trivial-ldap";
deps = with pkgs.lisp; [
deps = with depot.third_party.lisp; [
usocket
cl-plus-ssl
cl-yacc

2
third_party/lisp/uax-15.nix vendored
View file

@ -16,7 +16,7 @@ let
in depot.nix.buildLisp.library {
name = "uax-15";
deps = with pkgs.lisp; [
deps = with depot.third_party.lisp; [
split-sequence
cl-ppcre
(bundled "uiop")

4
third_party/lisp/unix-opts.nix vendored
View file

@ -1,8 +1,8 @@
# unix-opts is a portable command line argument parser
{ depot, ...}:
{ depot, pkgs, ...}:
let
src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "libre-man";
repo = "unix-opts";
rev = "b805050b074bd860edd18cfc8776fdec666ec36e";

9
third_party/lisp/usocket.nix vendored
View file

@ -1,14 +1,15 @@
# Usocket is a portable socket library
{ depot, ... }:
{ depot, pkgs, ... }:
with depot.nix;
let
inherit (depot.nix) buildLisp;
let src = depot.third_party.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "usocket";
repo = "usocket";
rev = "fdf4fd1e0051ce83340ccfbbc8a43a462bb19cf2";
sha256 = "0x746wr2324l6bn7skqzgkzcbj5kd0zp2ck0c8rldrw0rzabg826";
};
};
in buildLisp.library {
name = "usocket";
deps = with depot.third_party.lisp; [

1
third_party/nixpkgs-exposed/exposed/default.nix vendored
View file

@ -113,6 +113,7 @@
pandoc
pango
parallel
path
pkgconfig
pkgsCross
plantuml

4
third_party/protobuf/default.nix vendored
View file

@ -1,7 +1,7 @@
# Pin protobuf to version 3.12, with LLVM.
{ pkgs, ... }:
{ depot, pkgs, ... }:
pkgs.callPackage "${pkgs.nixpkgsSrc}/pkgs/development/libraries/protobuf/generic-v3.nix" {
pkgs.callPackage "${depot.third_party.nixpkgsSrc}/pkgs/development/libraries/protobuf/generic-v3.nix" {
version = "3.12.2";
sha256 = "1lp368aa206vpic9fmax4k6llnmf28plfvkkm4vqhgphmjqykvl2";
stdenv = pkgs.llvmPackages.libcxxStdenv;

2
third_party/rapidcheck/default.nix vendored
View file

@ -1,6 +1,6 @@
{ pkgs, ... }:
(pkgs.callPackage "${pkgs.nixpkgsSrc}/pkgs/development/libraries/rapidcheck" {
(pkgs.callPackage "${pkgs.path}/pkgs/development/libraries/rapidcheck" {
stdenv = pkgs.llvmPackages.libcxxStdenv;
}).overrideAttrs (attrs: rec {
# follows the versioning scheme of nixpkgs, since rapidcheck does not

4
third_party/rust-crates/default.nix vendored
View file

@ -1,10 +1,10 @@
{ depot, ... }:
{ depot, pkgs, ... }:
let
buildRustCrate = attrs@{
edition ? "2018",
...
}: depot.third_party.buildRustCrate (attrs // {
}: pkgs.buildRustCrate (attrs // {
inherit
edition
;

7
tools/nsfv-setup/default.nix
View file

@ -10,10 +10,11 @@
#
# If this script is run while an NSFV sink exists, the existing sink
# will first be removed.
{ pkgs, ... }:
{ depot, pkgs, ... }:
let
inherit (pkgs) ripgrep pulseaudio nsfv;
inherit (pkgs) ripgrep pulseaudio;
inherit (depot.third_party) nsfv;
in pkgs.writeShellScriptBin "nsfv-setup" ''
export PATH="${ripgrep}/bin:${pulseaudio}/bin:$PATH"
@ -23,5 +24,5 @@ in pkgs.writeShellScriptBin "nsfv-setup" ''
SINK=$(${pulseaudio}/bin/pacmd info | ${ripgrep}/bin/rg -r '$1' '^Default sink name: (.*)$')
echo "Setting up NSFV filtering to sink ''${SINK}"
${pulseaudio}/bin/pacmd load-module module-ladspa-sink sink_name=NSFV sink_master=''${SINK} label=noise_suppressor_mono plugin=${pkgs.nsfv}/lib/ladspa/librnnoise_ladspa.so control=42 rate=48000
${pulseaudio}/bin/pacmd load-module module-ladspa-sink sink_name=NSFV sink_master=''${SINK} label=noise_suppressor_mono plugin=${nsfv}/lib/ladspa/librnnoise_ladspa.so control=42 rate=48000
''