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: 27b4e71d80a6
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: 6c34eaf9df10
Choose a head ref
  • 3 commits
  • 3 files changed
  • 3 contributors

Commits on Mar 8, 2019

  1. ntp: 4.2.8p12 -> 4.2.8p13 (#57059) 

    From http://www.ntp.org/index.html:
> ntp-4.2.8p13 was released on 07 March 2019.
> It addresses 1 medium-severity security issue in ntpd, and provides 17
> other non-security fixes and 1 improvements over 4.2.8p12.

(cherry picked from commit d7c23cc)
    @dtzWill @xeji
    dtzWill authored and xeji committed Mar 8, 2019
    Copy the full SHA
    5919bf3 View commit details

  2. pantheon.elementary-calculator: 1.5.1 -> 1.5.2 

    Just translations

https://github.com/elementary/calculator/releases/tag/1.5.2
(cherry picked from commit a494ce9)
    @worldofpeace
    worldofpeace committed Mar 8, 2019
    Copy the full SHA
    6318530 View commit details

  3. python2Packages.moinmoin: 1.9.9 -> 1.9.10 (#56970) 

    Changes:

https://github.com/moinwiki/moin-1.9/blob/1.9.10/docs/CHANGES#L13

This commit also replaces a ISO-8859-1 character in setup.cfg to fix the
build.

(cherry picked from commit 449e7f9)
    @xeji
    Daniël de Kok authored and xeji committed Mar 8, 2019
    Copy the full SHA
    6c34eaf View commit details
4 changes: 2 additions & 2 deletions pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,15 +5,15 @@

stdenv.mkDerivation rec {
pname = "calculator";
version = "1.5.1";
version = "1.5.2";

name = "elementary-${pname}-${version}";

src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0vc27kjmfkly2jkqjiyzlybxyjqhwal3xrxca5b4abfgb379yswa";
sha256 = "1vdgl89hdf9q1ya6as7310hlr0xls3w7js2gzsd9z8arb6037ccl";
};

passthru = {
12 changes: 6 additions & 6 deletions pkgs/development/python-modules/moinmoin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,25 +4,25 @@

buildPythonPackage rec {
pname = "moinmoin";
version = "1.9.9";
version = "1.9.10";

# SyntaxError in setup.py
disabled = isPy3k;

src = fetchurl {
url = "http://static.moinmo.in/files/moin-${version}.tar.gz";
sha256 = "197ga41qghykmir80ik17f9hjpmixslv3zjgj7bj9qvs1dvdg5s3";
sha256 = "0g05lnl1s8v61phi3z1g3b6lfj4g98grj9kw8nyjl246x0c489ja";
};

patches = [
# Recommended to install on their download page.
(fetchpatch {
url = "https://bitbucket.org/thomaswaldmann/moin-1.9/commits/561b7a9c2bd91b61d26cd8a5f39aa36bf5c6159e/raw";
sha256 = "1nscnl9nspnrwyf3n95ig0ihzndryinq9kkghliph6h55cncfc65";
})
./fix_tests.patch
];

prePatch = ''
sed -i "s/\xfc/ü/" setup.cfg
'';

checkInputs = [ pytest werkzeug pygments ];

meta = with lib; {
4 changes: 2 additions & 2 deletions pkgs/tools/networking/ntp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ let
in

stdenv.mkDerivation rec {
name = "ntp-4.2.8p12";
name = "ntp-4.2.8p13";

src = fetchurl {
url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
sha256 = "0m04ndn0674kcf9x0aggjya07a3hlig2nlzzpwk7vmqka0mj56vh";
sha256 = "0f1a4fya7v5s0426nim8ydvvlcashb8hicgs9xlm76ndrz7751r8";
};

# The hardcoded list of allowed system calls for seccomp is