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: 44e14e94940e
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: 8cd5aa8a8236
Choose a head ref
  • 9 commits
  • 5 files changed
  • 8 contributors

Commits on Sep 21, 2019

  1. nixos/postgresql: switch default 9.6 -> 11 

    This is designed for 19.09 release.
    @danbst
    danbst committed Sep 21, 2019
    Copy the full SHA
    fb863fc View commit details

Commits on Sep 22, 2019

  1. move from 19.09 to 20.03

    @danbst
    danbst committed Sep 22, 2019
    Copy the full SHA
    e557ad7 View commit details

Commits on Sep 29, 2019

  1. sourcetrail: 2019.2.39 -> 2019.3.46 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sourcetrail/versions
    @r-ryantm
    r-ryantm committed Sep 29, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dc59594 View commit details

Commits on Oct 2, 2019

  1. pythonPackages.poetry: fix python2 build

    Jonathan Ringer committed Oct 2, 2019
    Copy the full SHA
    d222547 View commit details

  2. libbfd: use zlib.dev as input

    @nmattia
    nmattia committed Oct 2, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7b8ae75 View commit details

  3. Merge pull request #69969 from r-ryantm/auto-update/sourcetrail 

    sourcetrail: 2019.2.39 -> 2019.3.46
    @ryantm
    ryantm authored Oct 2, 2019
    Copy the full SHA
    e5b783b View commit details

  4. libbfd: use zlib.dev as input (#70247) 

    libbfd: use zlib.dev as input
    @jwiegley
    jwiegley authored Oct 2, 2019
    Copy the full SHA
    133eb42 View commit details

  5. Merge pull request #70225 from jonringer/fix-poetry 

    pythonPackages.poetry: fix python2 build
    @mmahut
    mmahut authored Oct 2, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    pradyuman Pradyuman Vig
    GPG key ID: 4F74D5361C4CA31E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c18e6fb View commit details

  6. Merge pull request #69194 from danbst/pg11-nixos 

    nixos/postgresql: switch default 9.6 -> 11
    @peti
    peti authored Oct 2, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    pradyuman Pradyuman Vig
    GPG key ID: 4F74D5361C4CA31E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8cd5aa8 View commit details
5 changes: 5 additions & 0 deletions nixos/doc/manual/release-notes/rl-2003.xml
View file
Original file line number Diff line number Diff line change
@@ -23,6 +23,11 @@
Support is planned until the end of October 2020, handing over to 20.09.
</para>
</listitem>
<listitem>
<para>
Postgresql for NixOS service now defaults to v11.
</para>
</listitem>
</itemizedlist>
</section>

3 changes: 2 additions & 1 deletion nixos/modules/services/databases/postgresql.nix
View file
Original file line number Diff line number Diff line change
@@ -226,7 +226,8 @@ in
# Note: when changing the default, make it conditional on
# ‘system.stateVersion’ to maintain compatibility with existing
# systems!
mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6
mkDefault (if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11
else if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6
else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5
else throw "postgresql_9_4 was removed, please upgrade your postgresql version.");

2 changes: 1 addition & 1 deletion pkgs/development/libraries/libbfd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
dontUpdateAutotoolsGnuConfigScripts = true;

nativeBuildInputs = [ autoreconfHook bison ];
buildInputs = [ libiberty zlib ];
buildInputs = [ libiberty zlib.dev ];

configurePlatforms = [ "build" "host" ];
configureFlags = [
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/poetry/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@
, pkginfo
, html5lib
, shellingham
, subprocess32
, tomlkit
, typing
, pathlib2
@@ -63,7 +64,7 @@ in buildPythonPackage rec {
shellingham
tomlkit
] ++ lib.optionals (isPy27 || isPy34) [ typing pathlib2 glob2 ]
++ lib.optionals isPy27 [ virtualenv functools32 ];
++ lib.optionals isPy27 [ virtualenv functools32 subprocess32 ];

postInstall = ''
mkdir -p "$out/share/bash-completion/completions"
4 changes: 2 additions & 2 deletions pkgs/development/tools/sourcetrail/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,12 +3,12 @@

stdenv.mkDerivation rec {
pname = "sourcetrail";
version = "2019.2.39";
version = "2019.3.46";

src = fetchurl {
name = "sourtrail.tar.gz";
url = "https://www.sourcetrail.com/downloads/${version}/linux/64bit";
sha256 = "13kzfnsb5lf9v6bqw41qljp5bgz2rd3w163r6xg59hzd3dv8f90q";
sha256 = "0dnkxr3fijcsbn6pd20lyxhr9ns6ji1c4dffly9s16yq4x9ad5r4";
};

nativeBuildInputs = [ autoPatchelfHook ];