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

Merge branch 'master' of github.com:vmchale/nixpkgs

Browse Source
This commit is contained in:
Vanessa McHale 2017-04-08 00:14:49 -05:00
commit 8a78fc5a34
21 changed files with 169 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/networking/avahi-daemon.nix
View File

@ -21,6 +21,7 @@ let
use-ipv6=${if ipv6 then "yes" else "no"}
${optionalString (interfaces!=null) "allow-interfaces=${concatStringsSep "," interfaces}"}
${optionalString (domainName!=null) "domain-name=${domainName}"}
allow-point-to-point=${if allowPointToPoint then "yes" else "no"}
[wide-area]
enable-wide-area=${if wideArea then "yes" else "no"}
@ -98,6 +99,15 @@ in
'';
};
allowPointToPoint = mkOption {
default = false;
description= ''
Whether to use POINTTOPOINT interfaces. Might make mDNS unreliable due to usually large
latencies with such links and opens a potential security hole by allowing mDNS access from Internet
connections. Use with care and YMMV!
'';
};
wideArea = mkOption {
default = true;
description = ''Whether to enable wide-area service discovery.'';

4
nixos/modules/services/x11/compton.nix
View File

@ -83,7 +83,7 @@ in {
"focused = 1"
];
description = ''
List of condition of windows that should have no shadow.
List of conditions of windows that should not be faded.
See <literal>compton(1)</literal> man page for more examples.
'';
};
@ -123,7 +123,7 @@ in {
"focused = 1"
];
description = ''
List of condition of windows that should have no shadow.
List of conditions of windows that should have no shadow.
See <literal>compton(1)</literal> man page for more examples.
'';
};

2
nixos/release.nix
View File

@ -288,8 +288,8 @@ in rec {
tests.pam-oath-login = callTest tests/pam-oath-login.nix {};
#tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });
tests.peerflix = callTest tests/peerflix.nix {};
tests.postgresql = callSubTests tests/postgresql.nix {};
tests.pgjwt = callTest tests/pgjwt.nix {};
tests.postgresql = callTest tests/postgresql.nix {};
tests.printing = callTest tests/printing.nix {};
tests.proxy = callTest tests/proxy.nix {};
tests.pumpio = callTest tests/pump.io.nix {};

70
nixos/tests/postgresql.nix
View File

@ -1,26 +1,46 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "postgresql";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ zagy ];
};
nodes = {
master =
{ pkgs, config, ... }:
{
services.postgresql.enable = true;
services.postgresql.initialScript = pkgs.writeText "postgresql-init.sql"
''
CREATE ROLE postgres WITH superuser login createdb;
'';
};
};
testScript = ''
startAll;
$master->waitForUnit("postgresql");
$master->sleep(10); # Hopefully this is long enough!!
$master->succeed("echo 'select 1' | sudo -u postgres psql");
{ system ? builtins.currentSystem }:
with import ../lib/testing.nix { inherit system; };
with pkgs.lib;
let
postgresql-versions = pkgs.callPackages ../../pkgs/servers/sql/postgresql { };
test-sql = pkgs.writeText "postgresql-test" ''
CREATE EXTENSION pgcrypto; -- just to check if lib loading works
CREATE TABLE sth (
id int
);
INSERT INTO sth (id) VALUES (1);
INSERT INTO sth (id) VALUES (1);
INSERT INTO sth (id) VALUES (1);
INSERT INTO sth (id) VALUES (1);
INSERT INTO sth (id) VALUES (1);
'';
})
make-postgresql-test = postgresql-name: postgresql-package: {
name = postgresql-name;
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ zagy ];
};
machine = {pkgs, config, ...}:
{
services.postgresql.package=postgresql-package;
services.postgresql.enable = true;
};
testScript = ''
$machine->start;
$machine->waitForUnit("postgresql");
# postgresql should be available just after unit start
$machine->succeed("cat ${test-sql} | psql postgres");
$machine->shutdown; # make sure that postgresql survive restart (bug #1735)
sleep(2);
$machine->start;
$machine->waitForUnit("postgresql");
$machine->fail('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 3');
$machine->succeed('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 5');
$machine->fail('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 4');
$machine->shutdown;
'';
};
in
mapAttrs' (p-name: p-package: {name=p-name; value=make-postgresql-test p-name p-package;}) postgresql-versions

5
pkgs/applications/editors/nano/default.nix
View File

@ -36,6 +36,11 @@ in stdenv.mkDerivation rec {
--sysconfdir=/etc
${optionalString (!enableNls) "--disable-nls"}
${optionalString enableTiny "--enable-tiny"}
''
# Unclear why (perhaps an impurity?) but for some reason it decides that REG_ENHANCED is available
# during configure but then can't find it at build time.
+ optionalString stdenv.isDarwin ''
nano_cv_flag_reg_extended=REG_EXTENDED
'';
postPatch = optionalString stdenv.isDarwin ''

21
pkgs/applications/editors/textadept/default.nix
View File

@ -43,11 +43,11 @@ let
# These lists are taken from the Makefile.
scintilla_tgz = "scintilla367.tgz";
scintilla_tgz = "scintilla373.tgz";
tre_zip = "cdce45e8dd7a3b36954022b4a4d3570e1ac5a4f8.zip";
scinterm_zip = "scinterm_1.8.zip";
scintillua_zip = "scintillua_3.6.7-1.zip";
lua_tgz = "lua-5.3.3.tar.gz";
scintillua_zip = "33298b6cbce3.zip";
lua_tgz = "lua-5.3.4.tar.gz";
lpeg_tgz = "lpeg-1.0.0.tar.gz";
lfs_zip = "v_1_6_3.zip";
lspawn_zip = "lspawn_1.5.zip";
@ -60,7 +60,8 @@ let
scinterm_url = "http://foicica.com/scinterm/download/" + scinterm_zip;
tre_url = "https://github.com/laurikari/tre/archive/" + tre_zip;
scintillua_url = "http://foicica.com/scintillua/download/" + scintillua_zip;
#scintillua_url = "http://foicica.com/scintillua/download/" + scintillua_zip;
scintillua_url = "http://foicica.com/hg/scintillua/archive/" + scintillua_zip;
gtdialog_url = "http://foicica.com/gtdialog/download/" + gtdialog_zip;
lspawn_url = "http://foicica.com/lspawn/download/" + lspawn_zip;
@ -75,11 +76,11 @@ let
termkey_url = "http://www.leonerd.org.uk/code/libtermkey/" + termkey_tgz;
get_scintilla = get_url scintilla_url "0rh1xgd06qcnj4l0vi8g4i94vi63s76366b8hhqky3iqdjgwsxpi";
get_scintilla = get_url scintilla_url "0rkczxzj6bqxks4jcbxbyrarjhfjh95nwxxiqprfid1kaamgkfm2";
get_tre = get_url tre_url "0mw8npwk5nnhc33352j4akannhpx77kqvfam8jdq1n4yf8js1gi7";
get_scinterm = get_url scinterm_url "02ax6cjpxylfz7iqp1cjmsl323in066a38yklmsyzdl3w7761nxi";
get_scintillua = get_url scintillua_url "0fhyjrkfj2cvxnql65687nx1d0sfyg5lbrxmylyzhnfh4s4jnwmq";
get_lua = get_url lua_url "18mcfbbmjyp8f2l9yy7n6dzk066nq6man0kpwly4bppphilc04si";
get_scintillua = get_url scintillua_url "1kx113dpjby1p9jcsqlnlzwj01z94f9szw4b38077qav3bj4lk6g";
get_lua = get_url lua_url "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn";
get_lpeg = get_url lpeg_url "13mz18s359wlkwm9d9iqlyyrrwjc6iqfpa99ai0icam2b3khl68h";
get_lfs = get_url_zip lfs_url "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri";
get_lspawn = get_url lspawn_url "09c6v9irblay2kv1n7i59pyj9g4xb43c6rfa7ba5m353lymcwwqi";
@ -87,7 +88,7 @@ let
get_libluajit = get_url libluajit_url "1nhvcdjpqrhd5qbihdm3bxpw84irfvnw2vmfqnsy253ay3dxzrgy";
get_gtdialog = get_url gtdialog_url "0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0";
get_cdk = get_url cdk_url "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382";
get_bombay = get_url_zip bombay_url "05fnh1imxdb4sb076fzqywqszp31whdbkzmpkqxc8q2r1m5vj3hg"
get_bombay = get_url_zip bombay_url "0illabngrrxidkprgz268wgjqknrds34nhm6hav95xc1nmsdr6jj"
+ "mv tip.zip bombay.zip\n";
get_termkey = get_url termkey_url "12gkrv1ldwk945qbpprnyawh0jz7rmqh18fyndbxiajyxmj97538";
@ -108,7 +109,7 @@ let
+ get_termkey;
in
stdenv.mkDerivation rec {
version = "9.0";
version = "9.3";
name = "textadept-${version}";
buildInputs = [
@ -118,7 +119,7 @@ stdenv.mkDerivation rec {
src = fetchhg {
url = http://foicica.com/hg/textadept;
rev = "textadept_${version}";
sha256 = "1fkxblf2db4i0kbfww94xwps7nbn88qc4fwghrm4dcszcq32jlfi";
sha256 = "18x79pazm86agn1khdxfnf87la6kli3xasi7dcjx7l6yyz19y14d";
};
preConfigure = ''

45
pkgs/applications/editors/vscode/default.nix
View File

@ -1,35 +1,38 @@
{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem,
makeWrapper, libXScrnSaver }:
makeWrapper, libXScrnSaver, libxkbfile }:
let
version = "1.10.2";
rev = "8076a19fdcab7e1fc1707952d652f0bb6c6db331";
version = "1.11.1";
channel = "stable";
# The revision can be obtained with the following command (see https://github.com/NixOS/nixpkgs/issues/22465):
# curl -w "%{url_effective}\n" -I -L -s -S https://vscode-update.azurewebsites.net/latest/linux-x64/stable -o /dev/null
plat = {
"i686-linux" = "linux-ia32";
"x86_64-linux" = "linux-x64";
"x86_64-darwin" = "darwin";
}.${stdenv.system};
sha256 = if stdenv.system == "i686-linux" then "1rhwrpv17c8j06qja7i58cggzka8jm9v9h27jy22z30yxjz0p241"
else if stdenv.system == "x86_64-linux" then "1c1w7wc39a5vdap8j143ym976p9l9iwns1y28mcgjwrihdlb5wb8"
else if stdenv.system == "x86_64-darwin" then "1zznsn84k79lqirzv950q7caq7c88yh2gglwjc11y8k69awmlpva"
else throw "Unsupported system: ${stdenv.system}";
sha256 = {
"i686-linux" = "14wdblh7q3m5qdsm34dpg5p7qk6llrbqk60md8wd0fb4chpvrq94";
"x86_64-linux" = "0rmzvaiar3y062mbrggiwjbwxs7izcih5333rn208ax4jxmbk4pc";
"x86_64-darwin" = "1f3zdwsz0l6r7c2k25a7j5m0dl78219jzg4axcmbfa2qcs2hw0x6";
}.${stdenv.system};
urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/";
archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
rpath = lib.concatStringsSep ":" [
atomEnv.libPath
"${lib.makeLibraryPath [libXScrnSaver]}/libXss.so.1"
"${lib.makeLibraryPath [libxkbfile]}/libxkbfile.so.1"
"$out/lib/vscode"
];
urlStr = if stdenv.system == "i686-linux" then
urlBase + "code-${channel}-code_${version}-1488982317_i386.tar.gz"
else if stdenv.system == "x86_64-linux" then
urlBase + "code-${channel}-code_${version}-1488981323_amd64.tar.gz"
else if stdenv.system == "x86_64-darwin" then
urlBase + "VSCode-darwin-${channel}.zip"
else throw "Unsupported system: ${stdenv.system}";
in
stdenv.mkDerivation rec {
name = "vscode-${version}";
inherit version;
src = fetchurl {
url = urlStr;
name = "VSCode_${version}_${plat}.${archive_fmt}";
url = "https://vscode-update.azurewebsites.net/${version}/${plat}/${channel}";
inherit sha256;
};
@ -45,7 +48,7 @@ in
buildInputs = if stdenv.system == "x86_64-darwin"
then [ unzip makeWrapper libXScrnSaver ]
else [ makeWrapper libXScrnSaver ];
else [ makeWrapper libXScrnSaver libxkbfile ];
installPhase =
if stdenv.system == "x86_64-darwin" then ''
@ -67,7 +70,7 @@ in
postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") ''
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [libXScrnSaver]}/libXss.so.1:$out/lib/vscode" \
--set-rpath "${rpath}" \
$out/lib/vscode/code
'';

4
pkgs/applications/version-management/gitkraken/default.nix
View File

@ -9,11 +9,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "gitkraken-${version}";
version = "2.3.1";
version = "2.3.3";
src = fetchurl {
url = "https://release.gitkraken.com/linux/v${version}.deb";
sha256 = "ddb9eec34232e830646633c43bc9adc61afa0eee79500af29918b62780093b2a";
sha256 = "a6e235ab1a4c1da755af8218ad819fcac6bc89b1a324aa2c0e430f3805cb1a16";
};
libPath = makeLibraryPath [

25
pkgs/development/compilers/gcc/6/darwin-const-correct.patch Normal file
View File

@ -0,0 +1,25 @@
From 5972cd58bde3bc8bacfe994e5b127c411241f255 Mon Sep 17 00:00:00 2001
From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 3 Jan 2017 05:36:40 +0000
Subject: [PATCH] * config/darwin-driver.c (darwin_driver_init):
Const-correctness fixes for first_period and second_period variables.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244010 138bc75d-0d04-0410-961f-82ee72b054a4
---
diff --git a/gcc/config/darwin-driver.c b/gcc/config/darwin-driver.c
index 0c4f0cd..e3ed79d 100644
--- a/gcc/config/darwin-driver.c
+++ b/gcc/config/darwin-driver.c
@@ -299,10 +299,10 @@ darwin_driver_init (unsigned int *decoded_options_count,
if (vers_string != NULL)
{
char *asm_major = NULL;
- char *first_period = strchr(vers_string, '.');
+ const char *first_period = strchr(vers_string, '.');
if (first_period != NULL)
{
- char *second_period = strchr(first_period+1, '.');
+ const char *second_period = strchr(first_period+1, '.');
if (second_period != NULL)
asm_major = xstrndup (vers_string, second_period-vers_string);
else

3
pkgs/development/compilers/gcc/6/default.nix
View File

@ -73,7 +73,8 @@ let version = "6.3.0";
# The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
# target libraries and tools.
++ optional langAda ../gnat-cflags.patch
++ optional langFortran ../gfortran-driving.patch;
++ optional langFortran ../gfortran-driving.patch
++ optional stdenv.isDarwin ./darwin-const-correct.patch; # Kill this after 6.3.0
javaEcj = fetchurl {
# The `$(top_srcdir)/ecj.jar' file is automatically picked up at

15
pkgs/development/libraries/itk/default.nix
View File

@ -1,13 +1,20 @@
{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }:
{ stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }:
stdenv.mkDerivation rec {
name = "itk-4.10.0";
name = "itk-4.11.0";
src = fetchurl {
url = mirror://sourceforge/itk/InsightToolkit-4.10.0.tar.xz;
sha256 = "0pxijhqsnwcp9jv1d8p11hsj90k8ajpwxhrnn8kk8c56k7y1207a";
url = mirror://sourceforge/itk/InsightToolkit-4.11.0.tar.xz;
sha256 = "0axvyds0gads5914g0m70z5q16gzghr0rk0hy3qjpf1k9bkxvcq6";
};
# Clang 4 dislikes signed comparisons of pointers against integers. Should no longer be
# necessary once we get past ITK 4.11.
patches = [ (fetchpatch {
url = "https://github.com/InsightSoftwareConsortium/ITK/commit/d1407a55910ad9c232f3d241833cfd2e59024946.patch";
sha256 = "0h851afkv23fwgkibjss30fkbz4nkfg6rmmm4pfvkwpml23gzz7s";
}) ];
cmakeFlags = [
"-DBUILD_TESTING=OFF"
"-DBUILD_EXAMPLES=OFF"

8
pkgs/development/libraries/podofo/default.nix
View File

@ -10,8 +10,12 @@ stdenv.mkDerivation rec {
};
propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ];
nativeBuildInputs = [ cmake gcc5 pkgconfig ];
buildInputs = [ lua5 stdenv.cc.libc ];
# Does Linux really need gcc5? Darwin doesn't seem to...
nativeBuildInputs = [ cmake pkgconfig ] ++ stdenv.lib.optional stdenv.isLinux gcc5;
# Does Linux really need libc here? Darwin doesn't seem to...
buildInputs = [ lua5 ] ++ stdenv.lib.optional stdenv.isLinux stdenv.cc.libc;
crossAttrs = {
propagatedBuildInputs = [ zlib.crossDrv freetype.crossDrv libjpeg.crossDrv

4
pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
View File

@ -80,7 +80,7 @@ stdenv.mkDerivation {
sed -i \
-e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \
-e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \
-e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \
-e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot=/nonsense|' \
-e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \
-e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \
-e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \
@ -208,7 +208,7 @@ stdenv.mkDerivation {
xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
ApplicationServices CoreServices AppKit Carbon OpenGL AGL Cocoa
DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk
DiskArbitration darwin.cf-private libiconv
]);
buildInputs =

4
pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
View File

@ -82,7 +82,7 @@ stdenv.mkDerivation {
sed -i \
-e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \
-e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \
-e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \
-e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot=/nonsense|' \
-e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \
-e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \
-e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \
@ -212,7 +212,7 @@ stdenv.mkDerivation {
xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
ApplicationServices Foundation CoreServices AppKit Carbon OpenGL AGL Cocoa
DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk
DiskArbitration darwin.cf-private libiconv
]);
buildInputs = [ ]

4
pkgs/development/tools/build-managers/sbt/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sbt-${version}";
version = "0.13.13";
version = "0.13.14";
src = fetchurl {
url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
sha256 = "0ygrz92qkzasj6fps1bjg7wlgl69867jjjc37yjadib0l8hkvl20";
sha256 = "1q4jnrva21s0rhcn561ayfp5yhd6rpxidgx6f4i5n3dla3p9zkr9";
};
patchPhase = ''

49
pkgs/development/tools/rq/default.nix
View File

@ -4,59 +4,16 @@ with rustPlatform;
buildRustPackage rec {
name = "rq-${version}";
version = "0.9.2";
version = "0.10.4";
src = fetchFromGitHub {
owner = "dflemstr";
repo = "rq";
rev = "v${version}";
sha256 = "051k7ls2mbjf584crayd654wm8m7gk3b7s73j97f9l8sbppdhpcq";
sha256 = "066f6sdy0vrp113wlg18q9p0clyrg9iqbj17ly0yn8dxr5iar002";
};
serde_json = fetchFromGitHub {
owner = "serde-rs";
repo = "json";
rev = "0c05059e4533368020bd356bd708c38286810a7d";
sha256 = "0924ngqbsif2vmmpgn8l2gg4bzms0z0i7yng0zx6sdv0x836lw43";
};
v8_rs = fetchFromGitHub {
owner = "dflemstr";
repo = "v8-rs";
rev = "0772be5b2e84842a2d434963702bc2995aeda90b";
sha256 = "0h2n431rp6nqpip7dy7xpckkvcr19aq7l1f3x3wlrj02xi4c8mad";
};
cargoDepsHook = ''
# use non-git dependencies
(cd $sourceRoot && patch -p1 <<EOF)
diff -u a/Cargo.toml b/Cargo.toml
--- a/Cargo.toml 2016-12-03 21:29:31.615019030 +0100
+++ b/Cargo.toml 2016-12-03 21:30:12.188170359 +0100
@@ -40,15 +40,16 @@
version = "*"
[dependencies.serde_json]
-branch = "v0.9.0"
-git = "https://github.com/serde-rs/json.git"
+path = "${serde_json}/json"
+version = "*"
[dependencies.toml]
features = ["serde"]
version = "*"
[dependencies.v8]
-git = "https://github.com/dflemstr/v8-rs.git"
+path = "${v8_rs}"
+version = "*"
[features]
shared = ["v8/shared"]
EOF
'';
depsSha256 = "1pci9iwf4y574q32b05gbc490iqw5i7shvqgb1gblchrihvlkddq";
depsSha256 = "138h0q2a2gghfjpwfi11zw4rkipvmglb7srqz56ibbw2xliid2wl";
buildInputs = [ llvmPackages.clang-unwrapped v8 ];

4
pkgs/development/tools/scalafmt/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, unzip, jre }:
stdenv.mkDerivation rec {
version = "0.6.7";
version = "0.6.8";
baseName = "scalafmt";
name = "${baseName}-${version}";
src = fetchurl {
url = "https://github.com/scalameta/scalafmt/releases/download/v${version}/${baseName}.tar.gz";
sha256 = "122x4a5x8024s7qqqs7vx8kz1x18q2l6alcvpzvsqkc304ybhfmh";
sha256 = "1iaanrxk5lhxx1zj9gbxzgqbnyy1azfrab984mga7di5z1hs02s2";
};
unpackPhase = "tar xvzf $src";

7
pkgs/misc/cups/default.nix
View File

@ -53,6 +53,11 @@ stdenv.mkDerivation rec {
"--disable-launchd"
];
# XXX: Hackery until https://github.com/NixOS/nixpkgs/issues/24693
preBuild = if stdenv.isDarwin then ''
export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks
'' else null;
installFlags =
[ # Don't try to write in /var at build time.
"CACHEDIR=$(TMPDIR)/dummy"
@ -109,6 +114,6 @@ stdenv.mkDerivation rec {
description = "A standards-based printing system for UNIX";
license = licenses.gpl2; # actually LGPL for the library and GPL for the rest
maintainers = with maintainers; [ jgeerds ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

2
pkgs/tools/backup/bup/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchurl, makeWrapper
, perl, pandoc, python2Packages, git
, par2cmdline ? null, par2Support ? false
, par2cmdline ? null, par2Support ? true
}:
assert par2Support -> par2cmdline != null;

4
pkgs/tools/compression/brotli/default.nix
View File

@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake ];
# This breaks on Darwin because our cmake hook tries to make a build folder
# and the wonderful bazel BUILD file is already there (yay case-insensitivty?)
prePatch = "rm BUILD";
meta = with stdenv.lib; {
inherit (src.meta) homepage;

8
pkgs/top-level/all-packages.nix
View File

@ -1118,9 +1118,7 @@ with pkgs;
inherit (pythonPackages) gyp;
};
bup = callPackage ../tools/backup/bup {
par2Support = config.bup.par2Support or false;
};
bup = callPackage ../tools/backup/bup { };
burp_1_3 = callPackage ../tools/backup/burp/1.3.48.nix { };
@ -9448,7 +9446,7 @@ with pkgs;
inherit newScope;
inherit stdenv fetchurl makeSetupHook makeWrapper;
bison = bison2; # error: too few arguments to function 'int yylex(...
cups = if stdenv.isLinux then cups else null;
inherit cups;
harfbuzz = harfbuzz-icu;
mesa = mesa_noglu;
inherit perl;
@ -9461,7 +9459,7 @@ with pkgs;
inherit newScope;
inherit stdenv fetchurl makeSetupHook makeWrapper;
bison = bison2; # error: too few arguments to function 'int yylex(...
cups = if stdenv.isLinux then cups else null;
inherit cups;
harfbuzz = harfbuzz-icu;
mesa = mesa_noglu;
inherit perl;