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: 26c8ce0bf8fe
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: ed8b959e17b9
Choose a head ref
  • 17 commits
  • 5 files changed
  • 5 contributors

Commits on Mar 28, 2019

  1. dovecot: 2.3.4.1 -> 2.3.5.1 

    https://dovecot.org/list/dovecot-news/2019-March/000401.html
fixes CVE-2019-7524

(cherry picked from commit d3ca36b)

Fixed a trivial merge conflict because some intermediate version bumps were
missing.
    @peti
    Robert Schütz authored and peti committed Mar 28, 2019
    Copy the full SHA
    ba0849a View commit details

  2. jetbrains.datagrip: 2018.3.2 -> 2018.3.4 

    (cherry picked from commit 43d0137)
    @flokli
    Averell Dalton authored and flokli committed Mar 28, 2019
    Copy the full SHA
    dd9a78c View commit details

  3. jetbrains.goland: 2018.3.3 -> 2019.1 

    (cherry picked from commit 862b211)
    @flokli
    Averell Dalton authored and flokli committed Mar 28, 2019
    Copy the full SHA
    686016b View commit details

  4. jetbrains.clion: 2018.3.4 -> 2019.1 

    (cherry picked from commit ead0e93)
    @flokli
    Averell Dalton authored and flokli committed Mar 28, 2019
    Copy the full SHA
    d5b1fb9 View commit details

  5. jetbrains.idea-community: 2018.3.4 -> 2019.1 

    (cherry picked from commit 7cb7596)
    @flokli
    Averell Dalton authored and flokli committed Mar 28, 2019
    Copy the full SHA
    4b4b595 View commit details

  6. jetbrains.idea-ultimate: 2018.3.4 -> 2019.1 

    (cherry picked from commit 4933eae)
    @flokli
    Averell Dalton authored and flokli committed Mar 28, 2019
    Copy the full SHA
    9a66b56 View commit details

  7. jetbrains.phpstorm: 2018.3.3 -> 2019.1 

    (cherry picked from commit 2a328c8)
    @flokli
    Averell Dalton authored and flokli committed Mar 28, 2019
    Copy the full SHA
    d1f4e6e View commit details

  8. jetbrains.rider: 2018.3.2 -> 2018.3.4 

    (cherry picked from commit 68a33fc)
    @flokli
    Averell Dalton authored and flokli committed Mar 28, 2019
    Copy the full SHA
    e7ec56b View commit details

  9. jetbrains.ruby-mine: 2018.3.3 -> 2018.3.5 

    (cherry picked from commit a2f6e40)
    @flokli
    Averell Dalton authored and flokli committed Mar 28, 2019
    Copy the full SHA
    107af48 View commit details

  10. jetbrains.pycharm-community: 2018.3.4 -> 2019.1 

    (cherry picked from commit 70c57c2)
    @flokli
    Averell Dalton authored and flokli committed Mar 28, 2019
    Copy the full SHA
    e809249 View commit details

  11. jetbrains.pycharm-professional: 2018.3.4 -> 2019.1 

    (cherry picked from commit 9731174)
    @flokli
    Averell Dalton authored and flokli committed Mar 28, 2019
    Copy the full SHA
    e93b568 View commit details

  12. jetbrains.webstorm: 2018.3.4 -> 2019.1 

    (cherry picked from commit 9bba3e7)
    @flokli
    Averell Dalton authored and flokli committed Mar 28, 2019
    Copy the full SHA
    49f2712 View commit details

  13. jetbrains-jdk: 152b1248.6 -> 202b1483.37 

    (cherry picked from commit 6c011a0)
    @flokli
    Averell Dalton authored and flokli committed Mar 28, 2019
    Copy the full SHA
    9ebce7f View commit details

  14. syslinux: change serial bit rate to 115200 

    Prior to this commit an installation over serial via syslinux would
involve:
1. setting bitrate to BIOS's bitrate (typically 115200)
2. setting bitrate to syslinux's bitrate (38400)
3. setting bitrate to stty's bitrate (115200)

By changing syslinux's bitrate to 115200, an installation over serial
is a smoother experience, and consistent with the GRUB2 installation
which is also 115200 bps.

    [root@nixos:~]# stty
    speed 115200 baud; line = 0;
    -brkint ixoff iutf8
    -iexten

In a future commit I will add default serial terminals to the syslinux
kernel lines.

(cherry picked from commit 0d67c6a)
    @tomfitzhenry @samueldr
    tomfitzhenry authored and samueldr committed Mar 28, 2019
    Copy the full SHA
    970b97f View commit details

  15. matomo: 3.8.1 -> 3.9.0 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/matomo/versions

(cherry picked from commit 1392434)
    @r-ryantm @flokli
    r-ryantm authored and flokli committed Mar 28, 2019
    Copy the full SHA
    467b2c3 View commit details

  16. matomo: update url 

    (cherry picked from commit 4ffd3ad)
    @flokli
    flokli committed Mar 28, 2019
    Copy the full SHA
    50b6ab5 View commit details

  17. matomo: 3.9.0 -> 3.9.1 

    (cherry picked from commit 26f1943)
    @flokli
    flokli committed Mar 28, 2019
    Copy the full SHA
    ed8b959 View commit details
2 changes: 1 addition & 1 deletion nixos/modules/installer/cd-dvd/iso-image.nix
View file
Original file line number Diff line number Diff line change
@@ -88,7 +88,7 @@ let
# result in incorrect boot entries.

baseIsolinuxCfg = ''
SERIAL 0 38400
SERIAL 0 115200
TIMEOUT ${builtins.toString syslinuxTimeout}
UI vesamenu.c32
MENU TITLE NixOS
46 changes: 23 additions & 23 deletions pkgs/applications/editors/jetbrains/default.nix
View file
Original file line number Diff line number Diff line change
@@ -250,142 +250,142 @@ in

clion = buildClion rec {
name = "clion-${version}";
version = "2018.3.4"; /* updated by script */
version = "2019.1"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
sha256 = "1zglpw9vc3ybdmwymi0c2m6anhcmx9jcqi69gnn06n9f4x1v6gwn"; /* updated by script */
sha256 = "1rlqnnv6b7lg18si31zd97ixnslwp8j6imkkjq0j5n9sydsr8xzj"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
};

datagrip = buildDataGrip rec {
name = "datagrip-${version}";
version = "2018.3.2"; /* updated by script */
version = "2018.3.4"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
sha256 = "0vj1cgmg33626i38x9wmh5hqr1lf0x3m23gzq30rp4q4cbi38806"; /* updated by script */
sha256 = "10sw41kkf2k60xjpwgc73i182y7px3dmqz2awnrl4gffdb9jgzmy"; /* updated by script */
};
wmClass = "jetbrains-datagrip";
update-channel = "DataGrip RELEASE";
};

goland = buildGoland rec {
name = "goland-${version}";
version = "2018.3.3"; /* updated by script */
version = "2019.1"; /* updated by script */
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
sha256 = "065z8084xkv6w8m7pq98rgls1avzrqm23mrxdq5172rs5p1c5r9f"; /* updated by script */
sha256 = "0aq3x5aixh86h1zvvwrbr2f1nnqdpfvlsadd2ckmf5s5kghvg5r9"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "GoLand RELEASE";
};

idea-community = buildIdea rec {
name = "idea-community-${version}";
version = "2018.3.4"; /* updated by script */
version = "2019.1"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
sha256 = "0j5yc7n04jlyyghmwllpfvcd2g6k1syjp07xb1ljyx7rm4jcf8q6"; /* updated by script */
sha256 = "0zyw88dd2v4igp080l99cyq6h0bmyri8a50fjp69ripiz9qaawx1"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA RELEASE";
};

idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "2018.3.4"; /* updated by script */
version = "2019.1"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
sha256 = "0s3r3h1zcwkfqhsfb224fgy62fdhnd4gjgk2h6pyhq1frnh3x5bg"; /* updated by script */
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
sha256 = "0fsdf090cwwrsq3azknc9rpwwsl71cvsx4flivnqwfakb6rh4f1j"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA RELEASE";
};

phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
version = "2018.3.3"; /* updated by script */
version = "2019.1"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
sha256 = "0znhw83h46a3haspwcin5xjf3ask8ijxla778p9vdbi9xs0zqx39"; /* updated by script */
sha256 = "1bv2a16wsc9j82w14qfrfjgszwkihk0jwp8bp8z9618q04c8vmgf"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE";
};

pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
version = "2018.3.4"; /* updated by script */
version = "2019.1"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "11kzzwkp206l466ii6vm6iqmhpx0s594vh37x2lwwsgmg6qzz6vq"; /* updated by script */
sha256 = "173qm2g6pjga2jlw8sa59bxw543b56r56ikqwv2wp0jq5z61v26f"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE";
};

pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
version = "2018.3.4"; /* updated by script */
version = "2019.1"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
sha256 = "1m8lzghs6g57fwcv6bpmnf21d4w2k10gsmi0i2wv2j8ff4hcy7ij"; /* updated by script */
sha256 = "0gjphdzdxgvflkzaakf3c1wnig86lxhxyx6xk6rg40yj6f2hzi47"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE";
};

rider = buildRider rec {
name = "rider-${version}";
version = "2018.3.2"; /* updated by script */
version = "2018.3.4"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
sha256 = "1ffzbp2xca2z8g0wlkvmqr0j2f2dnqafpnvzk9zd5asfhhbyrhg5"; /* updated by script */
sha256 = "1klmg8wgj3shp4s0n2nn7n39zsk1mch6g9ifhwn5cgywpbzgam4p"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "Rider RELEASE";
};

ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
version = "2018.3.3"; /* updated by script */
version = "2018.3.5"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "1zjcdsr91y07dhqmhqy2yq6c0rhsxg2m52fz14hhmphddlwvhzny"; /* updated by script */
sha256 = "1gykag8fsfqxv0d6fipn18hhpdvn4qxva2kkb0v330vp73wm2i2w"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "RubyMine RELEASE";
};

webstorm = buildWebStorm rec {
name = "webstorm-${version}";
version = "2018.3.4"; /* updated by script */
version = "2019.1"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
sha256 = "11l39yy8qdrr89y9x3i9acp0am4xb86z6v7wg1kc9fd5p13jr2xs"; /* updated by script */
sha256 = "0r6a9g8ydnxf805gn2wajnwkcyfn0xksbsrs8wq6j4ghipkhscxj"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WebStorm RELEASE";
4 changes: 2 additions & 2 deletions pkgs/development/compilers/jetbrains-jdk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,12 +7,12 @@

let drv = stdenv.mkDerivation rec {
pname = "jetbrainsjdk";
version = "152b1248.6";
version = "202b1483.37";
name = pname + "-" + version;

src = if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbsdk8u${version}_linux_x64.tar.gz";
url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk8u${version}_linux_x64.tar.gz";
sha256 = "12l81g8zhaymh4rzyfl9nyzmpkgzc7wrphm3j4plxx129yn9i7d7";
}
else
4 changes: 2 additions & 2 deletions pkgs/servers/mail/dovecot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
}:

stdenv.mkDerivation rec {
name = "dovecot-2.3.4.1";
name = "dovecot-2.3.5.1";

nativeBuildInputs = [ perl pkgconfig ];
buildInputs =
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://dovecot.org/releases/2.3/${name}.tar.gz";
sha256 = "01xa8d08c0j51w5kmqb3vnzrvh17hkzx5a5p7fb5hgn3wln3x1xq";
sha256 = "0gy3qzwbp6zsyn44pcfq8iiv9iy9q7z6py30h60alb1vkr3rv3yp";
};

enableParallelBuilding = true;
8 changes: 3 additions & 5 deletions pkgs/servers/web-apps/matomo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,11 @@

stdenv.mkDerivation rec {
name = "matomo-${version}";
version = "3.8.1";
version = "3.9.1";

src = fetchurl {
# TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again
# url = "https://builds.matomo.org/${name}.tar.gz";
url = "https://builds.matomo.org/piwik-${version}.tar.gz";
sha256 = "0ca4fkg2jpkfg0r9hxl45ad5xzz0gxhf404i96j059bn3c41kfi0";
url = "https://builds.matomo.org/matomo-${version}.tar.gz";
sha256 = "1y406dnwn4jyrjr2d5qfsg3b4v7nfbh09v74dm1vlcy3mkbhv2bp";
};

nativeBuildInputs = [ makeWrapper ];