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: 56d94c8c69f8
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: bd1358fed9d1
Choose a head ref
  • 15 commits
  • 12 files changed
  • 10 contributors

Commits on Aug 7, 2019

  1. Remove default value for nixpkgs.system

    Using "builtins.currentSystem" doesn't work in pure evaluation mode,
    and even when it's explicitly set (which it always is, in
    nixos/lib/eval-config.nix), it breaks manual generation because the
    manual tries to render the default value.
    
    (cherry picked from commit 7eb332a)
    edolstra authored and basvandijk committed Aug 7, 2019
    Copy the full SHA
    7c37596 View commit details
  2. Copy the full SHA
    854ec2f View commit details
  3. Copy the full SHA
    60ed85d View commit details
  4. Copy the full SHA
    750dbd1 View commit details
  5. Copy the full SHA
    47f648c View commit details
  6. Merge pull request #66273 from basvandijk/rm-def-for-nixpkgs.system-r…

    …elease-19.03
    
    Backport "Remove default value for nixpkgs.system" to release-19.03
    edolstra authored Aug 7, 2019
    Copy the full SHA
    f8096b2 View commit details
  7. hedgewars: 0.9.25 -> 1.0.0-beta1

    - unbreak build by bumping version to latest beta as that
    removes the broken `bytestring-show` dependency
    
    - beta needs to be fetched from Mercurial repo
    
    (cherry picked from commit 7030004)
    schmittlauch committed Aug 7, 2019
    Copy the full SHA
    6496eb4 View commit details
  8. pythonPackages.django_1_11: 1.11.22 -> 1.11.23

    See https://docs.djangoproject.com/en/1.11/releases/1.11.23/ for release
    note.
    
    (cherry picked from commit 37c8c63)
    lsix committed Aug 7, 2019
    Copy the full SHA
    56fff3e View commit details
  9. python3Packages.django_2_1: 2.1.10 -> 2.1.11

    See https://docs.djangoproject.com/en/2.1/releases/2.1.11/ for release
    notes.
    
    (cherry picked from commit 34eca41)
    lsix committed Aug 7, 2019
    Copy the full SHA
    6d06fde View commit details
  10. grafana: 6.3.0 -> 6.3.2

    (cherry picked from commit 8f2abf5)
    Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
    WilliButz authored and Ma27 committed Aug 7, 2019
    Copy the full SHA
    e8cea0e View commit details

Commits on Aug 8, 2019

  1. [backport] hedgewars: 0.9.25 -> 1.0.0-beta1 (#66290)

    [backport] hedgewars: 0.9.25 -> 1.0.0-beta1
    Mic92 authored Aug 8, 2019
    Copy the full SHA
    f3f040c View commit details
  2. Copy the full SHA
    45fd93a View commit details
  3. Merge pull request #66331 from mweinelt/pr/19.03/chromedriver-76.0.38…

    …09.68
    
    [19.03] chromedriver: 2.46 -> 76.0.3809.68
    marsam authored Aug 8, 2019
    Copy the full SHA
    d3e6486 View commit details

Commits on Aug 9, 2019

  1. Copy the full SHA
    b08d2b3 View commit details
  2. knot-resolver: skip a broken test

    The test fails from roughly today's machine date onwards.
    
    (cherry picked from commit 5c0567d)
    vcunat committed Aug 9, 2019
    Copy the full SHA
    bd1358f View commit details
1 change: 0 additions & 1 deletion nixos/modules/misc/nixpkgs.nix
Original file line number Diff line number Diff line change
@@ -195,7 +195,6 @@ in
system = mkOption {
type = types.str;
example = "i686-linux";
default = { system = builtins.currentSystem; };
description = ''
Specifies the Nix platform type on which NixOS should be built.
It is better to specify <code>nixpkgs.localSystem</code> instead.
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/django/1_11.nix
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@

buildPythonPackage rec {
pname = "Django";
version = "1.11.22";
version = "1.11.23";

src = fetchurl {
url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
sha256 = "0if8p7sgbvpy3m8d25pw1x232s14ndd60w5s5d88jl3hl505s3c3";
sha256 = "1qb9npkpvyafd1f4yjqyzhj78wp1ifg3awj41bd04v83idznv9jj";
};

patches = stdenv.lib.optionals withGdal [
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/django/2_1.nix
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@

buildPythonPackage rec {
pname = "Django";
version = "2.1.10";
version = "2.1.11";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "0n794x17x8q2jzjm12glb900y53r3bxg8dafvl65djiglm4abqk5";
sha256 = "1m9bs78sh91slsjxkhxgkg715gbsgph9ky7d74czs0z2mhg86h8s";
};

patches = stdenv.lib.optionals withGdal [
6 changes: 3 additions & 3 deletions pkgs/development/tools/selenium/chromedriver/default.nix
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@ let
allSpecs = {
"x86_64-linux" = {
system = "linux64";
sha256 = "0iq015nyhdn1z50aj6k2d38cf1vbp59x7qi48aikb4z1h3h1j6a6";
sha256 = "04wb6h57daxmnv3a3xrcsznawbx7r8wyi1vk1g26z2l2ppcnsbzv";
};

"x86_64-darwin" = {
system = "mac64";
sha256 = "0bf59g7vx7qbz9lx6wgk82zjbf8isag1n3lbi0gw4b2bgv8md8ia";
sha256 = "0f8j7m8ardaaw8pv02vxhwkqbcm34366bln0np0j0ig21d4fag09";
};
};

@@ -28,7 +28,7 @@ let
in
stdenv.mkDerivation rec {
name = "chromedriver-${version}";
version = "2.46";
version = "76.0.3809.68";

src = fetchurl {
url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";
14 changes: 7 additions & 7 deletions pkgs/games/hedgewars/default.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
{ SDL2_image, SDL2_ttf, SDL2_net, fpc, qt5, ghcWithPackages, ffmpeg, freeglut
, stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer
, stdenv, makeWrapper, fetchhg, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer
, zlib, libpng, libGLU_combined, physfs
}:

let
ghc = ghcWithPackages (pkgs: with pkgs; [
network vector utf8-string /* broken: bytestring-show */ random hslogger
network vector utf8-string bytestring random hslogger
SHA entropy pkgs.zlib sandi regex-tdfa
]);
in
stdenv.mkDerivation rec {
version = "0.9.25";
version = "1.0.0-beta1";
name = "hedgewars-${version}";
src = fetchurl {
url = "https://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2";
sha256 = "08x7fqpy0hpnbfq2k06g522xayi7s53bca819zfhalvqnqs76pdk";
src = fetchhg {
url = "https://hg.hedgewars.org/hedgewars/";
rev = "7ab5cf405686";
sha256 = "1yrspi82ym5zpavka4cv0vh86g3i2mbbg8ccfcsid4f38lgbb9y4";
};

nativeBuildInputs = [ pkgconfig ];
@@ -75,6 +76,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ kragniz fpletz ];
platforms = ghc.meta.platforms;
hydraPlatforms = [];
broken = true; # depends on broken Haskell package bytestring-show
};
}
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.14.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.14.136";
version = "4.14.137";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0w6z5fhwqgpqnz2js8vj9j5dl6isx8n7rnzrm0vr9r8njaazz396";
sha256 = "0a72pab0zxy28i02glnzj6avzcf0a4gxxnadbdd343rh549yky4k";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.19.64";
version = "4.19.65";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1gasmcdsrsk81dscslmrsxqsvkfp5xxdx3ay95izggpk7piqnvvs";
sha256 = "1pyyhr2airxzk4c6n7140yl723dc7yw7igy5i5i2ih0nd4c3k6g5";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.4.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.4.187";
version = "4.4.188";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1dlzb5yzcsicd41myj3q4dq2ql8xcc49brs5f7xjmc5ynvvjjgnc";
sha256 = "1llxamm62kgqd7dig98n8m16qas8dd8rrkmwpfcdgyf8rag216ff";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.9.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.9.187";
version = "4.9.188";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1iyimwl4ysnk6m66m73sg0cnp4vac56d6yy174shfpnj5h2csjq1";
sha256 = "08p2cfc9982b804vmkapfasgipf6969g625ih7z3062xn99rhlr7";
};
} // (args.argsOverride or {}))
3 changes: 3 additions & 0 deletions pkgs/servers/dns/knot-resolver/default.nix
Original file line number Diff line number Diff line change
@@ -30,6 +30,9 @@ unwrapped = stdenv.mkDerivation rec {
sha256 = "2fe470f9bb1007667cdd448f758087244b7195a0234c2b100a9beeed0a2d3e68";
};

# https://gitlab.labs.nic.cz/knot/knot-resolver/issues/496
postPatch = "sed '/prefill.test.lua/d' -i modules/meson.build";

outputs = [ "out" "dev" ];

preConfigure = ''
6 changes: 3 additions & 3 deletions pkgs/servers/monitoring/grafana/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:

buildGoPackage rec {
version = "6.3.0";
version = "6.3.2";
name = "grafana-${version}";
goPackagePath = "github.com/grafana/grafana";

@@ -11,12 +11,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "0k95w7j2iq6v82d8701cl2zcszl8qfplpnhjfijr3djahbwbkls3";
sha256 = "03jhygd3h211dr3dgdg4mi13sj1rib333x436kv14v8xd8rsl162";
};

srcStatic = fetchurl {
url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "01q1d8fpf3dfrc11wzzi9i6939906l4s0kkl9v0c91p3qx3rfni9";
sha256 = "18khy0ki128mswy4viwbb53904ljrgj0y0qv076nn8m2zbyddyp9";
};

postPatch = ''
20 changes: 10 additions & 10 deletions pkgs/servers/sql/postgresql/default.nix
Original file line number Diff line number Diff line change
@@ -157,41 +157,41 @@ let
in self: {

postgresql_9_4 = self.callPackage generic {
version = "9.4.23";
version = "9.4.24";
psqlSchema = "9.4";
sha256 = "16qx4gfq7i2nnxm0i3zxpb3z1mmzx05a3fsh95414ay8n049q00d";
sha256 = "0acl1wmah3r1a0qjjmpc256glccrjnzq4pkwklx4d9s6vmkks9aj";
this = self.postgresql_9_4;
inherit self;
};

postgresql_9_5 = self.callPackage generic {
version = "9.5.18";
version = "9.5.19";
psqlSchema = "9.5";
sha256 = "1pgkz794wmp4f40843sbin49k5lgl59jvl6nazvdbb6mgr441jfz";
sha256 = "1cqvbsyfs9048wbvdv0vhhaksjyjqv2vvh6ij4vqmjibc4kal34n";
this = self.postgresql_9_5;
inherit self;
};

postgresql_9_6 = self.callPackage generic {
version = "9.6.14";
version = "9.6.15";
psqlSchema = "9.6";
sha256 = "08hsqczy1ixkjyf2vr3s9x69agfz9yr8lh31fir4z0dfr5jw421z";
sha256 = "02hp69h2p02asfblkaahblzdz2zmawd2r11h6237y5j7yadgxn9w";
this = self.postgresql_9_6;
inherit self;
};

postgresql_10 = self.callPackage generic {
version = "10.9";
version = "10.10";
psqlSchema = "10.0"; # should be 10, but changing it is invasive
sha256 = "0m0gbf7nwgag6a1z5f9xszwzgf2xhx0ncakyxwxlzs87n1zk32wm";
sha256 = "0lzj46dwd9cw94gnqm36bxd7jlhfdyqjrfzr3c4xd3prfn2rnkxd";
this = self.postgresql_10;
inherit self;
};

postgresql_11 = self.callPackage generic {
version = "11.4";
version = "11.5";
psqlSchema = "11.1"; # should be 11, but changing it is invasive
sha256 = "12ycjlqncijgmd5z078ybwda8ilas96lc7nxxmdq140mzpgjv002";
sha256 = "106ikalvrilihlvhq7xj7snq98hgbgq6qsgjrd252wgw1c327pvz";
this = self.postgresql_11;
inherit self;
};