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

Merge branch master into staging to fix eval error

Browse Source 
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05 & eba8f542.
This commit is contained in:
Andreas Rammhold
2020-10-28 03:03:27 +01:00
parent 5d03fe6ac4 c127653b72
commit db0fe5c3eb
459 changed files with 6060 additions and 2715 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/dtc/default.nix
-1
View File
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python swig ];
buildInputs = lib.optionals pythonSupport [ python ];
postPatch = ''
patchShebangs pylibfdt/
pkgs/development/compilers/flutter/flutter.nix
+1 -2
View File
@@ -110,8 +110,7 @@ in runCommand drvName {
allowSubstitutes = false;
passthru = { unwrapped = flutter; };
meta = with stdenv.lib; {
description =
"Flutter is Google's SDK for building mobile, web and desktop with Dart.";
description = "Flutter is Google's SDK for building mobile, web and desktop with Dart";
longDescription = ''
Flutter is Google’s UI toolkit for building beautiful,
natively compiled applications for mobile, web, and desktop from a single codebase.
pkgs/development/compilers/fpc/lazarus.nix
+1 -1
View File
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
description = "Lazarus graphical IDE for the FreePascal language";
description = "Graphical IDE for the FreePascal language";
homepage = "https://www.lazarus.freepascal.org";
license = licenses.gpl2Plus ;
maintainers = with maintainers; [ raskin ];
pkgs/development/compilers/miranda/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchzip, fetchpatch, gcc }:
{ stdenv, lib, fetchzip, fetchpatch }:
stdenv.mkDerivation rec {
pname = "miranda";
pkgs/development/compilers/mlkit/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mlkit";
version = "4.5.0";
version = "4.5.1";
src = fetchFromGitHub {
owner = "melsman";
repo = "mlkit";
rev = "v${version}";
sha256 = "0fc0y40qphn02857fv2dvhwzzsvgixzchx9i6i0x80xfv7z68fbh";
sha256 = "1zigigp168737vjrw5vijgyw4k1bgz4sr7j3rwlibw52snsh4y1c";
};
nativeBuildInputs = [ autoreconfHook mlton ];
pkgs/development/compilers/stalin/default.nix
+1 -1
View File
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://www.ece.purdue.edu/~qobi/software.html";
license = stdenv.lib.licenses.gpl2Plus;
description = "Stalin, an optimizing Scheme compiler";
description = "An optimizing Scheme compiler";
maintainers = [ ];
platforms = ["i686-linux"]; # doesn't want to work on 64-bit platforms
pkgs/development/compilers/zulu/8.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib
, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg
, fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg
, swingSupport ? true }:
let
@@ -16,8 +16,8 @@ let
libraries = [
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL
xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
gnome2.gtk cairo gdk-pixbuf atk
xorg.libXxf86vm alsaLib fontconfig freetype pango
gtk2 cairo gdk-pixbuf atk
] ++ (lib.optionals swingSupport (with xorg; [
xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp
xorg.libXt xorg.libXrender stdenv.cc.cc
pkgs/development/compilers/zulu/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib
, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg, zlib
, fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg, zlib
, swingSupport ? true }:
let
@@ -16,8 +16,8 @@ let
libraries = [
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL
xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
gnome2.gtk cairo gdk-pixbuf atk zlib
xorg.libXxf86vm alsaLib fontconfig freetype pango
gtk2 cairo gdk-pixbuf atk zlib
] ++ (lib.optionals swingSupport (with xorg; [
xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp
xorg.libXt xorg.libXrender stdenv.cc.cc