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: 13e7a3e11272
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: 2547ef92863f
Choose a head ref

Commits on Mar 8, 2020

  1. Copy the full SHA
    7107e39 View commit details

Commits on Mar 9, 2020

  1. Fix refmt

    anmonteiro committed Mar 9, 2020
    Copy the full SHA
    c09411b View commit details
  2. Copy the full SHA
    0f0cb0b View commit details

Commits on Mar 13, 2020

  1. maintainers: add KAction

    KAction committed Mar 13, 2020
    Copy the full SHA
    4481a20 View commit details

Commits on Mar 14, 2020

  1. pgmetrics: 1.7.1 -> 1.8.1

    r-ryantm authored and marsam committed Mar 14, 2020
    Copy the full SHA
    f47ec36 View commit details
  2. sampler: 1.0.3 -> 1.1.0

    r-ryantm committed Mar 14, 2020
    Copy the full SHA
    8097fc0 View commit details
  3. Merge pull request #82068 from anmonteiro/anmonteiro/bs-platform-7.2.0

    bs-platform: 7.0.1 -> 7.2.0
    marsam authored Mar 14, 2020
    Copy the full SHA
    8a0c1b8 View commit details
  4. Copy the full SHA
    b1c71eb View commit details
  5. ntp: 4.2.8p13 -> 4.2.8p14

    r-ryantm authored and alyssais committed Mar 14, 2020
    Copy the full SHA
    281dd8b View commit details
  6. Copy the full SHA
    3b2d9b3 View commit details
  7. Copy the full SHA
    45cc3c9 View commit details
  8. minio: 2019-10-12 -> 2020-03-06

    bachp authored and alyssais committed Mar 14, 2020
    Copy the full SHA
    85f8014 View commit details
  9. minio-client: 2019-01-30 -> 2020-03-06

    bachp authored and alyssais committed Mar 14, 2020
    Copy the full SHA
    337b357 View commit details
  10. rustracerd: build with current rust

    Fix taken from jwilm/racerd#82.  It just
    updates a dependency.
    alyssais committed Mar 14, 2020
    Copy the full SHA
    6cea0da View commit details
  11. Copy the full SHA
    c4393d6 View commit details
  12. rust_1_38_0: drop

    alyssais committed Mar 14, 2020
    Copy the full SHA
    dcb4319 View commit details
  13. Merge pull request #82572 from r-ryantm/auto-update/pgmetrics

    pgmetrics: 1.7.1 -> 1.8.1
    marsam authored Mar 14, 2020
    Copy the full SHA
    6e2eeba View commit details
  14. Merge pull request #82577 from r-ryantm/auto-update/sampler

    sampler: 1.0.3 -> 1.1.0
    ryantm authored Mar 14, 2020
    Copy the full SHA
    6ac55d9 View commit details
  15. Copy the full SHA
    e3e86f1 View commit details
  16. Copy the full SHA
    c6c7536 View commit details
  17. miniserve: 0.5.0 -> 0.6.0

    dywedir authored and alyssais committed Mar 14, 2020
    Copy the full SHA
    9d8580f View commit details
  18. Merge pull request #75312 from KAction/mmh

    mmh: init at 0.4
    veprbl authored Mar 14, 2020
    Copy the full SHA
    2547ef9 View commit details
10 changes: 10 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -3713,6 +3713,16 @@
githubId = 66669;
name = "Jeff Zellner";
};
kaction = {
name = "Dmitry Bogatov";
email = "KAction@disroot.org";
github = "kaction";
githubId = 44864956;
key = [{
longkeyid = "ed25519/0x749FD4DFA2E94236";
fingerprint = "3F87 0A7C A7B4 3731 2F13 6083 749F D4DF A2E9 4236";
}];
};
kaiha = {
email = "kai.harries@gmail.com";
github = "kaiha";
6 changes: 3 additions & 3 deletions pkgs/applications/misc/sampler/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule rec {
pname = "sampler";
version = "1.0.3";
version = "1.1.0";

src = fetchFromGitHub {
owner = "sqshq";
repo = pname;
rev = "v${version}";
sha256 = "129vifb1y57vyqj9p23gq778jschndh2y2ingwvjz0a6lrm45vpf";
sha256 = "1lanighxhnn28dfzils7i55zgxbw2abd6y723mq7x9wg1aa2bd0z";
};

modSha256 = "0wgwnn50lrg6ix5ll2jdwi421wgqgsv4y9xd5hfj81kya3dxcbw0";
modSha256 = "02ai193lpzsxdn1hpbndkfxdc88nyl4kcgbadhy122kgx13crcy8";

subPackages = [ "." ];

24 changes: 24 additions & 0 deletions pkgs/applications/networking/mailreaders/mmh/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ stdenv, fetchurl, ncurses, autoreconfHook, flex }:
let rev = "431604647f89d5aac7b199a7883e98e56e4ccf9e";
in stdenv.mkDerivation rec {
pname = "mmh-unstable";
version = "2019-09-08";

src = fetchurl {
url = "http://git.marmaro.de/?p=mmh;a=snapshot;h=${rev};sf=tgz";
name = "mmh-${rev}.tgz";
sha256 = "1q97p4g3f1q2m567i2dbx7mm7ixw3g91ww2rymwj42cxk9iyizhv";
};

buildInputs = [ ncurses ];
nativeBuildInputs = [ autoreconfHook flex ];

meta = with stdenv.lib; {
description = "Set of electronic mail handling programs";
homepage = "http://marmaro.de/prog/mmh";
license = licenses.bsd3;
platforms = platforms.unix;
broken = stdenv.isDarwin;
maintainers = with maintainers; [ kaction ];
};
}
5 changes: 3 additions & 2 deletions pkgs/applications/networking/mailreaders/neomutt/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript
, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl
, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell, sqlite
, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell, sqlite, zlib
}:

stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];

nativeBuildInputs = [
docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which
docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib
];

enableParallelBuilding = true;
@@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
"--with-mailpath="
# Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail
"ac_cv_path_SENDMAIL=sendmail"
"--zlib"
];

# Fix missing libidn in mutt;
28 changes: 21 additions & 7 deletions pkgs/development/compilers/bs-platform/build-bs-platform.nix
Original file line number Diff line number Diff line change
@@ -16,18 +16,28 @@
patches = [];
}))
}:
stdenv.mkDerivation {

let
bin_folder = if stdenv.isDarwin then "darwin" else "linux";
in

stdenv.mkDerivation rec {
inherit src version;
pname = "bs-platform";

BS_RELEASE_BUILD = "true";

# BuckleScript's idiosyncratic build process only builds artifacts required
# for editor-tooling to work when this environment variable is set:
# https://github.com/BuckleScript/bucklescript/blob/7.2.0/scripts/install.js#L225-L227
BS_TRAVIS_CI = "1";

buildInputs = [ nodejs python3 custom-ninja ];

patchPhase = ''
sed -i 's:./configure.py --bootstrap:python3 ./configure.py --bootstrap:' ./scripts/install.js
mkdir -p ./native/${ocaml-version}/bin
ln -sf ${ocaml}/bin/* ./native/${ocaml-version}/bin
rm -f vendor/ninja/snapshot/ninja.linux
cp ${custom-ninja}/bin/ninja vendor/ninja/snapshot/ninja.linux
'';

# avoid building the development version, will break aarch64 build
@@ -41,10 +51,14 @@ stdenv.mkDerivation {

installPhase = ''
mkdir -p $out/bin
cp -rf jscomp lib vendor odoc_gen native $out
cp -rf jscomp lib ${bin_folder} vendor odoc_gen native bsb bsc bsrefmt $out
mkdir $out/lib/ocaml
cp jscomp/runtime/js.* jscomp/runtime/*.cm* $out/lib/ocaml
cp jscomp/others/*.ml jscomp/others/*.mli jscomp/others/*.cm* $out/lib/ocaml
cp jscomp/stdlib-406/*.ml jscomp/stdlib-406/*.mli jscomp/stdlib-406/*.cm* $out/lib/ocaml
cp bsconfig.json package.json $out
ln -s $out/lib/bsb $out/bin/bsb
ln -s $out/lib/bsc $out/bin/bsc
ln -s $out/lib/bsrefmt $out/bin/bsrefmt
ln -s $out/bsb $out/bin/bsb
ln -s $out/bsc $out/bin/bsc
ln -s $out/bsrefmt $out/bin/bsrefmt
'';
}
8 changes: 4 additions & 4 deletions pkgs/development/compilers/bs-platform/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@
let
build-bs-platform = import ./build-bs-platform.nix;
in
(build-bs-platform {
(build-bs-platform rec {
inherit stdenv runCommand fetchFromGitHub ninja nodejs python3;
version = "7.0.1";
version = "7.2.0";
ocaml-version = "4.06.1";

src = fetchFromGitHub {
owner = "BuckleScript";
repo = "bucklescript";
rev = "52770839e293ade2bcf187f2639000ca0a9a1d46";
sha256 = "0s7g2zfhshsilv9zyp0246bypg34d294z27alpwz03ws9608yr7k";
rev = version;
sha256 = "1fsx7gvcp6rbqd0qf5fix02mbbmk9rgm09zbwjrx0lp5cjv3n2s4";
fetchSubmodules = true;
};
}).overrideAttrs (attrs: {
22 changes: 0 additions & 22 deletions pkgs/development/compilers/rust/1_38_0.nix

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 6cb9aa7c69c20a677ca9fb1bc5fa1580e3236fbd Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch>
Date: Sat, 14 Mar 2020 11:55:45 +0000
Subject: [PATCH] Disable optimised aarch64 dgemm_beta pending fix

Identified as source of https://github.com/xianyi/OpenBLAS/issues/2496,
but not yet fixed.
---
kernel/arm64/KERNEL.ARMV8 | 1 -
1 file changed, 1 deletion(-)

diff --git a/kernel/arm64/KERNEL.ARMV8 b/kernel/arm64/KERNEL.ARMV8
index fe32d313..33d12f94 100644
--- a/kernel/arm64/KERNEL.ARMV8
+++ b/kernel/arm64/KERNEL.ARMV8
@@ -102,7 +102,6 @@ CDOTKERNEL = zdot.S
ZDOTKERNEL = zdot.S
DSDOTKERNEL = dot.S

-DGEMM_BETA = dgemm_beta.S
SGEMM_BETA = sgemm_beta.S

SGEMMKERNEL = sgemm_kernel_$(SGEMM_UNROLL_M)x$(SGEMM_UNROLL_N).S
--
2.24.1

6 changes: 6 additions & 0 deletions pkgs/development/libraries/science/math/openblas/default.nix
Original file line number Diff line number Diff line change
@@ -123,6 +123,12 @@ stdenv.mkDerivation rec {
buildPackages.stdenv.cc
];

# Disable an optimisation which seems to cause issues, pending an
# upstream fix: https://github.com/xianyi/OpenBLAS/issues/2496
patches = stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [
./0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch
];

makeFlags = mkMakeFlagsFromConfig (config // {
FC = "${stdenv.cc.targetPrefix}gfortran";
CC = "${stdenv.cc.targetPrefix}${if stdenv.cc.isClang then "clang" else "cc"}";
6 changes: 3 additions & 3 deletions pkgs/development/tools/analysis/tflint/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule rec {
pname = "tflint";
version = "0.15.1";
version = "0.15.2";

src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
sha256 = "12a1jg4vcp6w72j8nsxf162i616g303cs783wlsa9iwm4w0cpb2h";
sha256 = "1wwdnqb34l0ad6hlvs74acfh0744ir3ssm8wjwpxbsy0sxkrpxcf";
};

modSha256 = "1k26i01sdgx9yik5fnd8kv300d8llqpvj9qpvga7hsbk58s2g8mv";
modSha256 = "1jbnsqa0ga372lhbgfnqvx8pdzrm0b2phzzwll4sgd0k1hzv2aqv";

subPackages = [ "." ];

11 changes: 9 additions & 2 deletions pkgs/development/tools/rust/racerd/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper , Security }:
{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, makeWrapper, Security }:

rustPlatform.buildRustPackage rec {
pname = "racerd";
@@ -11,7 +11,14 @@ rustPlatform.buildRustPackage rec {
sha256 = "13jqdvjk4savcl03mrn2vzgdsd7vxv2racqbyavrxp2cm9h6cjln";
};

cargoSha256 = "1nwjr7v8hkhsql93wbwk5gqqiq725gj5iwwsbd250my9g5kkfdbw";
cargoPatches = [
(fetchpatch {
url = "https://github.com/jwilm/racerd/commit/856f3656e160cd2909c5166e962f422c901720ee.patch";
sha256 = "1qq2k4bnwjz5qgn7s8yxd090smwn2wvdm8dd1rrlgpln0a5vxkpb";
})
];

cargoSha256 = "1z0dh2j9ik66i6nww3z7z2gw7nhc0b061zxbjzamk1jybpc845lq";

# a nightly compiler is required unless we use this cheat code.
RUSTC_BOOTSTRAP=1;
6 changes: 3 additions & 3 deletions pkgs/servers/caddy/default.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

buildGoModule rec {
pname = "caddy";
version = "1.0.4";
version = "1.0.5";

goPackagePath = "github.com/caddyserver/caddy";

@@ -12,9 +12,9 @@ buildGoModule rec {
owner = "caddyserver";
repo = pname;
rev = "v${version}";
sha256 = "0mqbaa9cshrqm5fggm5l5nzcnv8c9dvylcc4z7qj3322vl5cpfdc";
sha256 = "0jrhwmr6gggppskg5h450wybzkv17iq69dgw36hd1dp56q002i7g";
};
modSha256 = "0f08smcnzmrj3v43v0qgyd11qwdbymbl86c9prais6sykgh1ld97";
modSha256 = "1gc0xvsihr4zp7hkrdfrplvzkaphz1y4q53rgwn2jhd8s98l57an";

preBuild = ''
cat << EOF > caddy/main.go
6 changes: 3 additions & 3 deletions pkgs/servers/minio/default.nix
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule rec {
pname = "minio";
version = "2019-10-12T01-39-57Z";
version = "2020-03-06T22-23-56Z";

src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
sha256 = "14rqwdhk2awdpcavkaqndf85c6aww5saarbfa2skc9z76ccq6114";
sha256 = "0h5zsdxm2b2by6lzqaa7jj0z773kjr89cl13gq9ddabml34f0kxh";
};

modSha256 = "1cnccmmqb63l78rnjwh9bivyfr79ixjg106fbgcrn3pwghfag7ma";
modSha256 = "0ikid628v673f7lvp3psk05s3liqlyc3arppg33lfi2cmbaf8hmr";

subPackages = [ "." ];

12 changes: 6 additions & 6 deletions pkgs/tools/misc/miniserve/default.nix
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib, openssl }:
{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkg-config, zlib, openssl }:

rustPlatform.buildRustPackage rec {
pname = "miniserve";
version = "0.5.0";
version = "0.6.0";

src = fetchFromGitHub {
owner = "svenstaro";
repo = "miniserve";
rev = "v${version}";
sha256 = "06cxkkf3sf84prba65dymr1hg7mwizmsax0dlljh0lcmvlcpzi08";
sha256 = "0ybxnxjg0vqm4q60z4zjl3hfls0s2rvy44m6jgyhlj1p6cr3dbyw";
};

cargoSha256 = "1v4rvk6h78797wshw3m0qabb7g4i4mbj1vs5d41izgb0swnzk4vy";
cargoSha256 = "0ypxv9wqcnjxjdrvdparddpssrarnifr43dq7kcr4l3fd1anl40a";

RUSTC_BOOTSTRAP = 1;

nativeBuildInputs = [ cmake pkgconfig zlib ];
nativeBuildInputs = [ cmake pkg-config zlib ];
buildInputs = [ openssl ];

meta = with stdenv.lib; {
description = "For when you really just want to serve some files over HTTP right now!";
homepage = https://github.com/svenstaro/miniserve;
homepage = "https://github.com/svenstaro/miniserve";
license = with licenses; [ mit ];
maintainers = with maintainers; [ nequissimus ];
platforms = platforms.linux;
10 changes: 6 additions & 4 deletions pkgs/tools/misc/pgmetrics/default.nix
Original file line number Diff line number Diff line change
@@ -2,19 +2,21 @@

buildGoModule rec {
pname = "pgmetrics";
version = "1.7.1";
version = "1.8.1";

src = fetchFromGitHub {
owner = "rapidloop";
repo = pname;
rev = "v${version}";
sha256 = "17rr6rjdxg8gdljf65zkn3bl1kmnlp2gkhiq7slxslh8n9iz4wjs";
sha256 = "06w2kqjq2yq9yypg6biywrybnmi4jlnnigd7az72hp7lzf2nhl62";
};

modSha256 = "0llbx2sgcx95ym2q4l3334rdj3nkgr9z5jyp8406cp3k1ixi7gdb";
modSha256 = "0h375zk0ik06g0b5vmi00b1wn5q2c0r137f7qf6l8k8p886x41h6";

buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];

meta = with stdenv.lib; {
homepage = https://pgmetrics.io/;
homepage = "https://pgmetrics.io/";
description = "Collect and display information and stats from a running PostgreSQL server";
license = licenses.asl20;
maintainers = [ maintainers.marsam ];
12 changes: 7 additions & 5 deletions pkgs/tools/networking/minio-client/default.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub }:

buildGoPackage rec {
buildGoModule rec {
pname = "minio-client";
version = "2019-01-30T19-57-22Z";
version = "2020-03-06T23-29-45Z";

src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
sha256 = "1w0ig0daf0zxpkz449xq2hm7ajhzn8hlnnmpac6ip82qy53xnbm4";
sha256 = "1vqvp7mn841s5g9vvas3c8j4y9lp90maw5y49hdv7zcsqncqvzkv";
};

goPackagePath = "github.com/minio/mc";
modSha256 = "1qjfsqmcc6i0nixwvdmm3vnnv19yvqaaza096cpdf5rl35knsp5i";

subPackages = [ "." ];

preBuild = ''
buildFlagsArray+=("-ldflags=-X github.com/minio/mc/cmd.Version=${version}")
Loading