Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fe62c993b5df
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4d07c0346261
Choose a head ref
  • 6 commits
  • 2 files changed
  • 4 contributors

Commits on May 22, 2017

  1. libopus: 1.1.3 -> 1.1.4 

    (cherry picked from commit 88af502)

Security release. See #25973.

Fixes CVE-2017-0381.
    @GeNTooFReaK @fpletz
    GeNTooFReaK authored and fpletz committed May 22, 2017
    Copy the full SHA
    50fdb3a View commit details

  2. jenkins: 2.49 -> 2.53 

    (cherry picked from commit 6049560)
    @fpletz
    fpletz committed May 22, 2017
    Copy the full SHA
    514985c View commit details

  3. jenkins: 2.53 -> 2.55 

    (cherry picked from commit fce59d4)
    @earldouglas @fpletz
    earldouglas authored and fpletz committed May 22, 2017
    Copy the full SHA
    7d44e01 View commit details

  4. jenkins: 2.55 -> 2.56 

    (cherry picked from commit fa8ee0d)
    @earldouglas @fpletz
    earldouglas authored and fpletz committed May 22, 2017
    Copy the full SHA
    79011fa View commit details

  5. jenkins: 2.56 -> 2.61 

    (cherry picked from commit a7e861a)

Fixes CVE-2017-1000355. https://jenkins.io/security/advisory/2017-04-26/
    @Fuuzetsu @fpletz
    Fuuzetsu authored and fpletz committed May 22, 2017
    Copy the full SHA
    da121ec View commit details

  6. jenkins: 2.61 -> 2.62 

    (cherry picked from commit 638fb38)
    @Fuuzetsu @fpletz
    Fuuzetsu authored and fpletz committed May 22, 2017
    Copy the full SHA
    4d07c03 View commit details
Showing with 4 additions and 11 deletions.
  1. +2 −9 pkgs/development/libraries/libopus/default.nix
  2. +2 −2 pkgs/development/tools/continuous-integration/jenkins/default.nix
11 changes: 2 additions & 9 deletions pkgs/development/libraries/libopus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,23 +2,16 @@
, fixedPoint ? false, withCustomModes ? true }:

let
version = "1.1.3";
version = "1.1.4";
in
stdenv.mkDerivation rec {
name = "libopus-${version}";

src = fetchurl {
url = "http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz";
sha256 = "0cxnd7pjxbgh6l3cbzsw29phpr5cq28fikfhjlp1hc3y5s0gxdjq";
sha256 = "14l6kpapmcnvl7p9hrmbqcnzj13zfzyppyc9a5kd4788h2rvc8li";
};

patches = [
(fetchpatch { # CVE-2017-0381
url = "https://github.com/xiph/opus/commit/79e8f527b0344b0897a65be35e77f7885bd99409.patch";
sha256 = "0clm4ixqkaj0a6i5rhaqfv3nnxyk33b2b8xlm7vyfd0y8kbh996q";
})
];

outputs = [ "out" "dev" ];

configureFlags = stdenv.lib.optional fixedPoint "--enable-fixed-point"
4 changes: 2 additions & 2 deletions pkgs/development/tools/continuous-integration/jenkins/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "jenkins-${version}";
version = "2.49";
version = "2.62";

src = fetchurl {
url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
sha256 = "0c7qnrx87wrgxgh4im1i6sqlxq3hsrs119krh5vwjzx5wp6daa93";
sha256 = "1dqmvbl5sa82zsc03ns5i7ppjmdlg3pyk676xjxyr0p5ccbqlxxh";
};

buildCommand = ''