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: 106db715f9d7
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: 0125544e2a05
Choose a head ref

Commits on Mar 11, 2019

  1. Copy the full SHA
    3df55b8 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e1e5df6 View commit details

Commits on Mar 15, 2019

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    eb55e51 View commit details

Commits on Mar 16, 2019

  1. odyssey: init at 2019-03-12

    marsam committed Mar 16, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    fef17b1 View commit details
  2. homebank: 5.2.2 -> 5.2.3

    pSub committed Mar 16, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    2720185 View commit details
  3. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    92ed05b View commit details
  4. python.pkgs.pyzmq: disable flaky test

    Recently failed on staging.
    timokau committed Mar 16, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    4f2d842 View commit details
  5. ghc: switch our default compiler to version 8.6.4

    Also, drop obsolete 8.6.x minor releases 8.6.1, 8.6.2, and 8.6.3.
    
    (cherry picked from commit 7fde42b)
    peti committed Mar 16, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    c0deaddict Jos van Bakel
    Copy the full SHA
    93e4a90 View commit details
  6. LTS Haskell 13.13

    (cherry picked from commit fee2f97)
    peti committed Mar 16, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Copy the full SHA
    2df9351 View commit details
  7. hackage-packages.nix: automatic Haskell package set update

    This update was generated by hackage2nix v2.14.2-3-gea0f0ca from Hackage revision
    commercialhaskell/all-cabal-hashes@faa5a05.
    peti committed Mar 16, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b514a6d View commit details
  8. haskell-pandoc: update overrides for the new 2.7.1 version

    (cherry picked from commit 96c7ea5)
    peti committed Mar 16, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Mic92 Jörg Thalheim
    Copy the full SHA
    bdd4e11 View commit details
  9. hedgewars: disable broken build

    (cherry picked from commit 7a1432f)
    peti committed Mar 16, 2019
    Copy the full SHA
    c333861 View commit details
  10. vaultenv: disable broken build

    (cherry picked from commit 3642a3a)
    peti committed Mar 16, 2019
    Copy the full SHA
    26073f4 View commit details
  11. Merge pull request #57678 from dtzWill/update/ibm-plex-1.3.0

    ibm-plex: 1.2.3 -> 1.3.0
    dywedir authored Mar 16, 2019
    Copy the full SHA
    db4f3b1 View commit details
  12. jcal: init at 0.4.1

    LinArcX committed Mar 16, 2019
    Copy the full SHA
    c3e17e7 View commit details
  13. Copy the full SHA
    f7ad3e8 View commit details
  14. Merge pull request #57764 from timokau/pyzmq-upgrade

     python.pkgs.pyzmq: 17.1.3 -> 18.0.1, disable flaky test
    timokau authored Mar 16, 2019
    Copy the full SHA
    e6fc8c7 View commit details
  15. Merge pull request #57760 from LinArcX/jcal

    jcal: init at 0.4.1
    srhb authored Mar 16, 2019
    Copy the full SHA
    44b5166 View commit details
  16. qiv: 2.3.1 -> 2.3.2 (#57729)

    fare authored and xeji committed Mar 16, 2019
    Copy the full SHA
    4b00757 View commit details
  17. Merge pull request #57753 from NixOS/update-homebank

    homebank: 5.2.2 -> 5.2.3
    xeji authored Mar 16, 2019
    Copy the full SHA
    0d88ab8 View commit details
  18. Merge pull request #57411 from srhb/mitmproxy-wsproto-update

    mitmproxy: wsproto and pytest fixes
    xeji authored Mar 16, 2019
    Copy the full SHA
    88ffb73 View commit details
  19. yarn: 1.14.0 -> 1.15.2 (#57727)

    dywedir authored and xeji committed Mar 16, 2019
    Copy the full SHA
    b9ebc84 View commit details

Commits on Mar 17, 2019

  1. Merge pull request #57576 from marsam/init-odyssey

    odyssey: init at 2019-03-12
    ryantm authored Mar 17, 2019
    Copy the full SHA
    5d5c24b View commit details
  2. bamf: add wrapGAppsHook

    worldofpeace committed Mar 17, 2019
    Copy the full SHA
    0125544 View commit details
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -2658,6 +2658,11 @@
github = "limeytexan";
name = "Michael Brantley";
};
linarcx = {
email = "linarcx@gmail.com";
github = "linarcx";
name = "Kaveh Ahangar";
};
linc01n = {
email = "git@lincoln.hk";
github = "linc01n";
5 changes: 3 additions & 2 deletions pkgs/applications/graphics/qiv/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, gtk2, imlib2, file, lcms2, libexif } :

stdenv.mkDerivation (rec {
version = "2.3.1";
version = "2.3.2";
name = "qiv-${version}";

src = fetchurl {
url = "https://spiegl.de/qiv/download/${name}.tgz";
sha256 = "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7";
sha256 = "1mc0f2nnas4q0d7zc9r6g4z93i32xlx0p9hl4fn5zkyml24a1q28";
};

nativeBuildInputs = [ pkgconfig ];
@@ -15,6 +15,7 @@ stdenv.mkDerivation (rec {
preBuild=''
substituteInPlace Makefile --replace /usr/local "$out"
substituteInPlace Makefile --replace /man/ /share/man/
substituteInPlace Makefile --replace /share/share/ /share/
'';

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/applications/office/homebank/default.nix
Original file line number Diff line number Diff line change
@@ -2,10 +2,10 @@
, hicolor-icon-theme, libsoup, gnome3 }:

stdenv.mkDerivation rec {
name = "homebank-5.2.2";
name = "homebank-5.2.3";
src = fetchurl {
url = "http://homebank.free.fr/public/${name}.tar.gz";
sha256 = "19cm49p2x6nwia2yvwj3fv7jxbhw0vx4bs1zqbfvdr5vzwgj5j5c";
sha256 = "1wdg86gwd0rc9m3mni9qlh746kxmjn4mk5q7fplxrcp2ajdcqr3a";
};

nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
6 changes: 3 additions & 3 deletions pkgs/data/fonts/ibm-plex/default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ lib, fetchzip }:

let
version = "1.2.3";
version = "1.3.0";
in fetchzip rec {
name = "ibm-plex-${version}";
url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
postFetch = ''
mkdir -p $out/share/fonts
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype
'';
sha256 = "16vmby2svr4q0lvsnrpxzmhkb6yv84x2jg6jccaj7x9vq56b4adg";
sha256 = "1xjvxyp7h1f7m82800m3q71hksddh25c9a9vnr3r070ppi19s5fc";

meta = with lib; {
description = "IBM Plex Typeface";
2 changes: 1 addition & 1 deletion pkgs/development/compilers/elm/default.nix
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

let
fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };
hsPkgs = haskell.packages.ghc863.override {
hsPkgs = haskell.packages.ghc864.override {
overrides = self: super: with haskell.lib;
let elmPkgs = {
elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: {
235 changes: 0 additions & 235 deletions pkgs/development/compilers/ghc/8.6.3.nix

This file was deleted.

4 changes: 2 additions & 2 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
@@ -1218,8 +1218,8 @@ self: super: {

# Use latest pandoc despite what LTS says.
# Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309.
pandoc = doDistribute super.pandoc_2_7;
pandoc-citeproc = self.pandoc-citeproc_0_16_1_3;
pandoc = doDistribute super.pandoc_2_7_1;
pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_1_3;

# https://github.com/qfpl/tasty-hedgehog/issues/24
tasty-hedgehog = dontCheck super.tasty-hedgehog;
Loading