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: 777d5ee7323e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 638fb38ef046
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 22, 2017

  1. services.jenkins.plugins: fix initial case

    @Fuuzetsu
    Fuuzetsu committed May 22, 2017
    Copy the full SHA
    cb5cb0b View commit details

  2. jenkins: 2.61 -> 2.62

    @Fuuzetsu
    Fuuzetsu committed May 22, 2017
    Copy the full SHA
    638fb38 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 nixos/modules/services/continuous-integration/jenkins/default.nix
  2. +2 −2 pkgs/development/tools/continuous-integration/jenkins/default.nix
4 changes: 2 additions & 2 deletions nixos/modules/services/continuous-integration/jenkins/default.nix
View file
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ in {

plugins = mkOption {
default = null;
#type = types.nullOr (types.attrsOf types.package);
type = types.nullOr (types.attrsOf types.package);
description = ''
A set of plugins to activate. Note that this will completely
remove and replace any previously installed plugins. If you
@@ -175,7 +175,7 @@ in {
(n: v: "cp ${v} ${cfg.home}/plugins/${n}.hpi")
cfg.plugins;
in ''
rm -r ${cfg.home}/plugins
rm -r ${cfg.home}/plugins || true
mkdir -p ${cfg.home}/plugins
${lib.strings.concatStringsSep "\n" pluginCmds}
'';
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.61";
version = "2.62";

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

buildCommand = ''