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: b25633a6f9a1
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: dce0f4f69561
Choose a head ref
  • 6 commits
  • 5 files changed
  • 5 contributors

Commits on Mar 15, 2020

  1. postfix: 3.4.9 -> 3.4.10

    r-ryantm committed Mar 15, 2020
    Copy the full SHA
    5c20793 View commit details
  2. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    Copy the full SHA
    22228d1 View commit details
  3. stress-ng: 0.11.01 -> 0.11.02

    Ma27 committed Mar 15, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    Copy the full SHA
    12eef00 View commit details
  4. Verified

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

Commits on Mar 16, 2020

  1. Merge pull request #82663 from r-ryantm/auto-update/postfix

    postfix: 3.4.9 -> 3.4.10
    nh2 authored Mar 16, 2020

    Verified

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

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    Copy the full SHA
    dce0f4f View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/audio/clementine/default.nix
Original file line number Diff line number Diff line change
@@ -125,7 +125,7 @@ let
mkdir -p $out/share
for dir in applications icons kde4; do
ln -s "$free/share/$dir" "$out/share/$dir"
ln -s "${free}/share/$dir" "$out/share/$dir"
done
'';
enableParallelBuilding = true;
3 changes: 2 additions & 1 deletion pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
, libxml2
, systemd
, upower
, gnome-online-accounts
, cinnamon-settings-daemon
, colord
, polkit
@@ -67,7 +68,7 @@ stdenv.mkDerivation rec {
colord
cinnamon-settings-daemon
libwacom
gnome3.gnome-online-accounts
gnome-online-accounts
tzdata
networkmanager
networkmanagerapplet
6 changes: 3 additions & 3 deletions pkgs/servers/mail/postfix/default.nix
Original file line number Diff line number Diff line change
@@ -26,11 +26,11 @@ in stdenv.mkDerivation rec {

pname = "postfix";

version = "3.4.9";
version = "3.4.10";

src = fetchurl {
url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";
sha256 = "19rdb92q77japw6gy7niiyj1h3nqfdakkcsq2avn9l160vxrqw54";
sha256 = "0m36wn5grm4cf8nnvlgsgwsm6v09xz01n7jnx13h0yjk73y6d2lh";
};

nativeBuildInputs = [ makeWrapper m4 ];
@@ -98,7 +98,7 @@ in stdenv.mkDerivation rec {
'';

meta = with lib; {
homepage = http://www.postfix.org/;
homepage = "http://www.postfix.org/";
description = "A fast, easy to administer, and secure mail server";
license = with licenses; [ ipl10 epl20 ];
platforms = platforms.linux;
9 changes: 7 additions & 2 deletions pkgs/tools/security/pass/extensions/update.nix
Original file line number Diff line number Diff line change
@@ -2,15 +2,20 @@

stdenv.mkDerivation rec {
pname = "pass-update";
version = "2.0";
version = "2.1";

src = fetchFromGitHub {
owner = "roddhjav";
repo = "pass-update";
rev = "v${version}";
sha256 = "0a81q0jfni185zmbislzbcv0qr1rdp0cgr9wf9riygis2xv6rs6k";
sha256 = "0yx8w97jcp6lv7ad5jxqnj04csbrn2hhc4pskssxknw2sbvg4g6c";
};

postPatch = ''
substituteInPlace Makefile \
--replace "BASHCOMPDIR ?= /etc/bash_completion.d" "BASHCOMPDIR ?= $out/etc/bash_completion.d"
'';

dontBuild = true;

installFlags = [ "PREFIX=$(out)" ];
4 changes: 2 additions & 2 deletions pkgs/tools/system/stress-ng/default.nix
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

stdenv.mkDerivation rec {
pname = "stress-ng";
version = "0.11.01";
version = "0.11.02";

src = fetchurl {
url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz";
sha256 = "152lyqv7g6jl4xsvg639n6y8h6v2qag3afxynaws38bsr149bqcz";
sha256 = "0vwqv3hq7h4z53ayk2c69zf60ncr0v2g0vxaci1pmxlhiz56y6md";
};

postPatch = ''