danderson/ofborg
0
0
Fork 0
forked from the-distro/ofborg
Code Pull requests Activity

Remove nix1

Browse source 
As of NixOS/nixpkgs@7121160, nix1 has been removed from Nixpkgs. Thus, we
remove it here.
This commit is contained in:
Cole Helbling 2020-04-12 10:51:39 -07:00
parent b33d3de6cf
commit 35bb3a8975
No known key found for this signature in database
GPG key ID: B37E0F2371016A4C
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.travis.yml
View file

@ -4,10 +4,8 @@ sudo: true
matrix: matrix:
include: include:
- name: cargo pedantry - name: cargo pedantry
script: nix-shell --run checkPhase --arg useNix1 false -A mozilla-rust-overlay script: nix-shell --run checkPhase -A mozilla-rust-overlay
- name: checkPhase - Nix 2 - name: checkPhase
script: nix-shell --run checkPhase --arg useNix1 false script: nix-shell --run checkPhase
- name: checkPhase - Nix 1
script: nix-shell --run checkPhase --arg useNix1 true
- name: nix-build - name: nix-build
script: nix-build ./default.nix -A ofborg.rs -A ofborg.php script: nix-build ./default.nix -A ofborg.rs -A ofborg.php

6
shell.nix
View file

@ -2,7 +2,7 @@
overlays = [ overlays = [
(import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz)) (import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz))
]; ];
}, useNix1 ? false }: } }:
let let
# A random Nixpkgs revision *before* the default glibc # A random Nixpkgs revision *before* the default glibc
@ -29,8 +29,7 @@ let
php php
curl curl
bash bash
] ];
++ stdenv.lib.optional useNix1 oldpkgs.nix1;
# HISTFILE = "${src}/.bash_hist"; # HISTFILE = "${src}/.bash_hist";
}; };
@ -84,7 +83,6 @@ let
pkgconfig pkgconfig
git git
] ]
++ stdenv.lib.optional useNix1 oldpkgs.nix1
++ stdenv.lib.optional stdenv.isDarwin pkgs.darwin.Security; ++ stdenv.lib.optional stdenv.isDarwin pkgs.darwin.Security;
postHook = '' postHook = ''