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: d934d0818b30
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: bc5e2df902bb
Choose a head ref
  • 3 commits
  • 3 files changed
  • 3 contributors

Commits on Apr 11, 2019

  1. renpy: 7.1.3 -> 7.2.0 

    (cherry picked from commit 154a7d3)

Fixes build of renpy and pygame_sdl2.
    @callahad @erosennin
    callahad authored and erosennin committed Apr 11, 2019
    Copy the full SHA
    d697522 View commit details

  2. Merge pull request #59274 from erosennin/backport-renpy-update 

    [backport] renpy: 7.1.3 -> 7.2.0
    @worldofpeace
    worldofpeace authored Apr 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6f6e99e View commit details

  3. jenkins: 2.164.1 -> 2.164.2 (#59309) 

    (cherry picked from commit c2b1f00)
    @cawilliamson @xeji
    cawilliamson authored and xeji committed Apr 11, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    bc5e2df View commit details
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/renpy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ with pythonPackages;

stdenv.mkDerivation rec {
name = "renpy-${version}";
version = "7.1.3";
version = "7.2.0";

meta = with stdenv.lib; {
description = "Ren'Py Visual Novel Engine";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2";
sha256 = "0z6s1vzjb5jh0i79pv5kgynfrzqj1a1f3afrpmp2aaqbrljkidbn";
sha256 = "1pnzxmh37zzldvlyklk2wgc8xbh3hm3wwmbl70zdphybjrxvc7i5";
};

patches = [
14 changes: 5 additions & 9 deletions pkgs/development/python-modules/pygame_sdl2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,30 +4,26 @@
buildPythonPackage rec {
pname = "pygame_sdl2";
version = "2.1.0";
renpy_version = "6.99.14";
renpy_version = "7.2.0";
name = "${pname}-${version}-${renpy_version}";

src = fetchurl {
url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz";
sha256 = "1zsnb2bivbwysgxmfg9iv12arhpf3gqkmqinhciz955hlqv016b9";
sha256 = "1amgsb6mm8ssf7vdcs5dr8rlxrgyhh29m4i573z1cw61ynd7vgcw";
};

# force rebuild of headers needed for install
prePatch = ''
rm -rf gen gen3
'';

patches = [
# fix for recent sdl2
(fetchpatch {
url = "https://github.com/apoleon/pygame_sdl2/commit/ced6051f4a4559a725804cc58c079e1efea0a573.patch";
sha256 = "08rqjzvdlmmdf8kyd8ws5lzjy1mrwnds4fdy38inkyw7saydcxyr";
})
nativeBuildInputs = [
SDL2.dev cython
];

buildInputs = [
SDL2 SDL2_image SDL2_ttf SDL2_mixer
cython libjpeg libpng
libjpeg libpng
];


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.164.1";
version = "2.164.2";

src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "02r2kf0v7pbi6xfak5ii7cwi5pq2awq4pcsi6d7k8m7f69b3ym35";
sha256 = "1pmya8g3gs5f9ibbgacdh5f6828jcrydw7v7xmg2j86kwc1vclf8";
};

buildCommand = ''