Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ad4deefa9f59
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f52e3212cb43
Choose a head ref

Commits on Jul 6, 2020

  1. flake.nix: add armv6l/armv7l systems

    We built at least armv7l on hydra, therefor nixpkgs should also expose it.
    Mic92 committed Jul 6, 2020
    Copy the full SHA
    4c26d0e View commit details

Commits on Jul 21, 2020

  1. add github action to wait for ofborg

    In case ofborg is down this will not mark the CI as green.
    Also if other github actions are used and pass
    checks will be still marked as pending even if other other github
    actions have passed.
    Mic92 committed Jul 21, 2020
    Copy the full SHA
    4f95d1f View commit details

Commits on Jul 27, 2020

  1. Copy the full SHA
    3990d97 View commit details
  2. Copy the full SHA
    81ae934 View commit details

Commits on Jul 28, 2020

  1. newsflash: 1.0.1 -> 1.0.2

    - Removed cargo.lock.patch. Cargo.lock is now available upstream.
    
    - Removed gdk-pixbuf, glib & gsettings-desktop-schemas from
      buildInputs. They are propagated by gtk3.
    
    - Added gstreamer plugins to support audio & video.
    kira-bruneau committed Jul 28, 2020
    Copy the full SHA
    8e27513 View commit details
  2. hugo: 0.73.0 -> 0.74.3

    zowoq committed Jul 28, 2020
    Copy the full SHA
    283c8d4 View commit details
  3. caf: 0.17.5 -> 0.17.6

    r-ryantm committed Jul 28, 2020
    Copy the full SHA
    6b63705 View commit details
  4. Copy the full SHA
    2120bd4 View commit details
  5. Copy the full SHA
    eb627de View commit details
  6. ncdns: fix patch extension

    The incorrect extension was confusing my code search tool.
    lf- committed Jul 28, 2020
    Copy the full SHA
    231e74d View commit details
  7. Merge pull request #93963 from seqizz/g_typo_environment

    treewide: fix typo on word environment
    worldofpeace authored Jul 28, 2020
    Copy the full SHA
    654b66e View commit details
  8. Merge pull request #94042 from MetaDark/newsflash

    newsflash: 1.0.1 -> 1.0.2
    danieldk authored Jul 28, 2020
    Copy the full SHA
    f320c5d View commit details
  9. Copy the full SHA
    80b1900 View commit details
  10. Copy the full SHA
    50edd38 View commit details
  11. Copy the full SHA
    e6d83f4 View commit details
  12. Merge pull request #94057 from lf-/master

    ncdns: fix patch extension
    rnhmjoj authored Jul 28, 2020
    Copy the full SHA
    c36525e View commit details
  13. Merge pull request #94010 from jlesquembre/clojure

    clojure: 1.10.547 -> 1.10.590
    danieldk authored Jul 28, 2020
    Copy the full SHA
    d52d97d View commit details
  14. Merge pull request #94052 from zowoq/hugo

    hugo: 0.73.0 -> 0.74.3
    Br1ght0ne authored Jul 28, 2020
    Copy the full SHA
    e4aaad4 View commit details
  15. qutebrowser: fixup of 322d13e (#94046)

    Webkit should never be the default backend.
    rnhmjoj authored Jul 28, 2020
    Copy the full SHA
    98ebda6 View commit details
  16. Merge pull request #92423 from Mic92/arm-flakes

    flake.nix: add armv6l/armv7l systems
    Mic92 authored Jul 28, 2020
    Copy the full SHA
    55cd36a View commit details
  17. Merge pull request #93581 from Mic92/ofborg-wait

    add github action to wait for ofborg
    Mic92 authored Jul 28, 2020
    Copy the full SHA
    ece92ca View commit details
  18. Merge pull request #94058 from r-ryantm/auto-update/cmake-format

    cmake-format: 0.6.10 -> 0.6.11
    lsix authored Jul 28, 2020
    Copy the full SHA
    38f7e8e View commit details
  19. Merge pull request #93969 from RaghavSood/ethereum/1.9.18

    go-ethereum: 1.9.17 -> 1.9.18
    adisbladis authored Jul 28, 2020
    Copy the full SHA
    f52e321 View commit details
28 changes: 28 additions & 0 deletions .github/workflows/wait-ofborg.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: "Wait for ofborg"
on:
pull_request:
jobs:
tests:
runs-on: ubuntu-latest
steps:
- name: Wait for ofborg CI
run: |
# wait for ~10min
set -x
for i in $(seq 120); do
res=$(curl --silent \
-H "Accept: application/vnd.github.antiope-preview+json" \
-H "Authorization: token ${GITHUB_TOKEN}" \
"https://api.github.com/repos/NixOS/nixpkgs/commits/${COMMIT}/check-runs" | \
jq ".check_runs | map(.app) | map(.id) | contains([${OFBORG_APP_ID}])")
if [[ "$res" == "true" ]]; then
exit 0
fi
sleep 5
done
echo "Timeout!"
exit 1
env:
GITHUB_TOKEN: ${{ github.token }}
COMMIT: ${{ github.event.pull_request.head.sha }}
OFBORG_APP_ID: 20500
9 changes: 8 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
@@ -12,7 +12,14 @@

lib = import ./lib;

systems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ];
systems = [
"x86_64-linux"
"i686-linux"
"x86_64-darwin"
"aarch64-linux"
"armv6l-linux"
"armv7l-linux"
];

forAllSystems = f: lib.genAttrs systems (system: f system);

2 changes: 1 addition & 1 deletion nixos/modules/hardware/video/uvcvideo/default.nix
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ in
Whether to enable <command>uvcvideo</command> dynamic controls.
Note that enabling this brings the <command>uvcdynctrl</command> tool
into your environement and register all dynamic controls from
into your environment and register all dynamic controls from
specified <command>packages</command> to the <command>uvcvideo</command> driver.
'';
};
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/skydns.nix
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ in {
extraConfig = mkOption {
default = {};
type = types.attrsOf types.str;
description = "Skydns attribute set of extra config options passed as environemnt variables.";
description = "Skydns attribute set of extra config options passed as environment variables.";
};
};

6 changes: 3 additions & 3 deletions pkgs/applications/blockchains/go-ethereum.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildGoModule rec {
pname = "go-ethereum";
version = "1.9.17";
version = "1.9.18";

src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "175cy5cqkdhvh3kv2d0madybbz2sdbgxhm8xfb3ydbaf2hzihxmx";
sha256 = "0nkzwmrzk0m9662cr18h5i54v07mw8v3fh0csvqx8n50z5fcvb7b";
};

usb = fetchFromGitHub {
@@ -18,7 +18,7 @@ buildGoModule rec {
sha256 = "0asd5fz2rhzkjmd8wjgmla5qmqyz4jaa6qf0n2ycia16jsck6wc2";
};

vendorSha256 = "0w2214fllw93xbrlxayhl014aqbjsc8zz7mpik7w5b26m60hn5kr";
vendorSha256 = "13wh6r9zi5qw72xkbzy3mcgn7lv9l981x4lniypjbnkwhq2dj5iz";

overrideModAttrs = (_: {
postBuild = ''
10 changes: 4 additions & 6 deletions pkgs/applications/misc/hugo/default.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{ stdenv, buildGoModule, fetchFromGitHub, libsass }:
{ stdenv, buildGoModule, fetchFromGitHub }:

buildGoModule rec {
pname = "hugo";
version = "0.73.0";

buildInputs = [ libsass ];
version = "0.74.3";

src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
sha256 = "0qhv8kdv5k1xfk6106lxvsz7f92k7w6wk05ngz7qxbkb6zkcnshw";
sha256 = "0rikr4yrjvmrv8smvr8jdbcjqwf61y369wn875iywrj63pyr74r9";
};

golibsass = fetchFromGitHub {
@@ -27,7 +25,7 @@ buildGoModule rec {
'';
});

vendorSha256 = "07dkmrldsxw59v6r4avj1gr4hsaxybhb14qv61hc777qix2kq9v1";
vendorSha256 = "031k8bvca1pb1naw922vg5h95gnwp76dii1cjcs0b1qj93isdibk";

buildFlags = [ "-tags" "extended" ];

Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, libxslt, gst_all_1 ? null
, withPdfReader ? true
, withMediaPlayback ? true
, backend ? "webkit"
, backend ? "webengine"
}:

assert withMediaPlayback -> gst_all_1 != null;
Loading