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

fix(wpcarro/nix): Remove <briefcase> references

Browse source 
Angle-bracketed references are a Nix anti-pattern, and thankfully this
repository enforces this as a standard.

TL;DR:
- Drop angle-bracketed references
- Change `briefcase` -> `users.wpcarro`
- Fix any resulting regressions
- Fix //users/wpcarro/tools/simple_vim
- Mark //users/wpcarro/boilerplate/typescript and related projects
  as broken
- drop .skip-subtree file, enabling depot CI

Change-Id: I7153cbabafa617bfd6b199370cbec65cb75441f6
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4325
Tested-by: BuildkiteCI
Reviewed-by: wpcarro <wpcarro@gmail.com>
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: grfn <grfn@gws.fyi>
Autosubmit: wpcarro <wpcarro@gmail.com>
This commit is contained in:
William Carroll 2021-12-13 19:51:48 -08:00 • committed by clbot
parent 38ec27e834
commit b6d143e5d2
53 changed files with 151 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

7
users/wpcarro/website/blog/shell.nix
View file

@ -1,7 +1,6 @@
let
briefcase = import <briefcase> {};
pkgs = briefcase.third_party.pkgs;
in pkgs.mkShell {
{ pkgs, ... }:
pkgs.mkShell {
buildInputs = with pkgs; [
hugo
];

4
users/wpcarro/website/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, briefcase, ... }:
{ pkgs, depot, ... }:
pkgs.stdenv.mkDerivation {
name = "wpcarro.dev";
@ -8,6 +8,6 @@ pkgs.stdenv.mkDerivation {
cp $src/index.html $out
mkdir -p $out/habits
cp -r ${briefcase.website.habit-screens} $out/habits/index.html
cp -r ${depot.users.wpcarro.website.habit-screens} $out/habits/index.html
'';
}

7
users/wpcarro/website/goals/shell.nix
View file

@ -1,7 +1,6 @@
let
briefcase = import <briefcase> {};
pkgs = briefcase.third_party.pkgs;
in pkgs.mkShell {
{ pkgs, ... }:
pkgs.mkShell {
buildInputs = with pkgs; [
nodejs
yarn

9
users/wpcarro/website/habit-screens/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs ? <nixpkgs> , ... }:
{ pkgs, ... }:
with pkgs;
@ -16,9 +16,9 @@ let
inherit name src;
buildInputs = [ elmPackages.elm ]
++ lib.optional outputJavaScript nodePackages_10_x.uglify-js;
++ lib.optional outputJavaScript nodePackages.uglify-js;
buildPhase = pkgs.elmPackages.fetchElmDeps {
buildPhase = elmPackages.fetchElmDeps {
elmPackages = import srcs;
elmVersion = "0.19.1";
inherit registryDat;
@ -35,7 +35,7 @@ let
${lib.optionalString outputJavaScript ''
echo "minifying ${elmfile module}"
uglifyjs $out/${module}.${extension} --compress 'pure_funcs="F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9",pure_getters,keep_fargs=false,unsafe_comps,unsafe' \
| uglifyjs --mangle --output=$out/${module}.min.${extension}
| uglifyjs --mangle --output $out/${module}.min.${extension}
''}
'') targets)}
'';
@ -58,4 +58,3 @@ in stdenv.mkDerivation {
'';
dontInstall = true;
}

7
users/wpcarro/website/habit-screens/shell.nix
View file

@ -1,7 +1,6 @@
let
briefcase = import <briefcase> {};
pkgs = briefcase.third_party.pkgs;
in pkgs.mkShell {
{ pkgs, ... }:
pkgs.mkShell {
buildInputs = with pkgs.elmPackages; [
elm
elm-format

5
users/wpcarro/website/sandbox/contentful/default.nix
View file

@ -11,9 +11,14 @@ pkgs.stdenv.mkDerivation {
# parcel.js needs number of CPUs
PARCEL_WORKERS = "1";
buildPhase = ''
export HOME="."
npx parcel build index.html
'';
installPhase = ''
mv dist $out
'';
# TODO(wpcarro): This doesn't build at all.
meta.ci = false;
}

7
users/wpcarro/website/sandbox/contentful/shell.nix
View file

@ -1,7 +1,6 @@
let
briefcase = import <briefcase> {};
pkgs = briefcase.third_party.pkgs;
in pkgs.mkShell {
{ pkgs, ... }:
pkgs.mkShell {
buildInputs = with pkgs; [
nodejs
yarn

7
users/wpcarro/website/sandbox/covid-uk/shell.nix
View file

@ -1,7 +1,6 @@
let
briefcase = import <briefcase> {};
pkgs = briefcase.third_party.pkgs;
in pkgs.mkShell {
{ pkgs, ... }:
pkgs.mkShell {
buildInputs = with pkgs; [
yarn
nodejs

4
users/wpcarro/website/sandbox/default.nix.ignore
View file

@ -1,4 +1,4 @@
{ pkgs, briefcase, ... }:
{ pkgs, ... }:
pkgs.stdenv.mkDerivation {
name = "covid-uk";
@ -7,7 +7,7 @@ pkgs.stdenv.mkDerivation {
buildPhase = ''
mkdir -p $out
cp $src/index.html $out
cp -r ${briefcase.website.sandbox.covid-uk} $out/covid-uk
cp -r ${depot.users.wpcarro.website.sandbox.covid-uk} $out/covid-uk
'';
dontInstall = true;
}

8
users/wpcarro/website/sandbox/learnpianochords/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs ? <nixpkgs>, ... }:
{ pkgs, ... }:
with pkgs;
@ -16,9 +16,9 @@ let
inherit name src;
buildInputs = [ elmPackages.elm ]
++ lib.optional outputJavaScript nodePackages_10_x.uglify-js;
++ lib.optional outputJavaScript nodePackages.uglify-js;
buildPhase = pkgs.elmPackages.fetchElmDeps {
buildPhase = elmPackages.fetchElmDeps {
elmPackages = import srcs;
elmVersion = "0.19.1";
inherit registryDat;
@ -35,7 +35,7 @@ let
${lib.optionalString outputJavaScript ''
echo "minifying ${elmfile module}"
uglifyjs $out/${module}.${extension} --compress 'pure_funcs="F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9",pure_getters,keep_fargs=false,unsafe_comps,unsafe' \
| uglifyjs --mangle --output=$out/${module}.min.${extension}
| uglifyjs --mangle --output $out/${module}.min.${extension}
''}
'') targets)}
'';

7
users/wpcarro/website/sandbox/learnpianochords/shell.nix
View file

@ -1,7 +1,6 @@
let
briefcase = import <briefcase> {};
pkgs = briefcase.third_party.pkgs;
in pkgs.mkShell {
{ pkgs, ... }:
pkgs.mkShell {
buildInputs = with pkgs.elmPackages; [
elm
elm-format

6
users/wpcarro/website/sandbox/learnpianochords/src/server/default.nix
View file

@ -1,6 +1,6 @@
let
briefcase = import <briefcase> {};
in briefcase.buildHaskell.program {
{ depot, ... }:
depot.users.wpcarro.buildHaskell.program {
name = "server";
srcs = builtins.path {
path = ./.;

6
users/wpcarro/website/sandbox/learnpianochords/src/server/shell.nix
View file

@ -1,6 +1,6 @@
let
briefcase = import <briefcase> {};
in briefcase.buildHaskell.shell {
{ depot, ... }:
depot.users.wpcarro.buildHaskell.shell {
deps = hpkgs: with hpkgs; [
hspec
servant-server