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: edd63e05d1e3
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: a37638d46706
Choose a head ref
  • 9 commits
  • 5 files changed
  • 5 contributors

Commits on Aug 30, 2018

  1. xorg.libX11: 1.6.5 -> 1.6.6 (security) 

    CVE-2018-14598, CVE-2018-14599, CVE-2018-14600
https://lists.x.org/archives/xorg-announce/2018-August/002915.html

(cherry picked from commit cb44c3f)
    @vcunat
    vcunat committed Aug 30, 2018
    Copy the full SHA
    5e42ee9 View commit details

  2. atlassian-jira: 7.7.0 -> 7.9.0 

    (cherry picked from commit f46368b)
    @jbgi @globin
    jbgi authored and globin committed Aug 30, 2018
    Copy the full SHA
    89776b3 View commit details

  3. atlassian-jira: 7.9.0 -> 7.9.2 

    (cherry picked from commit abf36cf)
    @globin
    globin committed Aug 30, 2018
    Copy the full SHA
    8b4041d View commit details

  4. atlassian-jira: 7.9.2 -> 7.11.0 

    (cherry picked from commit 2799d11)
    @ciil @globin
    ciil authored and globin committed Aug 30, 2018
    Copy the full SHA
    0ec52b8 View commit details

  5. atlassian-jira: 7.11.0 -> 7.11.1 

    (cherry picked from commit 093eb27a9e5793343f6506d063debb3d11794ac1)
(cherry picked from commit 7e6558ecb9de4b41f86f1f71b09ca3348a348849)
    @ciil @globin
    ciil authored and globin committed Aug 30, 2018
    Copy the full SHA
    3530e92 View commit details

  6. atlassian-jira: 7.11.1 -> 7.11.2 

    (cherry picked from commit aa52aa68a33313e4e209872a0422622ae65116cc)
(cherry picked from commit aa40749f1ac8df397e052fe2ad9c082d8e781588)
    @ciil @globin
    ciil authored and globin committed Aug 30, 2018
    Copy the full SHA
    8bb39a3 View commit details

  7. atlassian-jira: 7.11.2 -> 7.12.0 

    (cherry picked from commit b2f042dfd8edf67d3096ff3294ff9050890ecfdd)
(cherry picked from commit 1c461d7eb7d27396a3a20e38d048546bf3f11379)
    @ciil @globin
    ciil authored and globin committed Aug 30, 2018
    Copy the full SHA
    7c40ff5 View commit details

  8. wireshark: 2.4.7 -> 2.4.9 (security) 

    https://www.wireshark.org/docs/relnotes/wireshark-2.4.8.html
https://www.wireshark.org/docs/relnotes/wireshark-2.4.9.html

I briefly tested capturing some traffic via the GUI.
master uses 2.6.x already; /cc #45796.
    @vcunat
    vcunat committed Aug 30, 2018
    Copy the full SHA
    9527b01 View commit details

  9. nixos: stumpwm: switch from package marked as broken to working quick… 

    …lisp package (#40501)

(cherry picked from commit efde5fe)
    @arcadio @rycee
    arcadio authored and rycee committed Aug 30, 2018
    Copy the full SHA
    a37638d View commit details
4 changes: 2 additions & 2 deletions nixos/modules/services/x11/window-managers/stumpwm.nix
View file
Original file line number Diff line number Diff line change
@@ -15,10 +15,10 @@ in
services.xserver.windowManager.session = singleton {
name = "stumpwm";
start = ''
${pkgs.stumpwm}/bin/stumpwm &
${pkgs.lispPackages.stumpwm}/bin/stumpwm &
waitPID=$!
'';
};
environment.systemPackages = [ pkgs.stumpwm ];
environment.systemPackages = [ pkgs.lispPackages.stumpwm ];
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/networking/sniffers/wireshark/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,15 +12,15 @@ assert withQt -> !withGtk && qt5 != null;
with stdenv.lib;

let
version = "2.4.7";
version = "2.4.9";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";

in stdenv.mkDerivation {
name = "wireshark-${variant}-${version}";

src = fetchurl {
url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
sha256 = "0i2ggkkx7fphsk7kv9kygsf5pcaf4vgnqgi8mj1rrf2gfdl3rjsy";
sha256 = "1qrkqrm96gj3wah42qj62axgdzin8cwiscpcwbq3d596cm3g5i33";
};

cmakeFlags = [
6 changes: 3 additions & 3 deletions pkgs/servers/atlassian/jira.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
name = "atlassian-jira-${version}";
version = "7.7.0";
version = "7.12.0";

src = fetchurl {
url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
sha256 = "1np1zf6yxras15ambf92g8snnvph9pp2dk4yw6w58yfil5kzp70l";
sha256 = "0kpsgq54xs43rwhg9zwh869jl64ywhb4fcyp5sq1zd19y5cqfnkn";
};

phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
description = "Proprietary issue tracking product, also providing project management functions";
homepage = https://www.atlassian.com/software/jira;
license = licenses.unfree;
maintainers = with maintainers; [ fpletz globin ];
maintainers = with maintainers; [ fpletz globin ciil ];
};
}
6 changes: 3 additions & 3 deletions pkgs/servers/x11/xorg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -740,11 +740,11 @@ let
}) // {inherit windowswmproto libX11 libXext xextproto ;};

libX11 = (mkDerivation "libX11" {
name = "libX11-1.6.5";
name = "libX11-1.6.6";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2;
sha256 = "0pa3cfp6h9rl2vxmkph65250gfqyki0ccqyaan6bl9d25gdr0f2d";
url = mirror://xorg/individual/lib/libX11-1.6.6.tar.bz2;
sha256 = "0ks1mxlda7nxfmffihi15ljsn50q8dknl33i2xag8xzc80fiizk5";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
2 changes: 1 addition & 1 deletion pkgs/servers/x11/xorg/tarballs-7.7.list
View file
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2
mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2
mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2
mirror://xorg/individual/lib/libX11-1.6.6.tar.bz2
mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2
mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2
mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2