Simplify CI and fix build

NixOS · Jul 25, 2018 · 645aaa6 · 645aaa6
1 parent b841f9e
commit 645aaa6
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 104 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,4 @@
-sudo: required
-services:
-  - docker
+language: nix
 branches:
   only:
   - master
@@ -19,7 +17,7 @@ script:
     echo "SITEURL = 'http://weekly.nixos.org'" >> pelicanconf.py;
     echo "WITH_FUTURE_DATES = True" >> pelicanconf.py;
   fi
-- ./travis-build -Q default.nix;
+- nix-build -Q default.nix;
 
 after_success:
 - env

diff --git a/content/2018/04-nixconf0218-nix-core-team-binary-cache-improvements.rst b/content/2018/04-nixconf0218-nix-core-team-binary-cache-improvements.rst
@@ -16,7 +16,7 @@ Wednesday in the morning (European timezone).
 You're more than welcome to submit new items with a short description
 on `latest pull request`_
 
-.. `latest pull request`: https://github.com/NixOS/nixos-weekly/pulls
+-.. _`latest pull request`: https://github.com/NixOS/nixos-weekly/pulls
 
 Domen
 
@@ -36,7 +36,7 @@ News
 
 - `Patreon to support the NixOS OfBorg infrastructure`_
 
-  This supports `@grhmc`_\'s infrastructure costs for the OfBorg tooling.
+  This supports Graham's infrastructure costs for the OfBorg tooling.
 
 - `Introducing the Nix Core Team`_
 

diff --git a/default.nix b/default.nix
@@ -1,6 +1,4 @@
-let importFromGithub = import ./importFromGithub.nix; in
-{ pkgs ? importFromGithub ./nixpkgs.json {}
-, pkgs-python ? importFromGithub ./nixpkgs-python.json { inherit pkgs; }
+{ pkgs ? import ./nixpkgs.nix
 }:
 
 pkgs.stdenv.mkDerivation {
@@ -9,9 +7,9 @@ pkgs.stdenv.mkDerivation {
     builtins.filterSource
       (path: type: baseNameOf path != "result")
       ./.;
-  buildInputs =
-    [ pkgs-python.pelican.packages.pelican
-      pkgs-python.pelican.packages.livereload
+  buildInputs = with pkgs.python3Packages;
+    [ pelican
+      livereload
     ];
   buildPhase = ''
     pelican

diff --git a/importFromGithub.nix b/importFromGithub.nix
diff --git a/nix-build-docker b/nix-build-docker
diff --git a/nixpkgs-python.json b/nixpkgs-python.json
diff --git a/nixpkgs.json b/nixpkgs.json
diff --git a/nixpkgs.nix b/nixpkgs.nix
@@ -0,0 +1,9 @@
+let
+  fetchTarball = { url, sha256 }@attrs:
+    if builtins.lessThan builtins.nixVersion "1.12"
+    then builtins.fetchTarball { inherit url; }
+    else builtins.fetchTarball attrs;
+in import (fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/b619e0b016c5c79920aa06b78ccf936e56eaf45d.tar.gz";
+  sha256 = "1bvnw9dvcbm69s9xbb2npx42zns6zq7jwang8d865pnzb0clf5sv";
+}) { config = {}; overlays = []; }
diff --git a/travis-build b/travis-build