public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-11-14 13:31:39 +01:00
parent f799388550 c747894638
commit c6e31d0767
212 changed files with 6404 additions and 2952 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/hy/default.nix
+4 -4
View File
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, pythonPackages }:
{ stdenv, fetchurl, python2Packages }:
pythonPackages.buildPythonApplication rec {
python2Packages.buildPythonApplication rec {
pname = "hy";
version = "0.17.0";
src = pythonPackages.fetchPypi {
src = python2Packages.fetchPypi {
inherit pname version;
sha256 = "1gdbqsirsdxj320wnp7my5awzs1kfs6m4fqmkzbd1zd47qzj0zfi";
};
propagatedBuildInputs = with pythonPackages; [
propagatedBuildInputs = with python2Packages; [
appdirs
astor
clint
pkgs/development/interpreters/renpy/default.nix
+2 -2
View File
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, pythonPackages, pkgconfig, SDL2
{ stdenv, fetchurl, python2Packages, pkgconfig, SDL2
, libpng, ffmpeg, freetype, glew, libGLU_combined, fribidi, zlib
, glib
}:
with pythonPackages;
with python2Packages;
stdenv.mkDerivation rec {
pname = "renpy";