mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 02:13:23 +00:00
Merge master into staging
This is to cleanup the (re-)revert of merge to master.
This commit is contained in:
Vladimír Čunát
commit
6168c2e45f
@ -228,10 +228,6 @@ in
|
||||
[ "aes" "aes_generic" "blowfish" "twofish"
|
||||
"serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512"
|
||||
|
||||
# workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged
|
||||
# remove once 'modprobe --show-depends xts' shows ecb as a dependency
|
||||
"ecb"
|
||||
|
||||
(if pkgs.stdenv.system == "x86_64-linux" then "aes_x86_64" else "aes_i586")
|
||||
];
|
||||
description = ''
|
||||
@ -441,7 +437,10 @@ in
|
||||
# Some modules that may be needed for mounting anything ciphered
|
||||
# Also load input_leds to get caps lock light working (#12456)
|
||||
boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" "input_leds" ]
|
||||
++ luks.cryptoModules;
|
||||
++ luks.cryptoModules
|
||||
# workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged
|
||||
# remove once 'modprobe --show-depends xts' shows ecb as a dependency
|
||||
++ (if builtins.elem "xts" luks.cryptoModules then ["ecb"] else []);
|
||||
|
||||
# copy the cryptsetup binary and it's dependencies
|
||||
boot.initrd.extraUtilsCommands = ''
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "flacon-${version}";
|
||||
version = "2.1.1";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flacon";
|
||||
repo = "flacon";
|
||||
rev = "v${version}";
|
||||
sha256 = "0jazv3d1xaydp2ws1pd5rmga76z5yk74v3a8yqfc8vbb2z6ahimz";
|
||||
sha256 = "0l0xbzpy4nnr08z7gqvb4ngrjwzpspa382cbcrpkya3nd40987kr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
|
||||
, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
|
||||
|
||||
let version = "3.30.0"; in
|
||||
let version = "3.31.0"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "filezilla-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
|
||||
sha256 = "1w0zqkccbsbmnjc9pfd1i3ywzwrdp0pprryvdk4sfn5ms9nnf2wi";
|
||||
sha256 = "1rfysb8dil35a7bzj2kw0mzzkys39d7yn6ipsbk8l6rkwfvnii8l";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -54,6 +54,10 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
'';
|
||||
|
||||
# Notmuch doesn't use autoconf and consequently doesn't tag --bindir and
|
||||
# friends
|
||||
setOutputFlags = false;
|
||||
enableParallelBuilding = true;
|
||||
makeFlags = "V=1";
|
||||
|
||||
preFixup = optionalString stdenv.isDarwin ''
|
||||
|
||||
@ -6,18 +6,15 @@
|
||||
, enableCli ? true
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.92";
|
||||
in
|
||||
|
||||
let inherit (stdenv.lib) optional optionals optionalString; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "transmission-" + optionalString enableGTK3 "gtk-" + version;
|
||||
version = "2.93";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://transmission.cachefly.net/transmission-${version}.tar.xz";
|
||||
sha256 = "0pykmhi7pdmzq47glbj8i2im6iarp4wnj4l1pyvsrnba61f0939s";
|
||||
url = "https://github.com/transmission/transmission-releases/raw/master/transmission-2.93.tar.xz";
|
||||
sha256 = "8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ]
|
||||
@ -27,16 +24,6 @@ stdenv.mkDerivation rec {
|
||||
++ optionals enableSystemd [ systemd ]
|
||||
++ optionals stdenv.isLinux [ inotify-tools ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# See https://github.com/transmission/transmission/pull/468
|
||||
# Patch from: https://github.com/transmission/transmission/pull/468#issuecomment-357098126
|
||||
name = "transmission-fix-dns-rebinding-vuln.patch";
|
||||
url = https://github.com/transmission/transmission/files/1624507/transmission-fix-dns-rebinding-vuln.patch.txt;
|
||||
sha256 = "1p9m20kp4kdyp5jjr3yp5px627n8cfa29mg5n3wzsdfv0qzk9gy4";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./configure \
|
||||
--replace "libsystemd-daemon" "libsystemd" \
|
||||
|
||||
@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
name = "dvdstyler-${version}";
|
||||
srcName = "DVDStyler-${version}";
|
||||
version = "3.0.3";
|
||||
version = "3.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/${srcName}.tar.bz2";
|
||||
sha256 = "1j432kszmwmsd3nz398h5514dbm5vsrn4rr3iil72ckjj1h3i00q";
|
||||
sha256 = "0lwc0hn94m9r8fi07sjqz3fr618l6lnw3zsakxw7nlgnxbjsk7pi";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, qmake, qtscript }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "smplayer-17.9.0";
|
||||
name = "smplayer-18.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
|
||||
sha256 = "0s9856cmwl829d2xc2ycf97phpv4a2d39ybmnbhsrb07jq5hkw1a";
|
||||
sha256 = "0q0m9q643z6ih5gkf1fq3d6y99d62yxkhfgap98h251q6kd7dhis";
|
||||
};
|
||||
|
||||
buildInputs = [ qtscript ];
|
||||
|
||||
@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit sbcl lispPackages;
|
||||
inherit sbcl lispPackages contrib;
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ fetchurl }:
|
||||
|
||||
fetchurl {
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/46704e06debe8b2c7c875d5e910fe168d7e49827.tar.gz";
|
||||
sha256 = "131ga0pz1h7f3zimrd7yn6v8q7j2wh6srjrvl97p9bx1cbg8xqgl";
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/acac7d958b43c270c8411fc65895a531e496423f.tar.gz";
|
||||
sha256 = "15crmzdnj7lpbkhb44vhh7g0ghw0xj4cqkyqyg638dslijc5mjzd";
|
||||
}
|
||||
|
||||
@ -385,6 +385,23 @@ self: super: {
|
||||
};
|
||||
});
|
||||
|
||||
## Unmerged. PR: https://github.com/sol/hpack/pull/277
|
||||
## Issue: https://github.com/sol/hpack/issues/276
|
||||
hpack = overrideCabal super.hpack (drv: {
|
||||
## • No instance for (Semigroup Dependencies)
|
||||
## arising from the 'deriving' clause of a data type declaration
|
||||
## Possible fix:
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "deepfire";
|
||||
repo = "hpack";
|
||||
rev = "acce0cffcc1d165a0fd9f0b83878dfbd622ea0d6";
|
||||
sha256 = "1wv0ya1gb1hwd9w8g4z5aig694q3arsqhxv0d4wcp270xnq9ja8y";
|
||||
};
|
||||
## Setup: Encountered missing dependencies:
|
||||
## http-client -any, http-client-tls -any, http-types -any
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ (with self; [ http-client http-client-tls http-types ]);
|
||||
});
|
||||
|
||||
## Unmerged. PR: https://github.com/hanshoglund/monadplus/pull/3
|
||||
monadplus = overrideCabal super.monadplus (drv: {
|
||||
## • No instance for (Semigroup (Partial a b))
|
||||
|
||||
@ -38,7 +38,7 @@ core-packages:
|
||||
- ghcjs-base-0
|
||||
|
||||
default-package-overrides:
|
||||
# LTS Haskell 10.6
|
||||
# LTS Haskell 10.7
|
||||
- abstract-deque ==0.3
|
||||
- abstract-deque-tests ==0.3
|
||||
- abstract-par ==0.3.3
|
||||
@ -351,7 +351,7 @@ default-package-overrides:
|
||||
- Cabal ==2.0.1.1
|
||||
- cabal-doctest ==1.0.6
|
||||
- cabal-file-th ==0.2.4
|
||||
- cabal-rpm ==0.12
|
||||
- cabal-rpm ==0.12.1
|
||||
- cabal-toolkit ==0.0.5
|
||||
- cache ==0.1.0.1
|
||||
- cairo ==0.13.4.2
|
||||
@ -673,7 +673,7 @@ default-package-overrides:
|
||||
- elm-export ==0.6.0.1
|
||||
- elm-export-persistent ==0.1.2
|
||||
- emailaddress ==0.2.0.0
|
||||
- email-validate ==2.3.2.1
|
||||
- email-validate ==2.3.2.2
|
||||
- enclosed-exceptions ==1.0.2
|
||||
- EntrezHTTP ==1.0.4
|
||||
- entropy ==0.3.8
|
||||
@ -724,7 +724,7 @@ default-package-overrides:
|
||||
- extensible ==0.4.7.1
|
||||
- extensible-effects ==2.1.0.0
|
||||
- extensible-exceptions ==0.1.1.4
|
||||
- extra ==1.6.3
|
||||
- extra ==1.6.4
|
||||
- extractable-singleton ==0.0.1
|
||||
- extrapolate ==0.3.1
|
||||
- fail ==4.9.0.0
|
||||
@ -865,7 +865,7 @@ default-package-overrides:
|
||||
- giphy-api ==0.5.2.0
|
||||
- git ==0.2.1
|
||||
- github ==0.18
|
||||
- github-release ==1.1.3
|
||||
- github-release ==1.1.4
|
||||
- github-types ==0.2.1
|
||||
- github-webhook-handler ==0.0.8
|
||||
- github-webhook-handler-snap ==0.0.7
|
||||
@ -1167,8 +1167,8 @@ default-package-overrides:
|
||||
- hsebaysdk ==0.4.0.0
|
||||
- hse-cpp ==0.2
|
||||
- hsemail ==2
|
||||
- HSet ==0.0.1
|
||||
- hset ==2.2.0
|
||||
- HSet ==0.0.1
|
||||
- hsexif ==0.6.1.5
|
||||
- hs-GeoIP ==0.3
|
||||
- hsignal ==0.2.7.5
|
||||
@ -1301,8 +1301,8 @@ default-package-overrides:
|
||||
- intern ==0.9.1.4
|
||||
- interpolate ==0.1.1
|
||||
- interpolatedstring-perl6 ==1.0.0
|
||||
- interpolation ==0.1.0.2
|
||||
- Interpolation ==0.3.0
|
||||
- interpolation ==0.1.0.2
|
||||
- IntervalMap ==0.5.3.1
|
||||
- intervals ==0.8.1
|
||||
- intro ==0.3.1.0
|
||||
@ -1704,7 +1704,7 @@ default-package-overrides:
|
||||
- opml-conduit ==0.6.0.4
|
||||
- optional-args ==1.0.2
|
||||
- options ==1.2.1.1
|
||||
- optparse-applicative ==0.14.0.0
|
||||
- optparse-applicative ==0.14.1.0
|
||||
- optparse-generic ==1.2.3
|
||||
- optparse-simple ==0.1.0
|
||||
- optparse-text ==0.1.1.0
|
||||
@ -1831,7 +1831,7 @@ default-package-overrides:
|
||||
- pretty-class ==1.0.1.1
|
||||
- pretty-hex ==1.0
|
||||
- prettyprinter ==1.1.1
|
||||
- prettyprinter-ansi-terminal ==1.1.1.1
|
||||
- prettyprinter-ansi-terminal ==1.1.1.2
|
||||
- prettyprinter-compat-annotated-wl-pprint ==1
|
||||
- prettyprinter-compat-ansi-wl-pprint ==1.0.1
|
||||
- prettyprinter-compat-wl-pprint ==1.0.0.1
|
||||
@ -1886,7 +1886,7 @@ default-package-overrides:
|
||||
- QuickCheck ==2.10.1
|
||||
- quickcheck-arbitrary-adt ==0.2.0.0
|
||||
- quickcheck-assertions ==0.3.0
|
||||
- quickcheck-classes ==0.3.2
|
||||
- quickcheck-classes ==0.3.3
|
||||
- quickcheck-combinators ==0.0.2
|
||||
- quickcheck-instances ==0.3.16.1
|
||||
- quickcheck-io ==0.2.0
|
||||
@ -2008,8 +2008,8 @@ default-package-overrides:
|
||||
- say ==0.1.0.0
|
||||
- sbp ==2.3.6
|
||||
- sbv ==7.4
|
||||
- SCalendar ==1.1.0
|
||||
- scalendar ==1.2.0
|
||||
- SCalendar ==1.1.0
|
||||
- scalpel ==0.5.1
|
||||
- scalpel-core ==0.5.1
|
||||
- scanner ==0.2
|
||||
@ -2078,7 +2078,7 @@ default-package-overrides:
|
||||
- set-monad ==0.2.0.0
|
||||
- sets ==0.0.5.2
|
||||
- SHA ==1.6.4.2
|
||||
- shake ==0.16.2
|
||||
- shake ==0.16.3
|
||||
- shake-language-c ==0.11.0
|
||||
- shakespeare ==2.0.15
|
||||
- shell-conduit ==4.6.1
|
||||
@ -2087,7 +2087,7 @@ default-package-overrides:
|
||||
- shikensu ==0.3.8
|
||||
- shortcut-links ==0.4.2.0
|
||||
- should-not-typecheck ==2.1.0
|
||||
- show-prettyprint ==0.2
|
||||
- show-prettyprint ==0.2.0.1
|
||||
- signal ==0.1.0.4
|
||||
- silently ==1.2.5
|
||||
- simple ==0.11.2
|
||||
@ -2410,8 +2410,8 @@ default-package-overrides:
|
||||
- union-find ==0.2
|
||||
- uniplate ==1.6.12
|
||||
- uniq-deep ==1.1.0.0
|
||||
- Unique ==0.4.7.2
|
||||
- unique ==0
|
||||
- Unique ==0.4.7.2
|
||||
- unit-constraint ==0.0.0
|
||||
- units-parser ==0.1.1.2
|
||||
- universe ==1.0
|
||||
@ -2448,7 +2448,7 @@ default-package-overrides:
|
||||
- uuid-types ==1.0.3
|
||||
- vado ==0.0.9
|
||||
- validate-input ==0.4.0.0
|
||||
- validation ==0.6.2
|
||||
- validation ==0.6.3
|
||||
- validationt ==0.2.0.0
|
||||
- validity ==0.4.0.4
|
||||
- validity-aeson ==0.1.0.0
|
||||
@ -2612,7 +2612,7 @@ default-package-overrides:
|
||||
- YampaSynth ==0.2
|
||||
- yeshql ==3.0.1.3
|
||||
- yesod ==1.4.5
|
||||
- yesod-alerts ==0.1.1.0
|
||||
- yesod-alerts ==0.1.2.0
|
||||
- yesod-auth ==1.4.21
|
||||
- yesod-auth-basic ==0.1.0.2
|
||||
- yesod-auth-fb ==1.8.1
|
||||
@ -2658,7 +2658,7 @@ default-package-overrides:
|
||||
- zeromq4-haskell ==0.7.0
|
||||
- zim-parser ==0.2.1.0
|
||||
- zip ==0.2.0
|
||||
- zip-archive ==0.3.2.3
|
||||
- zip-archive ==0.3.2.4
|
||||
- zippers ==0.2.5
|
||||
- ziptastic-client ==0.3.0.3
|
||||
- ziptastic-core ==0.2.0.3
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
18
pkgs/development/interpreters/dhall/default.nix
Normal file
18
pkgs/development/interpreters/dhall/default.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ haskell, haskellPackages, stdenvNoCC }:
|
||||
|
||||
let
|
||||
static = haskell.lib.justStaticExecutables haskellPackages.dhall;
|
||||
|
||||
in static.overrideAttrs (old: {
|
||||
passthru = old.passthru or {} // {
|
||||
prelude = stdenvNoCC.mkDerivation {
|
||||
name = "dhall-prelude";
|
||||
inherit (old) src;
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -r Prelude/* $out/
|
||||
'';
|
||||
};
|
||||
};
|
||||
})
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurlBoot, buildPackages, enableThreading ? stdenv ? glibc }:
|
||||
{ lib, stdenv, fetchurlBoot, buildPackages, enableThreading ? stdenv ? glibc, fetchpatch }:
|
||||
|
||||
with lib;
|
||||
|
||||
@ -133,12 +133,19 @@ let
|
||||
sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8";
|
||||
};
|
||||
|
||||
# Hacky! But not sure how else we can access a native-targeted gcc6
|
||||
# https://github.com/arsv/perl-cross/issues/60
|
||||
nativeBuildInputs = [ buildPackages.buildPackages.gcc6 ];
|
||||
perl-cross-gcc7-patch = fetchpatch {
|
||||
url = "https://github.com/arsv/perl-cross/commit/07208bc1707b8be3ea170c62c59120020cf0f87f.patch";
|
||||
sha256 = "1gh8w9m5if2s0lrx2x8f8grp74d1l6d46m8jglpjm5a1kf55j810";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
postUnpack = ''
|
||||
unpackFile ${perl-cross-src}
|
||||
cd perl-cross-*
|
||||
patch -Np1 -i ${perl-cross-gcc7-patch}
|
||||
cd ..
|
||||
cp -R perl-cross-${crossVersion}/* perl-${version}/
|
||||
'';
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "8.300.0";
|
||||
version = "8.400.0";
|
||||
name = "armadillo-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
|
||||
sha256 = "0g6wcfrmb2hndz995wrlc80v6d39mhxf26lmycaqv5bjfq050ic5";
|
||||
sha256 = "16yxhn904ll48879vmycv84rja28im0mrcfgb03nm7bs8lpvrdjw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "19.8";
|
||||
version = "19.9";
|
||||
name = "dlib-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davisking";
|
||||
repo = "dlib";
|
||||
rev ="v${version}";
|
||||
sha256 = "0ras4dl1ws9f9680bi8wg0mnbqvrpn0l2xl5lrvq3jvnijb3cz9i";
|
||||
sha256 = "0lc54r928j9dg7f2wn25m887z24d31wrc14v2hn6aknp1z084lrc";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libfilezilla-${version}";
|
||||
version = "0.11.2";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
|
||||
sha256 = "0wl42yxrha633dbh1vcbhrpsd7sv4zwskbmlpx549ygnzi39krcn";
|
||||
sha256 = "1gbqm42dd0m3fvqz3bk53889479dvn8679zp6ba8a9q2br2wkvv0";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -22,12 +22,6 @@ stdenv.mkDerivation rec {
|
||||
configureFlags =
|
||||
lib.optional stdenv.isFreeBSD "--with-pic";
|
||||
|
||||
crossAttrs = {
|
||||
# Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW).
|
||||
dontStrip = true;
|
||||
dontCrossStrip = true;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "An iconv(3) implementation";
|
||||
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''xembed'';
|
||||
version = ''clx-20120909-git'';
|
||||
|
||||
description = '''';
|
||||
|
||||
deps = [ args."clx" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = ''http://beta.quicklisp.org/archive/clx-xembed/2012-09-09/clx-xembed-20120909-git.tgz'';
|
||||
sha256 = ''06h2md0lb0sribpkg5k7z7fnc02k0ssaswcimg2ya8wqypj4rlbb'';
|
||||
};
|
||||
|
||||
packageName = "xembed";
|
||||
|
||||
asdFilesToKeep = ["xembed.asd"];
|
||||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM xembed DESCRIPTION NIL SHA256
|
||||
06h2md0lb0sribpkg5k7z7fnc02k0ssaswcimg2ya8wqypj4rlbb URL
|
||||
http://beta.quicklisp.org/archive/clx-xembed/2012-09-09/clx-xembed-20120909-git.tgz
|
||||
MD5 4270362697093017ac0243b71e3576f9 NAME xembed FILENAME xembed DEPS
|
||||
((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION clx-20120909-git
|
||||
SIBLINGS NIL PARASITES NIL) */
|
||||
@ -57,6 +57,7 @@ cl-vectors
|
||||
cl-who
|
||||
clx
|
||||
clx-truetype
|
||||
xembed
|
||||
command-line-arguments
|
||||
css-lite
|
||||
css-selectors
|
||||
|
||||
@ -1920,6 +1920,15 @@ let quicklisp-to-nix-packages = rec {
|
||||
}));
|
||||
|
||||
|
||||
"xembed" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."xembed" or (x: {}))
|
||||
(import ./quicklisp-to-nix-output/xembed.nix {
|
||||
inherit fetchurl;
|
||||
"clx" = quicklisp-to-nix-packages."clx";
|
||||
}));
|
||||
|
||||
|
||||
"clx-truetype" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."clx-truetype" or (x: {}))
|
||||
|
||||
22
pkgs/development/python-modules/jsonrpc-async/default.nix
Normal file
22
pkgs/development/python-modules/jsonrpc-async/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
, aiohttp, jsonrpc-base }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsonrpc-async";
|
||||
version = "0.6";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0f1p3qv56jn4sdyp8gzf915nya6vr0rn2pbzld9x23y9jdjmibzw";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp jsonrpc-base ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A JSON-RPC client library for asyncio";
|
||||
homepage = http://github.com/armills/jsonrpc-async;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
}
|
||||
21
pkgs/development/python-modules/jsonrpc-base/default.nix
Normal file
21
pkgs/development/python-modules/jsonrpc-base/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsonrpc-base";
|
||||
version = "1.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1dl55n54ha5kf4x6hap2p1k3s4qa4w7g791wp2656rjg2zxfgywk";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A JSON-RPC client library base interface";
|
||||
homepage = https://github.com/armills/jsonrpc-base;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
, aiohttp, jsonrpc-base }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsonrpc-websocket";
|
||||
version = "0.5";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0cijqb8fvv9iq5ds9y5sj0gd6lapi90mgqvpkczp28fxz440ihq4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp jsonrpc-base ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A JSON-RPC websocket client library for asyncio";
|
||||
homepage = https://github.com/armills/jsonrpc-websocket;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
}
|
||||
22
pkgs/development/python-modules/onkyo-eiscp/default.nix
Normal file
22
pkgs/development/python-modules/onkyo-eiscp/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
, docopt, netifaces }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "onkyo-eiscp";
|
||||
version = "1.2.4";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0qb5w2g2cnckq7psh92g1w3gf76437x1vwfhwnd247wshs5h7hxj";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ docopt netifaces ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Control Onkyo receivers over ethernet";
|
||||
homepage = https://github.com/miracle2k/onkyo-eiscp;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
}
|
||||
@ -22,6 +22,7 @@ if !(pythonOlder "3.4") then null else buildPythonPackage rec {
|
||||
|
||||
preCheck = ''
|
||||
export LC_ALL="en_US.UTF-8"
|
||||
sed -i test_pathlib2.py -e "s@hasattr(pwd, 'getpwall')@False@"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
@ -29,4 +30,4 @@ if !(pythonOlder "3.4") then null else buildPythonPackage rec {
|
||||
homepage = https://pypi.python.org/pypi/pathlib2/;
|
||||
license = with lib.licenses; [ mit ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
22
pkgs/development/python-modules/pyunifi/default.nix
Normal file
22
pkgs/development/python-modules/pyunifi/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
, requests }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyunifi";
|
||||
version = "2.13";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1dhbfzv5a29v763m0b9wsc4pvkdr979w7g4rz7ak8hsi4sx6b9dq";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "API towards Ubiquity Networks UniFi controller";
|
||||
homepage = https://github.com/finish06/unifi-api;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
}
|
||||
19
pkgs/development/python-modules/wakeonlan/default.nix
Normal file
19
pkgs/development/python-modules/wakeonlan/default.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ stdenv, fetchPypi, buildPythonPackage }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wakeonlan";
|
||||
version = "1.0.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1snkyc6ph0bnypqs5yjw35mx3f9ij4808r5i06gl2vhn1rfzgyh1";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A small python module for wake on lan";
|
||||
homepage = https://github.com/remcohaszing/pywakeonlan;
|
||||
license = licenses.wtfpl;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
}
|
||||
@ -369,7 +369,7 @@ let
|
||||
VBmix = [ pkgs.gsl_1 pkgs.fftw pkgs.qt4 ];
|
||||
WhopGenome = [ pkgs.zlib.dev ];
|
||||
XBRL = [ pkgs.zlib pkgs.libxml2.dev ];
|
||||
xml2 = [ pkgs.libxml2.dev ];
|
||||
xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ];
|
||||
XML = [ pkgs.libtool pkgs.libxml2.dev pkgs.xmlsec pkgs.libxslt ];
|
||||
affyPLM = [ pkgs.zlib.dev ];
|
||||
bamsignals = [ pkgs.zlib.dev ];
|
||||
@ -411,6 +411,7 @@ let
|
||||
fftw = [ pkgs.pkgconfig ];
|
||||
geoCount = [ pkgs.pkgconfig ];
|
||||
gdtools = [ pkgs.pkgconfig ];
|
||||
JuniperKernel = lib.optionals stdenv.isDarwin [ pkgs.binutils.bintools ];
|
||||
kza = [ pkgs.pkgconfig ];
|
||||
magick = [ pkgs.pkgconfig ];
|
||||
mwaved = [ pkgs.pkgconfig ];
|
||||
@ -760,6 +761,17 @@ let
|
||||
'';
|
||||
});
|
||||
|
||||
JuniperKernel = old.JuniperKernel.overrideDerivation (attrs: {
|
||||
postPatch = ''
|
||||
for file in {R,src}/*.R; do
|
||||
sed -i 's#system("which \(otool\|install_name_tool\)"[^)]*)#"${pkgs.binutils.bintools}/bin/\1"#g' $file
|
||||
done
|
||||
'';
|
||||
preConfigure = ''
|
||||
patchShebangs configure
|
||||
'';
|
||||
});
|
||||
|
||||
Mposterior = old.Mposterior.overrideDerivation (attrs: {
|
||||
PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas";
|
||||
});
|
||||
|
||||
@ -1,22 +1,28 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev
|
||||
, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
|
||||
, procps, autoreconfHook, utilmacros }:
|
||||
, procps, autoreconfHook, utilmacros, gnome2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "intel-gpu-tools-1.19";
|
||||
name = "intel-gpu-tools-1.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2";
|
||||
sha256 = "1wdhwf3im6ids95qw5r9hjj9hvp0qhzgi4llrlriy723q3kqm754";
|
||||
url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.xz";
|
||||
sha256 = "0gvh317dg5c7kvjxxkh8g70hh3r3dc73mc4dzyvfa8nb4ix6xbyr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook utilmacros ];
|
||||
nativeBuildInputs = [ pkgconfig utilmacros ];
|
||||
buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod
|
||||
libXext libXv libXrandr glib bison libunwind python3 procps ];
|
||||
libXext libXv libXrandr glib bison libunwind python3 procps
|
||||
gnome2.gtkdoc ];
|
||||
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
patchShebangs debugger/system_routine/pre_cpp.py
|
||||
substituteInPlace tools/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)'
|
||||
substituteInPlace tests/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)'
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }:
|
||||
|
||||
let
|
||||
version = "3.0.1";
|
||||
version = "3.2.0";
|
||||
|
||||
# I took several games at random from http://instead.syscall.ru/games/
|
||||
games = [
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";
|
||||
sha256 = "0ynqzmr35zd1vbbv8n3vk93zj0njhs45w9z33wwkphg2zlniwnzb";
|
||||
sha256 = "0l57qdngxv9nbfj4ixr4fyanlazmdib2kr1nzv3g578308xzjv6a";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = "-llua -lgcc_s";
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "eventstat-${version}";
|
||||
version = "0.03.04";
|
||||
version = "0.04.03";
|
||||
src = fetchzip {
|
||||
url = "http://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz";
|
||||
sha256 = "1sqf1mfafrw6402qx457gh8yxgsw80311qi0lp4cjl9dfz7vl2x1";
|
||||
sha256 = "0yv7rpdg07rihw8iilvigib963nxf16mn26hzlb6qd1wv54k6dbr";
|
||||
};
|
||||
buildInputs = [ ncurses ];
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fleet-${version}";
|
||||
version = "0.11.8";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coreos";
|
||||
repo = "fleet";
|
||||
rev = "v${version}";
|
||||
sha256 = "13kwaa4hkiic602wnvnk13pflrxqhk2vxwpk1bn52ilwxkjyvkig";
|
||||
sha256 = "0j48ajz19aqfzv9iyznnn39aw51y1nqcl270grmvi5cbqycmrfm0";
|
||||
};
|
||||
|
||||
buildInputs = [ go ];
|
||||
|
||||
@ -145,8 +145,8 @@
|
||||
"insteon_local" = ps: with ps; [ ];
|
||||
"insteon_plm" = ps: with ps; [ ];
|
||||
"verisure" = ps: with ps; [ ];
|
||||
"media_player.kodi" = ps: with ps; [ ];
|
||||
"notify.kodi" = ps: with ps; [ ];
|
||||
"media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ];
|
||||
"notify.kodi" = ps: with ps; [ jsonrpc-async ];
|
||||
"device_tracker.owntracks" = ps: with ps; [ libnacl ];
|
||||
"device_tracker.owntracks_http" = ps: with ps; [ libnacl ];
|
||||
"dyson" = ps: with ps; [ ];
|
||||
@ -184,7 +184,7 @@
|
||||
"binary_sensor.trend" = ps: with ps; [ numpy ];
|
||||
"image_processing.opencv" = ps: with ps; [ numpy ];
|
||||
"climate.oem" = ps: with ps; [ ];
|
||||
"media_player.onkyo" = ps: with ps; [ ];
|
||||
"media_player.onkyo" = ps: with ps; [ onkyo-eiscp ];
|
||||
"sensor.openevse" = ps: with ps; [ ];
|
||||
"media_player.openhome" = ps: with ps; [ ];
|
||||
"switch.orvibo" = ps: with ps; [ ];
|
||||
@ -346,7 +346,7 @@
|
||||
"climate.touchline" = ps: with ps; [ ];
|
||||
"device_tracker.trackr" = ps: with ps; [ ];
|
||||
"tradfri" = ps: with ps; [ ];
|
||||
"device_tracker.unifi" = ps: with ps; [ ];
|
||||
"device_tracker.unifi" = ps: with ps; [ pyunifi ];
|
||||
"keyboard" = ps: with ps; [ ];
|
||||
"vera" = ps: with ps; [ ];
|
||||
"media_player.vizio" = ps: with ps; [ ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }:
|
||||
let
|
||||
pkgName = "dehydrated";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = pkgName + "-" + version;
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "lukas2511";
|
||||
repo = "dehydrated";
|
||||
rev = "v${version}";
|
||||
sha256 = "0nxs6l5i6409dzgiyjn8cnzjcblwj4rqcpxxb766vcvb8d4kqwby";
|
||||
sha256 = "0ysfsz1ny3gcc4r9szrr09dg63zd7ppv6aih13wmai806yapwxrr";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ddcutil-${version}";
|
||||
version = "0.8.5";
|
||||
version = "0.8.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rockowitz";
|
||||
repo = "ddcutil";
|
||||
rev = "v${version}";
|
||||
sha256 = "127a5v545gvfgxqqjxqafsg1p8i4qd5wnpdwccr38jbsphl6yzl4";
|
||||
sha256 = "1c4cl9cac90xf9rap6ss2d4yshcmhdq8pdfjz3g4cns789fs1vcf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "entr-${version}";
|
||||
version = "3.9";
|
||||
version = "4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://entrproject.org/code/${name}.tar.gz";
|
||||
sha256 = "0xk8y8asy0wxi5jx03c521p9919gjr8053lxpfzn83jkmqc8zmq2";
|
||||
sha256 = "12vc3xp0z0abmsy5kbix0wmn0sca39c8miyga6cijydi128zxm2a";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "envconsul-${version}";
|
||||
version = "0.6.2";
|
||||
version = "0.7.3";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/hashicorp/envconsul";
|
||||
@ -11,7 +11,7 @@ buildGoPackage rec {
|
||||
inherit rev;
|
||||
owner = "hashicorp";
|
||||
repo = "envconsul";
|
||||
sha256 = "176jbicyg7vwd0kgawz859gq7ldrxyw1gx55wig7azakiidkl731";
|
||||
sha256 = "03cgxkyyynr067dg5b0lhvaxn60318fj9fh55p1n43vj5nrzgnbc";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, emacs, texlive, ghostscript }:
|
||||
|
||||
let auctex = stdenv.mkDerivation ( rec {
|
||||
version = "11.90";
|
||||
version = "12.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
# Make this a valid tex(live-new) package;
|
||||
@ -14,7 +14,7 @@ let auctex = stdenv.mkDerivation ( rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/${pname}/${name}.tar.gz";
|
||||
sha256 = "13zimbyar3159arrcklmnmjxjvibrjpkac6d53mfv03pwpc2y8rw";
|
||||
sha256 = "1d2x59jw42hr81fma195bniqyhvp5ig5q0xmywbkcy59f16wlp69";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs texlive.combined.scheme-basic ghostscript ];
|
||||
|
||||
@ -121,7 +121,8 @@ with pkgs;
|
||||
|
||||
dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh;
|
||||
|
||||
dockerTools = callPackage ../build-support/docker { };
|
||||
# go 1.9 pin until https://github.com/moby/moby/pull/35739
|
||||
dockerTools = callPackage ../build-support/docker { go = go_1_9; };
|
||||
|
||||
docker_compose = pythonPackages.docker_compose;
|
||||
|
||||
@ -6823,7 +6824,7 @@ with pkgs;
|
||||
|
||||
clooj = callPackage ../development/interpreters/clojure/clooj.nix { };
|
||||
|
||||
dhall = haskell.lib.justStaticExecutables haskellPackages.dhall;
|
||||
dhall = callPackage ../development/interpreters/dhall { };
|
||||
|
||||
dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix;
|
||||
|
||||
@ -14942,7 +14943,8 @@ with pkgs;
|
||||
dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) {
|
||||
};
|
||||
|
||||
inherit (callPackage ../applications/virtualization/docker { })
|
||||
# go 1.9 pin until https://github.com/moby/moby/pull/35739
|
||||
inherit (callPackage ../applications/virtualization/docker { go = go_1_9; })
|
||||
docker_17_12
|
||||
docker_18_02;
|
||||
|
||||
|
||||
@ -2760,6 +2760,16 @@ in {
|
||||
|
||||
curtsies = callPackage ../development/python-modules/curtsies { };
|
||||
|
||||
jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { };
|
||||
|
||||
jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { };
|
||||
|
||||
jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { };
|
||||
|
||||
onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { };
|
||||
|
||||
pyunifi = callPackage ../development/python-modules/pyunifi { };
|
||||
|
||||
tablib = buildPythonPackage rec {
|
||||
name = "tablib-${version}";
|
||||
version = "0.12.1";
|
||||
@ -2777,6 +2787,7 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
wakeonlan = callPackage ../development/python-modules/wakeonlan { };
|
||||
|
||||
openant = buildPythonPackage rec {
|
||||
name = "openant-unstable-2017-02-11";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user