Skip to content
This repository was archived by the owner on Feb 27, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
sudo: required
services:
- docker
language: nix
branches:
only:
- master
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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`_

Expand Down
10 changes: 4 additions & 6 deletions default.nix
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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
Expand Down
61 changes: 0 additions & 61 deletions importFromGithub.nix

This file was deleted.

10 changes: 0 additions & 10 deletions nix-build-docker

This file was deleted.

6 changes: 0 additions & 6 deletions nixpkgs-python.json

This file was deleted.

6 changes: 0 additions & 6 deletions nixpkgs.json

This file was deleted.

9 changes: 9 additions & 0 deletions nixpkgs.nix
Original file line number Diff line number Diff line change
@@ -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 = []; }
9 changes: 0 additions & 9 deletions travis-build

This file was deleted.