Merge branch 'master' into staging
A couple thousand rebuilds from master.
This commit is contained in:
Vladimír Čunát
commit
8559b6db82
@ -219,6 +219,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
|
||||
ffsl = {
|
||||
fullName = "Floodgap Free Software License";
|
||||
url = http://www.floodgap.com/software/ffsl/license.html;
|
||||
free = false;
|
||||
};
|
||||
|
||||
free = {
|
||||
|
||||
@ -358,6 +358,7 @@
|
||||
linus = "Linus Arver <linusarver@gmail.com>";
|
||||
lluchs = "Lukas Werling <lukas.werling@gmail.com>";
|
||||
lnl7 = "Daiderd Jordan <daiderd@gmail.com>";
|
||||
lo1tuma = "Mathias Schreck <schreck.mathias@gmail.com>";
|
||||
loskutov = "Ignat Loskutov <ignat.loskutov@gmail.com>";
|
||||
lovek323 = "Jason O'Conal <jason@oconal.id.au>";
|
||||
lowfatcomputing = "Andreas Wagner <andreas.wagner@lowfatcomputing.org>";
|
||||
|
||||
@ -64,7 +64,7 @@ let
|
||||
${channelSources}
|
||||
'';
|
||||
|
||||
prepareImageInputs = with pkgs; [ rsync utillinux parted e2fsprogs lkl fakeroot config.system.build.nixos-prepare-root ] ++ stdenv.initialPath;
|
||||
prepareImageInputs = with pkgs; [ rsync utillinux parted e2fsprogs lkl fakeroot libfaketime config.system.build.nixos-prepare-root ] ++ stdenv.initialPath;
|
||||
|
||||
# I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate
|
||||
# image building logic. The comment right below this now appears in 4 different places in nixpkgs :)
|
||||
@ -86,7 +86,7 @@ let
|
||||
offset=0
|
||||
''}
|
||||
|
||||
mkfs.${fsType} -F -L nixos -E offset=$offset $diskImage
|
||||
faketime -f "1970-01-01 00:00:01" mkfs.${fsType} -F -L nixos -E offset=$offset $diskImage
|
||||
|
||||
root="$PWD/root"
|
||||
mkdir -p $root
|
||||
@ -124,6 +124,14 @@ let
|
||||
fakeroot nixos-prepare-root $root ${channelSources} ${config.system.build.toplevel} closure
|
||||
|
||||
echo "copying staging root to image..."
|
||||
# If we don't faketime, we can end up with timestamps other than 1 on the nix store, which
|
||||
# will confuse Nix in some situations (e.g., breaking image builds in the target image)
|
||||
# N.B: I use 0 here, which results in timestamp = 1 in the image. It's weird but see
|
||||
# https://github.com/lkl/linux/issues/393. Also, running under faketime makes `cptofs` super
|
||||
# noisy and it prints out that it can't find a bunch of files, and then works anyway. We'll
|
||||
# shut it up someday but trying to do a stderr filter through grep is running into some nasty
|
||||
# bug in some eval nonsense we have in runInLinuxVM and I'm sick of trying to fix it.
|
||||
faketime -f "1970-01-01 00:00:00" \
|
||||
cptofs ${pkgs.lib.optionalString partitioned "-P 1"} -t ${fsType} -i $diskImage $root/* /
|
||||
'';
|
||||
in pkgs.vmTools.runInLinuxVM (
|
||||
|
||||
@ -31,16 +31,16 @@ if ! test -e "$mountPoint"; then
|
||||
fi
|
||||
|
||||
# Create a few of the standard directories in the target root directory.
|
||||
mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home
|
||||
mkdir -m 01777 -p $mountPoint/tmp
|
||||
mkdir -m 0755 -p $mountPoint/tmp/root
|
||||
mkdir -m 0755 -p $mountPoint/var
|
||||
mkdir -m 0700 -p $mountPoint/root
|
||||
install -m 0755 -d $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home
|
||||
install -m 01777 -d $mountPoint/tmp
|
||||
install -m 0755 -d $mountPoint/tmp/root
|
||||
install -m 0755 -d $mountPoint/var
|
||||
install -m 0700 -d $mountPoint/root
|
||||
|
||||
ln -sf /run $mountPoint/var/run
|
||||
|
||||
# Create the necessary Nix directories on the target device
|
||||
mkdir -m 0755 -p \
|
||||
install -m 0755 -d \
|
||||
$mountPoint/nix/var/nix/gcroots \
|
||||
$mountPoint/nix/var/nix/temproots \
|
||||
$mountPoint/nix/var/nix/userpool \
|
||||
@ -48,7 +48,7 @@ mkdir -m 0755 -p \
|
||||
$mountPoint/nix/var/nix/db \
|
||||
$mountPoint/nix/var/log/nix/drvs
|
||||
|
||||
mkdir -m 1775 -p $mountPoint/nix/store
|
||||
install -m 1775 -d $mountPoint/nix/store
|
||||
|
||||
# All Nix operations below should operate on our target store, not /nix/store.
|
||||
# N.B: this relies on Nix 1.12 or higher
|
||||
@ -80,7 +80,7 @@ if [ ! -x $mountPoint/@shell@ ]; then
|
||||
echo "Error: @shell@ wasn't included in the closure" >&2
|
||||
exit 1
|
||||
fi
|
||||
mkdir -m 0755 -p $mountPoint/bin
|
||||
install -m 0755 -d $mountPoint/bin
|
||||
ln -sf @shell@ $mountPoint/bin/sh
|
||||
|
||||
echo "setting the system closure to '$system'..."
|
||||
@ -89,17 +89,16 @@ nix-env "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/system --set
|
||||
ln -sfn /nix/var/nix/profiles/system $mountPoint/run/current-system
|
||||
|
||||
# Copy the NixOS/Nixpkgs sources to the target as the initial contents of the NixOS channel.
|
||||
mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles
|
||||
mkdir -m 1777 -p $mountPoint/nix/var/nix/profiles/per-user
|
||||
mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles/per-user/root
|
||||
install -m 0755 -d $mountPoint/nix/var/nix/profiles
|
||||
install -m 1777 -d $mountPoint/nix/var/nix/profiles/per-user
|
||||
install -m 0755 -d $mountPoint/nix/var/nix/profiles/per-user/root
|
||||
|
||||
if [ -z "$noChannelCopy" ] && [ -n "$channel" ]; then
|
||||
echo "copying channel..."
|
||||
nix-env --option build-use-substitutes false "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channel" --quiet
|
||||
fi
|
||||
mkdir -m 0700 -p $mountPoint/root/.nix-defexpr
|
||||
install -m 0700 -d $mountPoint/root/.nix-defexpr
|
||||
ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
|
||||
|
||||
# Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out.
|
||||
touch $mountPoint/etc/NIXOS
|
||||
|
||||
|
||||
@ -15,8 +15,6 @@ let
|
||||
sha256 = "01mzvh53wrs1p2ym765jwd00gl6kn8f9k3nhdrnhdqr8dhimfb2p";
|
||||
};
|
||||
|
||||
buildPhases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib
|
||||
cp common/lib/*.jar $out/lib/
|
||||
|
||||
@ -923,7 +923,9 @@ in
|
||||
assertions =
|
||||
(flip map interfaces (i: {
|
||||
assertion = i.subnetMask == null;
|
||||
message = "The networking.interfaces.${i.name}.subnetMask option is defunct. Use prefixLength instead.";
|
||||
message = ''
|
||||
The networking.interfaces."${i.name}".subnetMask option is defunct. Use prefixLength instead.
|
||||
'';
|
||||
})) ++ (flip map interfaces (i: {
|
||||
# With the linux kernel, interface name length is limited by IFNAMSIZ
|
||||
# to 16 bytes, including the trailing null byte.
|
||||
@ -934,7 +936,9 @@ in
|
||||
'';
|
||||
})) ++ (flip map slaveIfs (i: {
|
||||
assertion = i.ip4 == [ ] && i.ipAddress == null && i.ip6 == [ ] && i.ipv6Address == null;
|
||||
message = "The networking.interfaces.${i.name} must not have any defined ips when it is a slave.";
|
||||
message = ''
|
||||
The networking.interfaces."${i.name}" must not have any defined ips when it is a slave.
|
||||
'';
|
||||
})) ++ [
|
||||
{
|
||||
assertion = cfg.hostId == null || (stringLength cfg.hostId == 8 && isHexString cfg.hostId);
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Fluidsynth GUI";
|
||||
homepage = http://sourceforge.net/projects/qsynth;
|
||||
homepage = https://sourceforge.net/projects/qsynth;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
|
||||
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
NIX_CFLAGS_LINK = "-lXmu";
|
||||
|
||||
meta = {
|
||||
homepage = http://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet
|
||||
homepage = https://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://sourceforge.net/projects/nedit;
|
||||
homepage = https://sourceforge.net/projects/nedit;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost, zlib, openssl,
|
||||
R, qt5, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc
|
||||
{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost, zlib, openssl
|
||||
, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts, unzip, ant, jdk
|
||||
, gnumake, makeWrapper, pandoc
|
||||
}:
|
||||
|
||||
let
|
||||
@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ];
|
||||
|
||||
buildInputs = [ boost zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid ];
|
||||
buildInputs = [ boost zlib openssl R qtbase qtwebkit qtwebchannel libuuid ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p $out/share/{app-install/desktop,applications,info,pixmaps}
|
||||
'';
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://sourceforge.net/projects/xzgv/;
|
||||
homepage = https://sourceforge.net/projects/xzgv/;
|
||||
description = "Picture viewer for X with a thumbnail-based selector";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.womfoo ];
|
||||
|
||||
@ -1 +1 @@
|
||||
WGET_ARGS=( https://download.kde.org/stable/applications/17.08.2/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.kde.org/stable/applications/17.08.3/ -A '*.tar.xz' )
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -5,12 +5,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.10.0";
|
||||
version = "3.12.0";
|
||||
name = "calibre-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
|
||||
sha256 = "01vb5xjis9ldva7rg1f720lwys5frkj00z8x7cajqwxliilhvais";
|
||||
sha256 = "0l7r5ny9a36yg22fqzz3as6wh1xqpa3hrlx2gy25yp649sbkd9vq";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index d910299e..69888477 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -99,6 +99,7 @@ endif()
|
||||
|
||||
# Qt modules
|
||||
if (WITH_QT5)
|
||||
+ find_package(Qt5 REQUIRED COMPONENTS Network Svg Xml Script)
|
||||
qt5_use_modules(copyq Widgets Network Svg Xml Script ${copyq_Qt5_Modules})
|
||||
else()
|
||||
set(QT_USE_QTNETWORK TRUE)
|
||||
@ -1,27 +1,23 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, qt5, libXfixes, libXtst, git
|
||||
{ stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst, git
|
||||
, webkitSupport ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "CopyQ-${version}";
|
||||
version = "3.0.3";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hluk";
|
||||
repo = "CopyQ";
|
||||
rev = "v${version}";
|
||||
sha256 = "0wpxqrg4mn8xjsrwsmlhh731s2kr6afnzpqif1way0gi7fqr73jl";
|
||||
sha256 = "0gdx1bqqqr4fk6wcrxqm9li6z48j1w84wjwyjpzp2cjzg96bp6bl";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./cmake-modules.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
git qt5.full libXfixes libXtst
|
||||
] ++ stdenv.lib.optional webkitSupport qt5.qtwebkit;
|
||||
git qtbase qtscript libXfixes libXtst
|
||||
] ++ stdenv.lib.optional webkitSupport qtwebkit;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://hluk.github.io/CopyQ;
|
||||
|
||||
11
pkgs/applications/misc/ebook2cw/configfile.patch
Normal file
11
pkgs/applications/misc/ebook2cw/configfile.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/ebook2cw.c 2017-11-08 19:52:58.298131348 -0700
|
||||
+++ b/ebook2cw.c 2017-11-08 19:53:02.588231067 -0700
|
||||
@@ -136,7 +136,7 @@
|
||||
char isomap[256][4]; /* by these strings */
|
||||
char utf8map[256][8];
|
||||
|
||||
- char configfile[1025];
|
||||
+ char configfile[2048];
|
||||
|
||||
char id3_author[80],
|
||||
id3_title[80],
|
||||
31
pkgs/applications/misc/ebook2cw/default.nix
Normal file
31
pkgs/applications/misc/ebook2cw/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ stdenv, fetchsvn, lame, libvorbis }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "ebook2cw-${version}";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "svn://svn.fkurz.net/ebook2cw/tags/${name}";
|
||||
sha256 = "1mvp3nz3k76v757792n9b7fcm5jm3jcwarl1k7cila9fi0c2rsiw";
|
||||
};
|
||||
|
||||
buildInputs = [ lame libvorbis ];
|
||||
|
||||
patches = [ ./configfile.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace gcc cc
|
||||
'';
|
||||
|
||||
makeFlags = [ "DESTDIR=$(out)" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Convert ebooks to Morse MP3s/OGGs";
|
||||
homepage = http://fkurz.net/ham/ebook2cw.html;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ earldouglas ];
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, python2Packages }:
|
||||
{ stdenv, fetchurl, python2Packages }:
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
version = "2.9.3";
|
||||
version = "2.9.4";
|
||||
name = "electron-cash-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fyookball";
|
||||
repo = "electrum";
|
||||
rev = version;
|
||||
sha256 = "1r39b5ag5fipzgr84pzb53cfm8a4dy53257608754dwr1gfpma3v";
|
||||
src = fetchurl {
|
||||
url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz";
|
||||
# Verified using official SHA-1 and signature from
|
||||
# https://github.com/fyookball/keys-n-hashes
|
||||
sha256 = "1y8mzwa6bb8zj4l92wm4c2icnr42wmhbfz6z5ymh356gwll914vh";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python2Packages; [
|
||||
@ -42,8 +42,8 @@ python2Packages.buildPythonApplication rec {
|
||||
mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out
|
||||
rm -rf $out/lib/python2.7/site-packages/nix
|
||||
|
||||
substituteInPlace $out/share/applications/electron.desktop \
|
||||
--replace "Exec=electrum %u" "Exec=$out/bin/electrum %u"
|
||||
substituteInPlace $out/share/applications/electron-cash.desktop \
|
||||
--replace "Exec=electron-cash %u" "Exec=$out/bin/electron-cash %u"
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Open Street Map viewer";
|
||||
homepage = http://sourceforge.net/projects/gosmore/;
|
||||
homepage = https://sourceforge.net/projects/gosmore/;
|
||||
maintainers = with maintainers; [
|
||||
raskin
|
||||
];
|
||||
|
||||
@ -6,18 +6,17 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
|
||||
let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "llpp-${version}";
|
||||
version = "25-git-2017-01-18";
|
||||
version = "26b";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://repo.or.cz/llpp.git";
|
||||
rev = "22740b9bca1c60ef18cf90538994ce4981539901";
|
||||
sha256 = "0yg8z2zwhg2f5il2i1clx3b7hl088ncpk686rfxlvwyjg3qs3mv4";
|
||||
rev = "v${version}";
|
||||
sha256 = "1w8g1fp1c20sl34cx20plhnbghbsx2fwgp4vyhd1x0za29lw62nj";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper ninja ];
|
||||
buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec # lablgl
|
||||
openjpeg mujs openssl freetype ncurses ];
|
||||
buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec openjpeg mujs openssl freetype ncurses ];
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
@ -32,7 +31,6 @@ in stdenv.mkDerivation rec {
|
||||
buildPhase = ''
|
||||
sh ./build.sh build
|
||||
'';
|
||||
# --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \
|
||||
|
||||
installPhase = ''
|
||||
install -d $out/bin $out/lib
|
||||
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation {
|
||||
Multitabbed lightweight terminal emulator based on rxvt.
|
||||
Supports transparency, backgroundimages, freetype fonts, ...
|
||||
";
|
||||
homepage = http://sourceforge.net/projects/materm;
|
||||
homepage = https://sourceforge.net/projects/materm;
|
||||
license = "GPL";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
|
||||
@ -1,35 +1,32 @@
|
||||
{ stdenv, fetchurl, pkgconfig, glib, gettext }:
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, glib, gettext, readline }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name= "sdcv-0.4.2";
|
||||
name = "sdcv-${version}";
|
||||
version = "0.5.2";
|
||||
|
||||
meta = {
|
||||
homepage = http://sdcv.sourceforge.net/;
|
||||
description = "Console version of StarDict program";
|
||||
maintainers = with stdenv.lib.maintainers; [ lovek323 ];
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sdcv/${name}.tar.bz2";
|
||||
sha256 = "1cnyv7gd1qvz8ma8545d3aq726wxrx4km7ykl97831irx5wz0r51";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dushistov";
|
||||
repo = "sdcv";
|
||||
rev = "v${version}";
|
||||
sha256 = "1b67s4nj0s5fh3cjk7858qvhiisc557xx72xwzrb8hq6ijpwx5k0";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ glib gettext readline ];
|
||||
|
||||
patches = ( if stdenv.isDarwin
|
||||
then [ ./sdcv.cpp.patch-darwin ./utils.hpp.patch ]
|
||||
else [ ./sdcv.cpp.patch ] );
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ glib gettext ];
|
||||
|
||||
preBuild = ''
|
||||
sed -i 's/guint32 page_size/size_t page_size/' src/lib/lib.cpp
|
||||
preInstall = ''
|
||||
touch locale
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"
|
||||
+ stdenv.lib.optionalString stdenv.isDarwin " -lintl";
|
||||
}
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://dushistov.github.io/sdcv/;
|
||||
description = "Console version of StarDict";
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
--- a/src/utils.hpp
|
||||
+++ b/src/utils.hpp
|
||||
@@ -2,6 +2,9 @@
|
||||
#define _UTILS_HPP_
|
||||
|
||||
#include <string>
|
||||
+#include <stdio.h>
|
||||
+#include <cstdlib>
|
||||
+
|
||||
using std::string;
|
||||
|
||||
extern bool stdio_getline(FILE *in, string &str);
|
||||
@ -1,19 +0,0 @@
|
||||
--- a/src/sdcv.cpp
|
||||
+++ b/src/sdcv.cpp
|
||||
@@ -27,13 +27,13 @@
|
||||
#include <cstdlib>
|
||||
#include <cstdio>
|
||||
#include <clocale>
|
||||
+#include <string>
|
||||
+#include <vector>
|
||||
+#include <memory>
|
||||
#include <glib.h>
|
||||
#include <glib/gi18n.h>
|
||||
#include <glib/gstdio.h>
|
||||
#include <getopt.h>
|
||||
-#include <string>
|
||||
-#include <vector>
|
||||
-#include <memory>
|
||||
|
||||
#include "libwrapper.hpp"
|
||||
#include "readline.hpp"
|
||||
@ -1,10 +0,0 @@
|
||||
--- a/src/utils.hpp
|
||||
+++ b/src/utils.hpp
|
||||
@@ -2,6 +2,7 @@
|
||||
#define _UTILS_HPP_
|
||||
|
||||
#include <string>
|
||||
+#include <cstdlib>
|
||||
using std::string;
|
||||
|
||||
extern bool stdio_getline(FILE *in, string &str);
|
||||
@ -25,7 +25,8 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://st.suckless.org/;
|
||||
homepage = https://st.suckless.org/;
|
||||
description = "Simple Terminal for X from Suckless.org Community";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [viric andsild];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
It is based on the popular, but discontinued, X Win Commander, which was developed by Maxim Baranov.
|
||||
Xfe aims to be the filemanager of choice for all the Unix addicts!
|
||||
'';
|
||||
homepage = http://sourceforge.net/projects/xfe/;
|
||||
homepage = https://sourceforge.net/projects/xfe/;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
|
||||
@ -18,15 +18,14 @@
|
||||
, qtx11extras
|
||||
}:
|
||||
|
||||
let
|
||||
mkDerivation rec {
|
||||
pname = "yakuake";
|
||||
version = "3.0.3";
|
||||
in mkDerivation rec {
|
||||
version = "3.0.4";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
|
||||
sha256 = "ef51aa3325916d352fde17870cf706397e41105103e4c9289cc4032a1b8609a7";
|
||||
sha256 = "1q31p1cqhz8b2bikqjrr7fww86kaq723ib4ys2zwablfa1ybbqhh";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -144,9 +144,12 @@ let
|
||||
./patches/chromium-gcc5-r3.patch
|
||||
./patches/chromium-glibc2.26-r1.patch
|
||||
]
|
||||
++ optionals (versionAtLeast version "63") [
|
||||
++ optionals (versionRange "63" "64") [
|
||||
./patches/chromium-gcc5-r4.patch
|
||||
./patches/constexpr-fix.patch
|
||||
./patches/include-math-for-round.patch
|
||||
]
|
||||
++ optionals (versionAtLeast version "64") [
|
||||
./patches/gn_bootstrap_observer.patch
|
||||
]
|
||||
++ optional enableWideVine ./patches/widevine.patch;
|
||||
|
||||
@ -157,6 +160,9 @@ let
|
||||
'return sandbox_binary;' \
|
||||
'return base::FilePath(GetDevelSandboxPath());'
|
||||
|
||||
sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
|
||||
chrome/browser/shell_integration_linux.cc
|
||||
|
||||
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
|
||||
device/udev_linux/udev?_loader.cc
|
||||
|
||||
@ -265,6 +271,13 @@ let
|
||||
"${target}"
|
||||
'' + optionalString (target == "mksnapshot" || target == "chrome") ''
|
||||
paxmark m "${buildPath}/${target}"
|
||||
'' + optionalString (versionAtLeast version "63") ''
|
||||
(
|
||||
source chrome/installer/linux/common/installer.include
|
||||
PACKAGE=$packageName
|
||||
MENUNAME="Chromium"
|
||||
process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1"
|
||||
)
|
||||
'';
|
||||
targets = extraAttrs.buildTargets or [];
|
||||
commands = map buildCommand targets;
|
||||
|
||||
@ -35,7 +35,7 @@ let
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "chromium";
|
||||
name = "chromium-browser";
|
||||
exec = "chromium %U";
|
||||
icon = "chromium";
|
||||
comment = "An open source web browser from Google";
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- a/tools/gn/bootstrap/bootstrap.py 2017-11-07 23:06:09.000000000 +0000
|
||||
+++ b/tools/gn/bootstrap/bootstrap.py 2017-11-08 12:17:16.569216182 +0000
|
||||
@@ -481,6 +481,7 @@
|
||||
'base/metrics/sample_vector.cc',
|
||||
'base/metrics/sparse_histogram.cc',
|
||||
'base/metrics/statistics_recorder.cc',
|
||||
+ 'base/observer_list_threadsafe.cc',
|
||||
'base/path_service.cc',
|
||||
'base/pending_task.cc',
|
||||
'base/pickle.cc',
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
|
||||
From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
|
||||
Date: Fri, 13 Oct 2017 15:49:32 +0200
|
||||
Subject: [PATCH] IWYU: Include math.h for round(3).
|
||||
|
||||
math.h was being implicitly included, which can break the build with
|
||||
alternative libc implementations.
|
||||
|
||||
Bug: None
|
||||
Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
|
||||
Reviewed-on: https://webrtc-review.googlesource.com/9384
|
||||
Reviewed-by: Tommi <tommi@webrtc.org>
|
||||
Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
|
||||
Cr-Commit-Position: refs/heads/master@{#20292}
|
||||
---
|
||||
p2p/base/port.cc | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/third_party/webrtc/p2p/base/port.cc b/third_party/webrtc/p2p/base/port.cc
|
||||
index a1b478d11..81aa0aadb 100644
|
||||
--- a/third_party/webrtc/p2p/base/port.cc
|
||||
+++ b/third_party/webrtc/p2p/base/port.cc
|
||||
@@ -10,6 +10,8 @@
|
||||
|
||||
#include "p2p/base/port.h"
|
||||
|
||||
+#include <math.h>
|
||||
+
|
||||
#include <algorithm>
|
||||
#include <vector>
|
||||
|
||||
--
|
||||
2.15.0
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
# This file is autogenerated from update.sh in the same directory.
|
||||
{
|
||||
beta = {
|
||||
sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj";
|
||||
sha256bin64 = "1ca9p82k7a9h416vwldzy84ww5psv3kbvh5xdys3j3cwaxxa0b4q";
|
||||
version = "63.0.3239.18";
|
||||
sha256 = "068jaws7lqwlw3g62d2cv7i44p6zvdnizdqd56hfs4wj08k068db";
|
||||
sha256bin64 = "009ckf3gh039dwdf8rj494ra4qp0kijgzkrxianda1r7cqz1c3ys";
|
||||
version = "63.0.3239.30";
|
||||
};
|
||||
dev = {
|
||||
sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj";
|
||||
sha256bin64 = "1hq3qz7b5nmnck5sfbaa8d25khv88ylnq10dhbp76ahz4ixn9f7k";
|
||||
version = "63.0.3239.18";
|
||||
sha256 = "0kpn5w1qvjlkxqhsc7lz269mxp7i0z9k92ay178kgsph3ygncm0x";
|
||||
sha256bin64 = "1pvnkhvks3yvpdh2qg9iqg6xmi5bxrl1n6mp9akywv1d5wsba7kg";
|
||||
version = "64.0.3260.2";
|
||||
};
|
||||
stable = {
|
||||
sha256 = "0k4hvmhaspw3f2scjjcam9dwnkrrzzibnx9sq5b1p56bgd2zxka9";
|
||||
sha256bin64 = "0c4g2h1kcpksx0whf784hs7w62xbgsvq42fvzs0lfjgs11s8fm0x";
|
||||
version = "62.0.3202.75";
|
||||
sha256 = "0sclvs11kn60ibc66wfan0xdcsr2s8vkvbq759h86w9gq86pcycz";
|
||||
sha256bin64 = "05lbrzd37q57mx9rii995l9z42a4aa0jh55ia615sqmzr56a7fdr";
|
||||
version = "62.0.3202.89";
|
||||
};
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
featureset might be considered "minimalistic", but not as minimalistic as
|
||||
being completely featureless.
|
||||
'';
|
||||
homepage = http://sourceforge.net/apps/trac/vimprobable;
|
||||
homepage = https://sourceforge.net/apps/trac/vimprobable;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.aforemny ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
|
||||
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Graphical wireless scanning for Linux";
|
||||
homepage = http://sourceforge.net/projects/linssid/;
|
||||
homepage = https://sourceforge.net/projects/linssid/;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
|
||||
@ -37,14 +37,14 @@ let
|
||||
then "i386"
|
||||
else "amd64";
|
||||
|
||||
shortVersion = "1.17.10-stable";
|
||||
shortVersion = "1.17.11-stable";
|
||||
|
||||
version = "${shortVersion}_${arch}";
|
||||
|
||||
url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
|
||||
sha256 = if stdenv.system == arch32
|
||||
then "0sc9fsprdpl39q8wqbjp59pnr10c1a8gss60b81h54agjni55yrg"
|
||||
else "02ncfdxcrdwghpch2nlfhc7d0vgjsfqn8sxjkb5yn4bf5wi8z9bq";
|
||||
then "033855ix5qj1gwd3pa6qws5k94hgbp6rvibrrxl3rn5bvhrvvbkq"
|
||||
else "09h6br8qhvphkvzy28y1pnh7dhyigb3w41w3kjwqj6027i46chi7";
|
||||
|
||||
deps = [
|
||||
qt5.qtbase
|
||||
|
||||
24
pkgs/applications/science/logic/potassco/clingo.nix
Normal file
24
pkgs/applications/science/logic/potassco/clingo.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{stdenv, fetchurl, cmake}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "clingo";
|
||||
version = "5.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/potassco/clingo/releases/v${version}.tar.gz";
|
||||
sha256 = "1kxzb385g8p9mqm1x9wvjrigifa09w6vj0wl7kradibm5qagh7ns";
|
||||
};
|
||||
|
||||
buildInputs = [];
|
||||
nativeBuildInputs = [cmake];
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "ASP system to ground and solve logic programs";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [stdenv.lib.maintainers.raskin];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
homepage = "https://potassco.org/";
|
||||
downloadPage = "https://github.com/potassco/clingo/releases/";
|
||||
};
|
||||
}
|
||||
6
pkgs/applications/science/logic/potassco/clingo.upstream
Normal file
6
pkgs/applications/science/logic/potassco/clingo.upstream
Normal file
@ -0,0 +1,6 @@
|
||||
target clingo.nix
|
||||
attribute_name clingo
|
||||
url https://github.com/potassco/clingo/releases/
|
||||
ensure_choice
|
||||
version '.*/v([0-9.]+)[.]tar[.].*' '\1'
|
||||
minimize_overwrite
|
||||
@ -84,6 +84,8 @@ rec {
|
||||
|
||||
git-remote-hg = callPackage ./git-remote-hg { };
|
||||
|
||||
git-secret = callPackage ./git-secret { };
|
||||
|
||||
git-stree = callPackage ./git-stree { };
|
||||
|
||||
git2cl = callPackage ./git2cl { };
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
{ stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg }:
|
||||
|
||||
let
|
||||
version = "0.2.2";
|
||||
repo = "git-secret";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "${repo}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit repo;
|
||||
owner = "sobolevn";
|
||||
rev = "v${version}";
|
||||
sha256 = "0vn9jibp97z7kc828wka1k0d7a9wx4skd6cnqy60kagfc00l0bzh";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
install -D git-secret $out/bin/git-secret
|
||||
|
||||
wrapProgram $out/bin/git-secret \
|
||||
--prefix PATH : "${lib.makeBinPath [ git gnupg ]}"
|
||||
|
||||
mkdir $out/share
|
||||
cp -r man $out/share
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A bash-tool to store your private data inside a git repository";
|
||||
homepage = http://git-secret.io;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.lo1tuma ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "Command line tool to make a copy from a video DVD for private use";
|
||||
homepage = http://sourceforge.net/projects/lxdvdrip;
|
||||
homepage = https://sourceforge.net/projects/lxdvdrip;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://sourceforge.net/projects/mjpg-streamer/;
|
||||
homepage = https://sourceforge.net/projects/mjpg-streamer/;
|
||||
description = "MJPG-streamer takes JPGs from Linux-UVC compatible webcams, filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
|
||||
@ -66,7 +66,7 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
|
||||
|
||||
meta = {
|
||||
description = "Sample UEFI firmware for QEMU and KVM";
|
||||
homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF;
|
||||
homepage = https://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF;
|
||||
license = stdenv.lib.licenses.bsd2;
|
||||
platforms = ["x86_64-linux" "i686-linux"];
|
||||
};
|
||||
|
||||
@ -1,20 +1,25 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, glibc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.13.1";
|
||||
version = "0.16.1";
|
||||
name = "tini-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "krallin";
|
||||
repo = "tini";
|
||||
rev = "v${version}";
|
||||
sha256 ="1g4n8v5d197zcb41fcpbhip2x342383zw1d2zkv57w73vkqgv6z6";
|
||||
sha256 ="1abvjwjk7xhsbx60niy4ykcj3xvrxcl6zx8z1v827jsn47wzpikp";
|
||||
};
|
||||
|
||||
patchPhase = "sed -i /tini-static/d CMakeLists.txt";
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-DPR_SET_CHILD_SUBREAPER=36"
|
||||
"-DPR_GET_CHILD_SUBREAPER=37"
|
||||
];
|
||||
|
||||
buildInputs = [ cmake glibc glibc.static ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A tiny but valid init for containers";
|
||||
homepage = https://github.com/krallin/tini;
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ fetchgit, writeScript, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // {
|
||||
{ fetchgit, runCommand, makeWrapper, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // {
|
||||
SSH_AUTH_SOCK = if (builtins.tryEval <ssh-auth-sock>).success
|
||||
then builtins.toString <ssh-auth-sock>
|
||||
else null;
|
||||
GIT_SSH = writeScript "fetchgit-ssh" ''
|
||||
#! ${stdenv.shell}
|
||||
exec -a ssh ${openssh}/bin/ssh -F ${let
|
||||
|
||||
GIT_SSH = let
|
||||
config = ''${let
|
||||
sshConfigFile = if (builtins.tryEval <ssh-config-file>).success
|
||||
then <ssh-config-file>
|
||||
else builtins.trace ''
|
||||
@ -14,6 +14,13 @@
|
||||
|
||||
You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user.
|
||||
'' "/var/lib/empty/config";
|
||||
in builtins.toString sshConfigFile} "$@"
|
||||
in builtins.toString sshConfigFile}'';
|
||||
|
||||
ssh-wrapped = runCommand "fetchgit-ssh" {
|
||||
buildInputs = [ makeWrapper ];
|
||||
} ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${openssh}/bin/ssh $out/bin/ssh --prefix PATH : "$out/bin" --add-flags "-F ${config}" "$@"
|
||||
'';
|
||||
in "${ssh-wrapped}/bin/ssh";
|
||||
})
|
||||
|
||||
37
pkgs/data/fonts/libertinus/default.nix
Normal file
37
pkgs/data/fonts/libertinus/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libertinus-${version}";
|
||||
version = "6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "khaledhosny";
|
||||
repo = "libertinus";
|
||||
sha256 = "0acnq4vpplp2s7kdnhncz61diji3wmhca04g27yqpk03ahb40x9g";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/fonts/opentype/
|
||||
mkdir -p $out/share/doc/${name}/
|
||||
cp *.otf $out/share/fonts/opentype/
|
||||
cp *.txt $out/share/doc/${name}/
|
||||
'';
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "0yn526kwb4xjyf6gvf0wflqi45z5dlzicycz2q003a6if5fgqcz3";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A fork of the Linux Libertine and Linux Biolinum fonts";
|
||||
longDescription = ''
|
||||
Libertinus fonts is a fork of the Linux Libertine and Linux Biolinum fonts
|
||||
that started as an OpenType math companion of the Libertine font family,
|
||||
but grown as a full fork to address some of the bugs in the fonts.
|
||||
'';
|
||||
homepage = https://github.com/khaledhosny/libertinus;
|
||||
license = licenses.ofl;
|
||||
maintainers = with maintainers; [ siddharthist ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -13,7 +13,7 @@ fetchzip {
|
||||
sha256 = "17rgkh54arybmcdg750ynw32x2sps7p9vrvq9kpih8vdghwrh9k2";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://sourceforge.net/adobe/sourcesans;
|
||||
homepage = https://sourceforge.net/adobe/sourcesans;
|
||||
description = "A set of OpenType fonts designed by Adobe for UIs";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
|
||||
@ -15,7 +15,7 @@ in fetchzip {
|
||||
sha256 = "04447fbj7lwr2qmmvy7d7624qdh4in7hp627nsc8vbpxmb7bbmn1";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://sourceforge.net/adobe/sourceserifpro;
|
||||
homepage = https://sourceforge.net/adobe/sourceserifpro;
|
||||
description = "A set of OpenType fonts to complement Source Sans Pro";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
diff --git a/src/vteconv.cc b/src/vteconv.cc
|
||||
index b78d3928..5cb63e7e 100644
|
||||
--- a/src/vteconv.cc
|
||||
+++ b/src/vteconv.cc
|
||||
@@ -771,7 +771,7 @@ int
|
||||
main (int argc,
|
||||
char *argv[])
|
||||
{
|
||||
- g_test_init (&argc, &argv, NULL);
|
||||
+ g_test_init (&argc, &argv, (char *)NULL);
|
||||
|
||||
g_test_add_func ("/vte/conv/utf8/strlen", test_utf8_strlen);
|
||||
g_test_add_func ("/vte/conv/utf8/validate", test_utf8_validate);
|
||||
diff --git a/src/vtetypes.cc b/src/vtetypes.cc
|
||||
index 1365a295..8f38c9d9 100644
|
||||
--- a/src/vtetypes.cc
|
||||
+++ b/src/vtetypes.cc
|
||||
@@ -407,7 +407,7 @@ test_util_smart_fd(void)
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
- g_test_init (&argc, &argv, NULL);
|
||||
+ g_test_init (&argc, &argv, (char *)NULL);
|
||||
|
||||
g_test_add_func("/vte/c++/grid/coords", test_grid_coords);
|
||||
g_test_add_func("/vte/c++/grid/span", test_grid_span);
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/src/vteseq.cc b/src/vteseq.cc
|
||||
index 2330939d..e0ac14eb 100644
|
||||
--- a/src/vteseq.cc
|
||||
+++ b/src/vteseq.cc
|
||||
@@ -3409,7 +3409,7 @@ vte_sequence_handler_iterm2_1337(VteTerminalPrivate *that, GValueArray *params)
|
||||
#define VTE_SEQUENCE_HANDLER(name) name
|
||||
|
||||
static const struct vteseq_n_struct *
|
||||
-vteseq_n_lookup (register const char *str, register unsigned int len);
|
||||
+vteseq_n_lookup (register const char *str, register size_t len);
|
||||
#include"vteseq-n.cc"
|
||||
|
||||
#undef VTE_SEQUENCE_HANDLER
|
||||
@ -2,22 +2,15 @@
|
||||
|
||||
gnome3.vte.overrideAttrs (oldAttrs: rec {
|
||||
name = "vte-ng-${version}";
|
||||
version = "0.46.1.a";
|
||||
version = "0.50.2.a";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thestinger";
|
||||
repo = "vte-ng";
|
||||
rev = version;
|
||||
sha256 = "125fpibid1liz50d7vbxy71pnm8b01x90xnkr4z3419b90lybr0a";
|
||||
sha256 = "0i6hfzw9sq8521kz0l7lld2km56r0bfp1hw6kxq3j1msb8z8svcf";
|
||||
};
|
||||
|
||||
# The patches apply the changes from https://github.com/GNOME/vte/pull/7 and
|
||||
# can be removed once the commits are merged into vte-ng.
|
||||
patches = [
|
||||
./fix_g_test_init_calls.patch
|
||||
./fix_vteseq_n_lookup_declaration.patch
|
||||
];
|
||||
|
||||
preConfigure = oldAttrs.preConfigure + "; ./autogen.sh";
|
||||
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs or []
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Assember for the Atmel AVR microcontroller family";
|
||||
description = "Assembler for the Atmel AVR microcontroller family";
|
||||
homepage = http://avra.sourceforge.net/;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.all;
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, which
|
||||
, cmake
|
||||
, clang
|
||||
@ -27,6 +28,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "16z58ix8kmk8csfy5qsqz8z30czhrap2vb8s8vdflmbcfnq31jcw";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# glibc 2.26
|
||||
url = https://github.com/dotnet/coreclr/commit/a8f83b615708c529b112898e7d2fbc3f618b26ee.patch;
|
||||
sha256 = "047ph5gip4z2h7liwdxsmpnlaq0sd3hliaw4nyqjp647m80g3ffq";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
which
|
||||
cmake
|
||||
|
||||
@ -133,7 +133,7 @@
|
||||
test-framework-hunit test-framework-quickcheck2 text unix
|
||||
];
|
||||
jailbreak = true;
|
||||
homepage = http://github.com/tibbe/hashable;
|
||||
homepage = https://github.com/tibbe/hashable;
|
||||
description = "A class for types that can be converted to a hash value";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
@ -146,7 +146,7 @@
|
||||
doCheck = false;
|
||||
libraryHaskellDepends = [ base transformers ];
|
||||
jailbreak = true;
|
||||
homepage = http://github.com/ekmett/mtl;
|
||||
homepage = https://github.com/ekmett/mtl;
|
||||
description = "Monad classes, using functional dependencies";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
@ -311,7 +311,7 @@
|
||||
test-framework-hunit test-framework-quickcheck2 text
|
||||
];
|
||||
jailbreak = true;
|
||||
homepage = http://github.com/ghcjs/ghcjs-base;
|
||||
homepage = https://github.com/ghcjs/ghcjs-base;
|
||||
description = "Base library for GHCJS";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
homepage = http://sourceforge.net/p/ghdl-updates/wiki/Home/;
|
||||
homepage = https://sourceforge.net/p/ghdl-updates/wiki/Home/;
|
||||
description = "Free VHDL simulator";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; (if flavour == "llvm" then [ "i686-linux" "x86_64-linux" ]
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetch
|
||||
, fetchpatch
|
||||
, perl
|
||||
, groff
|
||||
, cmake
|
||||
@ -39,6 +40,22 @@ in stdenv.mkDerivation rec {
|
||||
../fix-llvm-config.patch
|
||||
];
|
||||
|
||||
postPatch = stdenv.lib.optionalString (stdenv ? glibc) ''
|
||||
(
|
||||
cd projects/compiler-rt
|
||||
patch -p1 -F3 < ${
|
||||
fetchpatch {
|
||||
name = "sigaltstack.patch"; # for glibc-2.26
|
||||
url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff;
|
||||
sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi";
|
||||
}
|
||||
}
|
||||
|
||||
sed -i "s,#include <pthread.h>,&\n#include <signal.h>,g" \
|
||||
lib/asan/asan_linux.cc
|
||||
)
|
||||
'';
|
||||
|
||||
# hacky fix: created binaries need to be run before installation
|
||||
preBuild = ''
|
||||
mkdir -p $out/
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetch
|
||||
, fetchpatch
|
||||
, perl
|
||||
, groff
|
||||
, cmake
|
||||
@ -39,6 +40,22 @@ in stdenv.mkDerivation rec {
|
||||
--replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' ""
|
||||
'';
|
||||
|
||||
postPatch = stdenv.lib.optionalString (stdenv ? glibc) ''
|
||||
(
|
||||
cd projects/compiler-rt
|
||||
patch -p1 < ${
|
||||
fetchpatch {
|
||||
name = "sigaltstack.patch"; # for glibc-2.26
|
||||
url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff;
|
||||
sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi";
|
||||
}
|
||||
}
|
||||
|
||||
sed -i "s,#include <pthread.h>,&\n#include <signal.h>,g" \
|
||||
lib/asan/asan_linux.cc
|
||||
)
|
||||
'';
|
||||
|
||||
# hacky fix: created binaries need to be run before installation
|
||||
preBuild = ''
|
||||
mkdir -p $out/
|
||||
|
||||
@ -145,7 +145,7 @@ go.stdenv.mkDerivation (
|
||||
if [ -n "$subPackages" ]; then
|
||||
echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g"
|
||||
else
|
||||
pushd go/src >/dev/null
|
||||
pushd "$NIX_BUILD_TOP/go/src" >/dev/null
|
||||
find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort | uniq
|
||||
popd >/dev/null
|
||||
fi
|
||||
|
||||
@ -11,6 +11,8 @@ let
|
||||
|
||||
let php7 = lib.versionAtLeast version "7.0";
|
||||
mysqlHeaders = mysql.lib.dev or mysql;
|
||||
mysqlndSupport = config.php.mysqlnd or false;
|
||||
mysqlBuildInputs = lib.optional (!mysqlndSupport) mysqlHeaders;
|
||||
|
||||
in composableDerivation.composableDerivation {} (fixed: {
|
||||
|
||||
@ -112,13 +114,13 @@ let
|
||||
};
|
||||
|
||||
mysql = {
|
||||
configureFlags = ["--with-mysql"];
|
||||
buildInputs = [ mysqlHeaders ];
|
||||
configureFlags = ["--with-mysql${if mysqlndSupport then "=mysqlnd" else ""}"];
|
||||
buildInputs = mysqlBuildInputs;
|
||||
};
|
||||
|
||||
mysqli = {
|
||||
configureFlags = ["--with-mysqli=${mysqlHeaders}/bin/mysql_config"];
|
||||
buildInputs = [ mysqlHeaders ];
|
||||
configureFlags = ["--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysqlHeaders}/bin/mysql_config"}"];
|
||||
buildInputs = mysqlBuildInputs;
|
||||
};
|
||||
|
||||
mysqli_embedded = {
|
||||
@ -128,8 +130,8 @@ let
|
||||
};
|
||||
|
||||
pdo_mysql = {
|
||||
configureFlags = ["--with-pdo-mysql=${mysqlHeaders}"];
|
||||
buildInputs = [ mysqlHeaders ];
|
||||
configureFlags = ["--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysqlHeaders}"];
|
||||
buildInputs = mysqlBuildInputs;
|
||||
};
|
||||
|
||||
bcmath = {
|
||||
|
||||
@ -18,7 +18,7 @@ in rec {
|
||||
m2Path = "/com/nequissimus/maven-hello/${version}";
|
||||
|
||||
meta = {
|
||||
homepage = http://github.com/NeQuissimus/maven-hello/;
|
||||
homepage = https://github.com/NeQuissimus/maven-hello/;
|
||||
description = "Maven Hello World";
|
||||
license = stdenv.lib.licenses.unlicense;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "C++ wrappers for ATK accessibility toolkit";
|
||||
license = stdenv.lib.licenses.lgpl21Plus;
|
||||
homepage = http://gtkmm.org;
|
||||
homepage = https://gtkmm.org;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@ rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Audio processing plugin system for plugins that extract descriptive information from audio data";
|
||||
homepage = http://sourceforge.net/projects/vamp;
|
||||
homepage = https://sourceforge.net/projects/vamp;
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.goibhniu maintainers.marcweber ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://sourceforge.net/projects/dirac;
|
||||
homepage = https://sourceforge.net/projects/dirac;
|
||||
description = "A general-purpose video codec based on wavelets";
|
||||
platforms = platforms.linux;
|
||||
license = with licenses; [ mpl11 gpl2 lgpl21 ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jasper-${version}";
|
||||
version = "2.0.13";
|
||||
version = "2.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "jasper";
|
||||
owner = "mdadams";
|
||||
rev = "version-${version}";
|
||||
sha256 = "1kd2xiszg9bxfavs3fadi4gi27m876d9zjjy0ns6mmbcjk109c0a";
|
||||
sha256 = "0aarg8nbik9wrm7fx0451sbm5ypfdfr6i169pxzi354mpdp8gg7f";
|
||||
};
|
||||
|
||||
# newer reconf to recognize a multiout flag
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol";
|
||||
homepage = http://sourceforge.net/projects/liblo;
|
||||
homepage = https://sourceforge.net/projects/liblo;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [stdenv.lib.maintainers.marcweber];
|
||||
platforms = with stdenv.lib.platforms; linux ++ darwin;
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "An abstraction library for audio visualisations";
|
||||
homepage = http://sourceforge.net/projects/libvisual/;
|
||||
homepage = https://sourceforge.net/projects/libvisual/;
|
||||
license = stdenv.lib.licenses.lgpl21Plus;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
platforms = platforms.linux;
|
||||
homepage = http://sourceforge.net/projects/linuxwacom/;
|
||||
homepage = https://sourceforge.net/projects/linuxwacom/;
|
||||
description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux";
|
||||
};
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Extract Cell Data From Excel xls files";
|
||||
homepage = http://sourceforge.net/projects/libxls/;
|
||||
homepage = https://sourceforge.net/projects/libxls/;
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ protobuf zlib ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://github.com/protobuf-c/protobuf-c/;
|
||||
homepage = https://github.com/protobuf-c/protobuf-c/;
|
||||
description = "C bindings for Google's Protocol Buffers";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.all;
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Small Footprint CIM Client Library";
|
||||
|
||||
homepage = http://sourceforge.net/projects/sblim/;
|
||||
homepage = https://sourceforge.net/projects/sblim/;
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.deepfire ];
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "An implementation of the C++ Standard Library";
|
||||
homepage = http://sourceforge.net/projects/stlport/;
|
||||
homepage = https://sourceforge.net/projects/stlport/;
|
||||
license = stdenv.lib.licenses.free; # seems BSD-like
|
||||
broken = true; # probably glibc-2.20 -related issue
|
||||
};
|
||||
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://sourceforge.net/projects/libtirpc/;
|
||||
homepage = https://sourceforge.net/projects/libtirpc/;
|
||||
description = "The transport-independent Sun RPC implementation (TI-RPC)";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "C++/C library to construct Excel .xls files in code";
|
||||
homepage = http://sourceforge.net/projects/xlslib/;
|
||||
homepage = https://sourceforge.net/projects/xlslib/;
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
|
||||
@ -16,7 +16,7 @@ buildRustPackage rec {
|
||||
cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk";
|
||||
|
||||
meta = {
|
||||
homepage = http://github.com/cgag/loc;
|
||||
homepage = https://github.com/cgag/loc;
|
||||
description = "Count lines of code quickly";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
|
||||
|
||||
@ -5816,7 +5816,7 @@ in
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Web Inspector based nodeJS debugger";
|
||||
homepage = http://github.com/node-inspector/node-inspector;
|
||||
homepage = https://github.com/node-inspector/node-inspector;
|
||||
};
|
||||
production = true;
|
||||
};
|
||||
|
||||
@ -29050,7 +29050,7 @@ in
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Web Inspector based nodeJS debugger";
|
||||
homepage = http://github.com/node-inspector/node-inspector;
|
||||
homepage = https://github.com/node-inspector/node-inspector;
|
||||
};
|
||||
production = true;
|
||||
};
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
createFindlibDestdir = true;
|
||||
|
||||
meta = {
|
||||
homepage = http://sourceforge.net/projects/ocamlfuse;
|
||||
homepage = https://sourceforge.net/projects/ocamlfuse;
|
||||
description = "OCaml bindings for FUSE";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
|
||||
@ -12,7 +12,7 @@ buildOcaml rec {
|
||||
propagatedBuildInputs = [ ocaml_batteries csv ocaml_lwt ocaml_sqlite3 estring ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://github.com/mfp/ocaml-sqlexpr;
|
||||
homepage = https://github.com/mfp/ocaml-sqlexpr;
|
||||
description = "Type-safe, convenient SQLite database access";
|
||||
license = licenses.lgpl21;
|
||||
};
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
createFindlibDestdir = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://github.com/mlin/ocaml-sqlite3EZ;
|
||||
homepage = https://github.com/mlin/ocaml-sqlite3EZ;
|
||||
description = "A thin wrapper for sqlite3-ocaml with a simplified interface";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
|
||||
@ -59,7 +59,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python library that lets you schedule your Python code to be executed";
|
||||
homepage = http://pypi.python.org/pypi/APScheduler/;
|
||||
homepage = https://pypi.python.org/pypi/APScheduler/;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://github.com/saghul/aiodns;
|
||||
homepage = https://github.com/saghul/aiodns;
|
||||
license = licenses.mit;
|
||||
description = "Simple DNS resolver for asyncio";
|
||||
};
|
||||
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [ Mako sqlalchemy python-editor dateutil ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://bitbucket.org/zzzeek/alembic;
|
||||
homepage = https://bitbucket.org/zzzeek/alembic;
|
||||
description = "A database migration tool for SQLAlchemy";
|
||||
license = licenses.mit;
|
||||
};
|
||||
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Namespace control and lazy-import mechanism";
|
||||
homepage = http://bitbucket.org/hpk42/apipkg;
|
||||
homepage = https://bitbucket.org/hpk42/apipkg;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "A python module for determining appropriate platform-specific dirs";
|
||||
homepage = http://github.com/ActiveState/appdirs;
|
||||
homepage = https://github.com/ActiveState/appdirs;
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,6 +16,6 @@ buildPythonPackage rec {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Posix IPC-backed ASGI channel layer implementation";
|
||||
license = licenses.bsd3;
|
||||
homepage = http://github.com/django/asgi_ipc/;
|
||||
homepage = https://github.com/django/asgi_ipc/;
|
||||
};
|
||||
}
|
||||
|
||||
@ -19,6 +19,6 @@ buildPythonPackage rec {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Redis-backed ASGI channel layer implementation";
|
||||
license = licenses.bsd3;
|
||||
homepage = http://github.com/django/asgi_redis/;
|
||||
homepage = https://github.com/django/asgi_redis/;
|
||||
};
|
||||
}
|
||||
|
||||
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "A abstract syntax tree for Python with inference support";
|
||||
homepage = http://bitbucket.org/logilab/astroid;
|
||||
homepage = https://bitbucket.org/logilab/astroid;
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ nand0p ];
|
||||
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = http://github.com/dursk/bitcoin-price-api;
|
||||
homepage = https://github.com/dursk/bitcoin-price-api;
|
||||
description = "Price APIs for bitcoin exchanges";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ bhipple ];
|
||||
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "High level chart types built on top of Bokeh";
|
||||
homepage = http://github.com/bokeh/bkcharts;
|
||||
homepage = https://github.com/bokeh/bkcharts;
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
}
|
||||
44
pkgs/development/python-modules/botocore/default.nix
Normal file
44
pkgs/development/python-modules/botocore/default.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{ buildPythonPackage
|
||||
, fetchPypi
|
||||
, dateutil
|
||||
, jmespath
|
||||
, docutils
|
||||
, ordereddict
|
||||
, simplejson
|
||||
, mock
|
||||
, nose
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "botocore";
|
||||
version = "1.7.43";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0wyyj7sk7dh9v7i1g5jc5maqdadvbs4khi7srz0095cywkjqpysc";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dateutil
|
||||
jmespath
|
||||
docutils
|
||||
ordereddict
|
||||
simplejson
|
||||
];
|
||||
|
||||
checkInputs = [ mock nose ];
|
||||
|
||||
checkPhase = ''
|
||||
nosetests -v
|
||||
'';
|
||||
|
||||
# Network access
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/boto/botocore;
|
||||
license = "bsd";
|
||||
description = "A low-level interface to a growing number of Amazon Web Services";
|
||||
};
|
||||
}
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "Composable style cycles";
|
||||
homepage = http://github.com/matplotlib/cycler;
|
||||
homepage = https://github.com/matplotlib/cycler;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
};
|
||||
|
||||
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "Minimal task scheduling abstraction";
|
||||
homepage = http://github.com/ContinuumIO/dask/;
|
||||
homepage = https://github.com/ContinuumIO/dask/;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
};
|
||||
|
||||
@ -13,7 +13,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Powerful extensions to the standard datetime module";
|
||||
homepage = http://pypi.python.org/pypi/python-dateutil;
|
||||
homepage = https://pypi.python.org/pypi/python-dateutil;
|
||||
license = "BSD-style";
|
||||
};
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A caching front-end based on the Dogpile lock";
|
||||
homepage = http://bitbucket.org/zzzeek/dogpile.cache;
|
||||
homepage = https://bitbucket.org/zzzeek/dogpile.cache;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Code checking using pep8 and pyflakes";
|
||||
homepage = http://pypi.python.org/pypi/flake8;
|
||||
homepage = https://pypi.python.org/pypi/flake8;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ garbas ];
|
||||
};
|
||||
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = http://pypi.python.org/pypi/guessit;
|
||||
homepage = https://pypi.python.org/pypi/guessit;
|
||||
license = lib.licenses.lgpl3;
|
||||
description = "A library for guessing information from video files";
|
||||
};
|
||||
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = http://pypi.python.org/pypi/guessit;
|
||||
homepage = https://pypi.python.org/pypi/guessit;
|
||||
license = lib.licenses.lgpl3;
|
||||
description = "A library for guessing information from video files";
|
||||
};
|
||||
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://pypi.python.org/pypi/gunicorn;
|
||||
homepage = https://pypi.python.org/pypi/gunicorn;
|
||||
description = "WSGI HTTP Server for UNIX";
|
||||
license = licenses.mit;
|
||||
};
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user