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: a58404485592
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: 63b1eabcdb39
Choose a head ref
  • 18 commits
  • 14 files changed
  • 11 contributors

Commits on Jan 26, 2020

  1. vips: 8.8.4 -> 8.9.0

    r-ryantm committed Jan 26, 2020
    Copy the full SHA
    61a6a60 View commit details

Commits on Jan 27, 2020

  1. Copy the full SHA
    e29829b View commit details
  2. Merge pull request #78631 from r-ryantm/auto-update/python2.7-identify

    python27Packages.identify: 1.4.9 -> 1.4.10
    lsix authored Jan 27, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ae9809b View commit details
  3. Copy the full SHA
    c0ed884 View commit details
  4. nixos/doc: add a section mentioning GitHub team for nixos release man…

    …agers (#78625)
    
    * nixos/doc: add a section mentioning GitHub team for nixos release managers
    
    This team should be kept up-to-date with each release.
    
    Previously this info had to be grepped from appropriate Discourse thread.
    
    Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
    danbst and worldofpeace committed Jan 27, 2020
    Copy the full SHA
    31601a3 View commit details
  5. Merge pull request #78544 from r-ryantm/auto-update/vips

    vips: 8.8.4 -> 8.9.0
    ryantm authored Jan 27, 2020
    Copy the full SHA
    752639c View commit details
  6. Copy the full SHA
    5e46d5a View commit details
  7. nixos/release: rename iso_graphical to iso_plasma5

    And all the other things and paths to match it
    worldofpeace committed Jan 27, 2020
    Copy the full SHA
    0f2536f View commit details
  8. conmon: 2.0.9 -> 2.0.10

    zowoq committed Jan 27, 2020
    Copy the full SHA
    5bee42b View commit details
  9. Copy the full SHA
    f2d6f56 View commit details
  10. Merge pull request #66640 from worldofpeace/iso-gnome3

    rename iso_graphical to iso_plasma5
    edolstra authored Jan 27, 2020
    Copy the full SHA
    40f3bf6 View commit details
  11. timetable: 1.0.9 -> 1.1.0

    xiorcale committed Jan 27, 2020
    Copy the full SHA
    0c40662 View commit details
  12. python27Packages.braintree: 3.57.1 -> 3.58.0

    r-ryantm authored and Jon committed Jan 27, 2020
    Copy the full SHA
    de84b23 View commit details
  13. python27Packages.mozdevice: 3.0.6 -> 3.0.7

    r-ryantm authored and Jon committed Jan 27, 2020
    Copy the full SHA
    403813d View commit details
  14. Merge pull request #78632 from anderslundstedt/master

    spotifyd: 0.2.23 -> 0.2.24
    marsam authored Jan 27, 2020
    Copy the full SHA
    caaec19 View commit details
  15. Merge pull request #78639 from r-ryantm/auto-update/python3.7-django-…

    …modelcluster
    
    python37Packages.django_modelcluster: 5.0 -> 5.0.1
    marsam authored Jan 27, 2020
    Copy the full SHA
    e5a015b View commit details
  16. Merge pull request #78637 from zowoq/conmon

    conmon: 2.0.9 -> 2.0.10
    marsam authored Jan 27, 2020
    Copy the full SHA
    3fd22de View commit details

Commits on Jan 28, 2020

  1. Merge pull request #78641 from kjuvi/timetable

    timetable: 1.0.9 -> 1.1.0
    worldofpeace authored Jan 28, 2020
    Copy the full SHA
    63b1eab View commit details
6 changes: 5 additions & 1 deletion nixos/doc/manual/development/releases.xml
Original file line number Diff line number Diff line change
@@ -187,7 +187,7 @@
</listitem>
<listitem>
<para>
Update "Chapter 4. Upgrading NixOS" section of the manual to match
Update "Chapter 4. Upgrading NixOS" section of the manual to match
new stable release version.
</para>
</listitem>
@@ -236,6 +236,10 @@
introduced to their role, making it easier to pass on knowledge and
experience.
</para>
<para>
Release managers for the current NixOS release are tracked by GitHub team
<link xlink:href="https://github.com/orgs/NixOS/teams/nixos-release-managers/members"><literal>@NixOS/nixos-release-managers</literal></link>.
</para>
<para>
A release manager's role and responsibilities are:
</para>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ pkgs, ... }:

{
imports = [ ./installation-cd-graphical-kde.nix ];
imports = [ ./installation-cd-graphical-plasma5.nix ];

boot.kernelPackages = pkgs.linuxPackages_latest;
}
2 changes: 1 addition & 1 deletion nixos/release-combined.nix
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ in rec {
(all nixos.dummy)
(all nixos.manual)

nixos.iso_graphical.x86_64-linux or []
nixos.iso_plasma5.x86_64-linux or []
nixos.iso_minimal.aarch64-linux or []
nixos.iso_minimal.i686-linux or []
nixos.iso_minimal.x86_64-linux or []
6 changes: 3 additions & 3 deletions nixos/release.nix
Original file line number Diff line number Diff line change
@@ -149,9 +149,9 @@ in rec {
inherit system;
});

iso_graphical = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-graphical-kde.nix;
type = "graphical";
iso_plasma5 = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix;
type = "plasma5";
inherit system;
});

6 changes: 3 additions & 3 deletions pkgs/applications/audio/spotifyd/default.nix
Original file line number Diff line number Diff line change
@@ -6,16 +6,16 @@

rustPlatform.buildRustPackage rec {
pname = "spotifyd";
version = "0.2.23";
version = "0.2.24";

src = fetchFromGitHub {
owner = "Spotifyd";
repo = "spotifyd";
rev = "v${version}";
sha256 = "0xxr21avgr4pvlr5vgb68jmad5xy5kqvaxfzh0qn1jpiax7y3avm";
sha256 = "08i0zm7kgprixqjpgaxk7xid1njgj6lmi896jf9fsjqzdzlblqk8";
};

cargoSha256 = "1ykmn7zzwn9my96bbxwkparab5lck1zzdkpafil2mmrjyvyi40da";
cargoSha256 = "0kl8xl2qhzf8wb25ajw59frgym62lkg7p72d8z0xmkqjjcg2nyib";

cargoBuildFlags = [
"--no-default-features"
Original file line number Diff line number Diff line change
@@ -10,38 +10,22 @@
with lib;

# Main reference:
# - This package is based on the Arch package:
# - This package was originally based on the Arch package but all patches are now upstreamed:
# https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/telegram-desktop
# Other references that could be useful (but we should try to stick to Arch):
# Other references that could be useful:
# - https://git.alpinelinux.org/aports/tree/testing/telegram-desktop/APKBUILD
# - https://github.com/void-linux/void-packages/blob/master/srcpkgs/telegram-desktop/template

mkDerivation rec {
pname = "telegram-desktop";
version = "1.9.8";
# Note: Due to our strong dependency on the Arch patches it's probably best
# to also wait for the Arch update (especially if the patches don't apply).

# Telegram-Desktop with submodules
src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
sha256 = "1rq3180l4ly0n0jj08cxy9l2d07scwp9hasmliva2xspyv7i9ksd";
};

# Arch patches (svn export telegram-desktop/trunk)
archPatches = fetchsvn {
url = "svn://svn.archlinux.org/community/telegram-desktop/trunk";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
rev = "554983";
sha256 = "02gk5dlrmxvyl7w1yxmwclknk1k9drpx6rxqc6vmmw85l763m95j";
};

# Note: It would be best if someone could get as many patches upstream as
# possible (we currently depend a lot on custom patches...).
patches = [
"${archPatches}/0005-Use-system-wide-fonts.patch"
];

postPatch = ''
substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
--replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
@@ -66,9 +50,9 @@ mkDerivation rec {

cmakeFlags = [
"-Ddisable_autoupdate=ON"
#"-DTDESKTOP_API_TEST=ON" # TODO: Officiall API credentials for Nixpkgs
"-DTDESKTOP_API_ID=17349" # See: https://github.com/NixOS/nixpkgs/issues/55271
"-DTDESKTOP_API_HASH=344583e45741c457fe1862106095a5eb"
# TODO: Officiall API credentials for Nixpkgs
# (see: https://github.com/NixOS/nixpkgs/issues/55271):
"-DTDESKTOP_API_TEST=ON"
"-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF"
"-DDESKTOP_APP_USE_PACKAGED=ON"
"-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF"
4 changes: 2 additions & 2 deletions pkgs/applications/office/timetable/default.nix
Original file line number Diff line number Diff line change
@@ -16,13 +16,13 @@

stdenv.mkDerivation rec {
pname = "timetable";
version = "1.0.9";
version = "1.1.0";

src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
sha256 = "1n02y7vpi4lb888iic06xifc86n2xirk50s1ssf84vlc5md1kq9f";
sha256 = "12c8kdrbz6x2mlrvr0nq9y5khj0qiiwlxf7aqc2z3dnrawjgy1rb";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/conmon/default.nix
Original file line number Diff line number Diff line change
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
project = "conmon";
name = "${project}-${version}";
version = "2.0.9";
version = "2.0.10";

src = fetchFromGitHub {
owner = "containers";
repo = project;
rev = "v${version}";
sha256 = "0wy3nihif9ih62rlskrjysshfaxdl878fj5ni1zfb9db4nsx6z0m";
sha256 = "194wach3yrkvll2xaj0x77hzlngk2016mflgnd5k8knjn2b9dgvl";
};

nativeBuildInputs = [ pkgconfig ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/braintree/default.nix
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@

buildPythonPackage rec {
pname = "braintree";
version = "3.57.1";
version = "3.58.0";

src = fetchPypi {
inherit pname version;
sha256 = "1g5w733dim3rc6hwklvknnxqkradjwip728i77pbsw5ihgdxahhi";
sha256 = "0n8k9m3kifj34rzi2a3jgjsik91w8z32xaaxcmvqs7x8m5m3kjj4";
};

propagatedBuildInputs = [ requests ];
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@

buildPythonPackage rec {
pname = "django-modelcluster";
version = "5.0";
version = "5.0.1";

src = fetchPypi {
inherit pname version;
sha256 = "0zcn1b0lp9dg6xvz8p8v1hrrgqj71izqalqz2dp1nz5rbj3s34x2";
sha256 = "1fk7fh30i0fzi0hjd841vxh25iryvgp4lirmxfpq428w4nq7p1bg";
};

disabled = pythonOlder "3.5";
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/identify/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "identify";
version = "1.4.9";
version = "1.4.10";

src = fetchPypi {
inherit pname version;
sha256 = "6f44e637caa40d1b4cb37f6ed3b262ede74901d28b1cc5b1fc07360871edd65d";
sha256 = "0q1k22n8w7mmab1vh2r3bsqbxkxbb2zka548rcnn2rd9yg8rxnca";
};

# Tests not included in PyPI tarball
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@

buildPythonPackage rec {
pname = "mozdevice";
version = "3.0.6";
version = "3.0.7";
format = "wheel";

src = fetchPypi {
inherit pname version;
sha256 = "1gw2lk16fz2n1953i29hgw47s2h0c6z911zzg8am1in8qq2318xv";
sha256 = "1n7l3drdh3rm3320v98c9hhh37ljk9l861hyw18psca7jdd717n5";
format = "wheel";
};

4 changes: 2 additions & 2 deletions pkgs/tools/graphics/vips/default.nix
Original file line number Diff line number Diff line change
@@ -10,13 +10,13 @@

stdenv.mkDerivation rec {
pname = "vips";
version = "8.8.4";
version = "8.9.0";

src = fetchFromGitHub {
owner = "libvips";
repo = "libvips";
rev = "v${version}";
sha256 = "1gw8srjf5r6dhg6g5hh91if302mcr44dzy87mv230ar7027kwwbi";
sha256 = "0x61vnfnqv53pnp52nx610470x7pzdjbkqzk8wlc8i6cc2cg7f91";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''