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: 9cd63d068f4a
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: 233da30ce288
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 20, 2019

  1. jenkins: 2.190.2 -> 2.190.3 

    (cherry picked from commit bb9da13)
    @NeQuissimus
    NeQuissimus committed Dec 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6C654787275A64F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8837403 View commit details

  2. jenkins: 2.190.3 -> 2.204.1 

    (cherry picked from commit bbf9c5e)
    @NeQuissimus
    NeQuissimus committed Dec 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6C654787275A64F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8e4c9d1 View commit details

Commits on Dec 21, 2019

  1. pythia: 8.243 -> 8.244 

    (cherry picked from commit 4544107)

cc #76105
    @veprbl
    veprbl committed Dec 21, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    233da30 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/development/libraries/physics/pythia/default.nix
  2. +2 −2 pkgs/development/tools/continuous-integration/jenkins/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/physics/pythia/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "pythia";
version = "8.243";
version = "8.244";

src = fetchurl {
url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz";
sha256 = "0y8w5gdaczg8vdw63rkgjr1dcvqs2clqkdia34p30xcwgm1jgv7q";
sha256 = "1jlj9hgmk2gcm5p0zqsiz0dpv9vvj8ip261si7frrwfsk7wq0j73";
};

buildInputs = [ boost fastjet hepmc2 zlib rsync lhapdf ];
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 {
pname = "jenkins";
version = "2.190.2";
version = "2.204.1";

src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "09zij2gpg1i0pkx1nsgccc26p8z4gy4ljhch8m767xaa0000lqj7";
sha256 = "112jimw5sf6n9nszmpsllz9sb06d3d8i45fin3m1vkdikszypf8j";
};

buildCommand = ''