Merge pull request #115197 from SuperSandro2000/fix-collection21
This commit is contained in:
Sandro
GitHub
commit
9675484462
|
|
@ -1096,6 +1096,12 @@
|
|||
githubId = 1432730;
|
||||
name = "Benjamin Staffin";
|
||||
};
|
||||
benneti = {
|
||||
name = "Benedikt Tissot";
|
||||
email = "benedikt.tissot@googlemail.com";
|
||||
github = "benneti";
|
||||
githubId = 11725645;
|
||||
};
|
||||
bennofs = {
|
||||
email = "benno.fuenfstueck@gmail.com";
|
||||
github = "bennofs";
|
||||
|
|
@ -3095,6 +3101,12 @@
|
|||
githubId = 9959940;
|
||||
name = "Andreas Fehn";
|
||||
};
|
||||
felixscheinost = {
|
||||
name = "Felix Scheinost";
|
||||
email = "felix.scheinost@posteo.de";
|
||||
github = "felixscheinost";
|
||||
githubId = 31761492;
|
||||
};
|
||||
felixsinger = {
|
||||
email = "felixsinger@posteo.net";
|
||||
github = "felixsinger";
|
||||
|
|
@ -7255,6 +7267,12 @@
|
|||
githubId = 13225611;
|
||||
name = "Nicolas Martin";
|
||||
};
|
||||
p3psi = {
|
||||
name = "Elliot Boo";
|
||||
email = "p3psi.boo@gmail.com";
|
||||
github = "p3psi-boo";
|
||||
githubId = 43925055;
|
||||
};
|
||||
periklis = {
|
||||
email = "theopompos@gmail.com";
|
||||
github = "periklis";
|
||||
|
|
@ -10826,22 +10844,4 @@
|
|||
github = "zupo";
|
||||
githubId = 311580;
|
||||
};
|
||||
felixscheinost = {
|
||||
name = "Felix Scheinost";
|
||||
email = "felix.scheinost@posteo.de";
|
||||
github = "felixscheinost";
|
||||
githubId = 31761492;
|
||||
};
|
||||
benneti = {
|
||||
name = "Benedikt Tissot";
|
||||
email = "benedikt.tissot@googlemail.com";
|
||||
github = "benneti";
|
||||
githubId = 11725645;
|
||||
};
|
||||
p3psi = {
|
||||
name = "Elliot Boo";
|
||||
email = "p3psi.boo@gmail.com";
|
||||
github = "p3psi-boo";
|
||||
githubId = 43925055;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ lib, fetchFromGitHub, rustPackages, pkg-config, openssl
|
||||
, withALSA ? true, alsaLib ? null
|
||||
, withPulseAudio ? false, libpulseaudio ? null
|
||||
, withPortAudio ? false, portaudio ? null
|
||||
, withALSA ? true, alsaLib
|
||||
, withPulseAudio ? false, libpulseaudio
|
||||
, withPortAudio ? false, portaudio
|
||||
, withMpris ? false
|
||||
, withKeyring ? false
|
||||
, dbus ? null
|
||||
, dbus
|
||||
}:
|
||||
|
||||
rustPackages.rustPlatform.buildRustPackage rec {
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
gmusicapi
|
||||
google_api_python_client
|
||||
google-api-python-client
|
||||
mpv
|
||||
pydbus
|
||||
pygobject3
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
dateutil gflags httplib2 parsedatetime six vobject
|
||||
google_api_python_client oauth2client uritemplate
|
||||
google-api-python-client oauth2client uritemplate
|
||||
libnotify
|
||||
] ++ lib.optional (!isPy3k) futures;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
{
|
||||
lib, fetchFromGitHub, makeDesktopItem, prusa-slicer
|
||||
}:
|
||||
{ lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }:
|
||||
let
|
||||
appname = "SuperSlicer";
|
||||
version = "2.2.54.2";
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec {
|
|||
cjson
|
||||
sipsimple
|
||||
twisted
|
||||
google_api_python_client
|
||||
google-api-python-client
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
|
|||
propagatedBuildInputs = with python3Packages; [
|
||||
notmuch
|
||||
oauth2client
|
||||
google_api_python_client
|
||||
google-api-python-client
|
||||
tqdm
|
||||
setuptools
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
{
|
||||
glib,
|
||||
haskellPackages,
|
||||
lib,
|
||||
nodePackages,
|
||||
perlPackages,
|
||||
python2Packages,
|
||||
python3Packages,
|
||||
runCommand,
|
||||
writers,
|
||||
writeText
|
||||
{ glib
|
||||
, haskellPackages
|
||||
, lib
|
||||
, nodePackages
|
||||
, perlPackages
|
||||
, python2Packages
|
||||
, python3Packages
|
||||
, runCommand
|
||||
, writers
|
||||
, writeText
|
||||
}:
|
||||
with writers;
|
||||
let
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@ in fetchzip {
|
|||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A monospaced font for scientific and technical computing";
|
||||
longDescription = ''
|
||||
JuliaMono is a monospaced typeface designed for use in text editing environments that require a wide range of specialist and technical Unicode characters. It was intended as a fun experiment to be presented at the 2020 JuliaCon conference in Lisbon, Portugal (which of course didn’t physically happen in Lisbon, but online).
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ suhr ];
|
||||
platforms = with lib.platforms; all;
|
||||
maintainers = with maintainers; [ suhr ];
|
||||
platforms = with platforms; all;
|
||||
homepage = "https://cormullion.github.io/pages/2020-07-26-JuliaMono/";
|
||||
license = lib.licenses.ofl;
|
||||
license = licenses.ofl;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell, gnome3 }:
|
||||
{ lib, stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-taskwhisperer";
|
||||
|
|
|
|||
|
|
@ -1,30 +1,28 @@
|
|||
{ lib, stdenv, fetchFromGitHub, icestorm }:
|
||||
|
||||
with builtins;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arachne-pnr";
|
||||
version = "2019.07.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yosyshq";
|
||||
repo = "arachne-pnr";
|
||||
rev = "c40fb2289952f4f120cc10a5a4c82a6fb88442dc";
|
||||
owner = "yosyshq";
|
||||
repo = "arachne-pnr";
|
||||
rev = "c40fb2289952f4f120cc10a5a4c82a6fb88442dc";
|
||||
sha256 = "0lg9rccr486cvips3jf289af2b4a2j9chc8iqnkhykgi1hw4pszc";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
makeFlags =
|
||||
[ "PREFIX=$(out)"
|
||||
"ICEBOX=${icestorm}/share/icebox"
|
||||
];
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
"ICEBOX=${icestorm}/share/icebox"
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
substituteInPlace ./Makefile \
|
||||
--replace 'echo UNKNOWN' 'echo ${substring 0 10 src.rev}'
|
||||
--replace 'echo UNKNOWN' 'echo ${lib.substring 0 10 src.rev}'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Place and route tool for FPGAs";
|
||||
longDescription = ''
|
||||
Arachne-pnr implements the place and route step of
|
||||
|
|
@ -37,8 +35,8 @@ stdenv.mkDerivation rec {
|
|||
the IceStorm [2] icepack command.
|
||||
'';
|
||||
homepage = "https://github.com/cseed/arachne-pnr";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ shell thoughtpolice ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ shell thoughtpolice ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, premake4 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "bootil-unstable-2015-12-17";
|
||||
|
||||
meta = {
|
||||
description = "Garry Newman's personal utility library";
|
||||
homepage = "https://github.com/garrynewman/bootil";
|
||||
# License unsure - see https://github.com/garrynewman/bootil/issues/21
|
||||
license = lib.licenses.free;
|
||||
maintainers = [ lib.maintainers.abigailbuccaneer ];
|
||||
platforms = lib.platforms.all;
|
||||
# Build uses `-msse` and `-mfpmath=sse`
|
||||
badPlatforms = [ "aarch64-linux" ];
|
||||
};
|
||||
pname = "bootil";
|
||||
version = "unstable-2015-12-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "garrynewman";
|
||||
|
|
@ -21,11 +11,13 @@ stdenv.mkDerivation {
|
|||
sha256 = "03wq526r80l2px797hd0n5m224a6jibwipcbsvps6l9h740xabzg";
|
||||
};
|
||||
|
||||
patches = [ (fetchpatch {
|
||||
url = "https://github.com/garrynewman/bootil/pull/22.patch";
|
||||
name = "github-pull-request-22.patch";
|
||||
sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2";
|
||||
}) ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/garrynewman/bootil/pull/22.patch";
|
||||
name = "github-pull-request-22.patch";
|
||||
sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2";
|
||||
})
|
||||
];
|
||||
|
||||
# Avoid guessing where files end up. Just use current directory.
|
||||
postPatch = ''
|
||||
|
|
@ -42,4 +34,15 @@ stdenv.mkDerivation {
|
|||
install -D libbootil_static.a $out/lib/libbootil_static.a
|
||||
cp -r include $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Garry Newman's personal utility library";
|
||||
homepage = "https://github.com/garrynewman/bootil";
|
||||
# License unsure - see https://github.com/garrynewman/bootil/issues/21
|
||||
license = licenses.free;
|
||||
maintainers = [ maintainers.abigailbuccaneer ];
|
||||
platforms = platforms.all;
|
||||
# Build uses `-msse` and `-mfpmath=sse`
|
||||
badPlatforms = [ "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
{lib, stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.0";
|
||||
pname = "cpputest";
|
||||
version = "4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1xslavlb1974y5xvs8n1j9zkk05dlw8imy4saasrjlmibl895ii1";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "http://cpputest.github.io/";
|
||||
meta = with lib; {
|
||||
homepage = "https://cpputest.github.io/";
|
||||
description = "Unit testing and mocking framework for C/C++";
|
||||
platforms = lib.platforms.linux ;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.juliendehos ];
|
||||
platforms = platforms.linux ;
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.juliendehos ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -10,7 +11,7 @@
|
|||
, gobject-introspection
|
||||
, enableZbar ? false
|
||||
, faacSupport ? false
|
||||
, faac ? null
|
||||
, faac
|
||||
, faad2
|
||||
, libass
|
||||
, libkate
|
||||
|
|
@ -34,7 +35,6 @@
|
|||
, bluez
|
||||
, chromaprint
|
||||
, curl
|
||||
, darwin
|
||||
, directfb
|
||||
, fdk_aac
|
||||
, flite
|
||||
|
|
@ -80,20 +80,23 @@
|
|||
, libxml2
|
||||
, srt
|
||||
, vo-aacenc
|
||||
, VideoToolbox
|
||||
, AudioToolbox
|
||||
, AVFoundation
|
||||
, CoreMedia
|
||||
, CoreVideo
|
||||
, Foundation
|
||||
, MediaToolbox
|
||||
}:
|
||||
|
||||
assert faacSupport -> faac != null;
|
||||
|
||||
let
|
||||
inherit (lib) optional optionals;
|
||||
in stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-bad";
|
||||
version = "1.18.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "06ildd4rl6cynirv3p00d2ddf5is9svj4i7mkahldzhq24pq5mca";
|
||||
};
|
||||
|
||||
|
|
@ -110,7 +113,7 @@ in stdenv.mkDerivation rec {
|
|||
python3
|
||||
gettext
|
||||
gobject-introspection
|
||||
] ++ optionals stdenv.isLinux [
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
wayland # for wayland-scanner
|
||||
];
|
||||
|
||||
|
|
@ -166,16 +169,16 @@ in stdenv.mkDerivation rec {
|
|||
libintl
|
||||
srt
|
||||
vo-aacenc
|
||||
] ++ optionals enableZbar [
|
||||
] ++ lib.optionals enableZbar [
|
||||
zbar
|
||||
] ++ optionals faacSupport [
|
||||
] ++ lib.optionals faacSupport [
|
||||
faac
|
||||
] ++ optionals stdenv.isLinux [
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
bluez
|
||||
libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs
|
||||
wayland
|
||||
wayland-protocols
|
||||
] ++ optionals (!stdenv.isDarwin) [
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
# wildmidi requires apple's OpenAL
|
||||
# TODO: package apple's OpenAL, fix wildmidi, include on Darwin
|
||||
wildmidi
|
||||
|
|
@ -202,7 +205,7 @@ in stdenv.mkDerivation rec {
|
|||
serd
|
||||
sord
|
||||
sratom
|
||||
] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# For unknown reasons the order is important, e.g. if
|
||||
# VideoToolbox is last, we get:
|
||||
# fatal error: 'VideoToolbox/VideoToolbox.h' file not found
|
||||
|
|
@ -213,7 +216,7 @@ in stdenv.mkDerivation rec {
|
|||
CoreVideo
|
||||
Foundation
|
||||
MediaToolbox
|
||||
]);
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
|
||||
|
|
@ -251,10 +254,10 @@ in stdenv.mkDerivation rec {
|
|||
"-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing
|
||||
"-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing
|
||||
]
|
||||
++ optionals (!stdenv.isLinux) [
|
||||
++ lib.optionals (!stdenv.isLinux) [
|
||||
"-Dva=disabled" # see comment on `libva` in `buildInputs`
|
||||
]
|
||||
++ optionals stdenv.isDarwin [
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
"-Dbluez=disabled"
|
||||
"-Dchromaprint=disabled"
|
||||
"-Ddirectfb=disabled"
|
||||
|
|
@ -271,11 +274,11 @@ in stdenv.mkDerivation rec {
|
|||
"-Dladspa=disabled" # requires lrdf
|
||||
"-Dwebrtc=disabled" # requires libnice, which as of writing doesn't work on Darwin in nixpkgs
|
||||
"-Dwildmidi=disabled" # see dependencies above
|
||||
] ++ optionals (!gst-plugins-base.glEnabled) [
|
||||
"-Dgl=disabled"]
|
||||
++ optionals (!gst-plugins-base.waylandEnabled) [
|
||||
] ++ lib.optionals (!gst-plugins-base.glEnabled) [
|
||||
"-Dgl=disabled"
|
||||
] ++ lib.optionals (!gst-plugins-base.waylandEnabled) [
|
||||
"-Dwayland=disabled"
|
||||
] ++ optionals (!gst-plugins-base.glEnabled) [
|
||||
] ++ lib.optionals (!gst-plugins-base.glEnabled) [
|
||||
# `applemedia/videotexturecache.h` requires `gst/gl/gl.h`,
|
||||
# but its meson build system does not declare the dependency.
|
||||
"-Dapplemedia=disabled"
|
||||
|
|
|
|||
|
|
@ -31,7 +31,8 @@
|
|||
# errors. Suspected is that a newer version than clang
|
||||
# is needed than 5.0 but it is not clear.
|
||||
, enableCocoa ? false
|
||||
, darwin
|
||||
, Cocoa
|
||||
, OpenGL
|
||||
, enableGl ? (enableX11 || enableWayland || enableCocoa)
|
||||
, enableCdparanoia ? (!stdenv.isDarwin)
|
||||
, cdparanoia
|
||||
|
|
@ -45,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1b05kg46azrxxvq42c71071lfsnc34pw4vynnkczdqi6g0gzn16x";
|
||||
};
|
||||
|
||||
|
|
@ -81,7 +82,7 @@ stdenv.mkDerivation rec {
|
|||
libvisual
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
pango
|
||||
darwin.apple_sdk.frameworks.OpenGL
|
||||
OpenGL
|
||||
] ++ lib.optionals enableAlsa [
|
||||
alsaLib
|
||||
] ++ lib.optionals enableX11 [
|
||||
|
|
@ -91,7 +92,7 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals enableWayland [
|
||||
wayland
|
||||
wayland-protocols
|
||||
] ++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa
|
||||
] ++ lib.optional enableCocoa Cocoa
|
||||
++ lib.optional enableCdparanoia cdparanoia;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
outputBin = "dev";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0ijlmvr660m8zn09xlmnq1ajrziqsivp2hig5a9mabhcjx7ypkb6";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ callPackage, CoreServices }:
|
||||
{ callPackage, AudioToolbox, AVFoundation, Cocoa, CoreFoundation, CoreMedia, CoreServices, CoreVideo, DiskArbitration, Foundation, IOKit, MediaToolbox, OpenGL, VideoToolbox }:
|
||||
|
||||
rec {
|
||||
gstreamer = callPackage ./core { inherit CoreServices; };
|
||||
|
||||
gstreamermm = callPackage ./gstreamermm { };
|
||||
|
||||
gst-plugins-base = callPackage ./base { inherit gstreamer; };
|
||||
gst-plugins-base = callPackage ./base { inherit gstreamer Cocoa OpenGL; };
|
||||
|
||||
gst-plugins-good = callPackage ./good { inherit gst-plugins-base; };
|
||||
gst-plugins-good = callPackage ./good { inherit gst-plugins-base Cocoa; };
|
||||
|
||||
gst-plugins-bad = callPackage ./bad { inherit gst-plugins-base; };
|
||||
gst-plugins-bad = callPackage ./bad { inherit gst-plugins-base AudioToolbox AVFoundation CoreMedia CoreVideo Foundation MediaToolbox VideoToolbox; };
|
||||
|
||||
gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base; };
|
||||
gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base CoreFoundation DiskArbitration IOKit; };
|
||||
|
||||
gst-rtsp-server = callPackage ./rtsp-server { inherit gst-plugins-base gst-plugins-bad; };
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
version = "1.18.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0mhascwvgirgh7b5dykpnk06f7f5g62gh3sl30i6kygiidqkv9vf";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0pv2k8zlpn3vv2sdlspi3m63ixcwzi90pjly2ypbkg59ab97rb15";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -25,13 +25,13 @@
|
|||
, libsoup
|
||||
, libpulseaudio
|
||||
, libintl
|
||||
, darwin
|
||||
, Cocoa
|
||||
, lame
|
||||
, mpg123
|
||||
, twolame
|
||||
, gtkSupport ? false, gtk3 ? null
|
||||
, qt5Support ? false, qt5 ? null
|
||||
, raspiCameraSupport ? false, libraspberrypi ? null
|
||||
, gtkSupport ? false, gtk3
|
||||
, qt5Support ? false, qt5
|
||||
, raspiCameraSupport ? false, libraspberrypi
|
||||
, enableJack ? true, libjack2
|
||||
, libXdamage
|
||||
, libXext
|
||||
|
|
@ -44,12 +44,8 @@
|
|||
, wavpack
|
||||
}:
|
||||
|
||||
assert gtkSupport -> gtk3 != null;
|
||||
assert raspiCameraSupport -> ((libraspberrypi != null) && stdenv.isLinux && stdenv.isAarch64);
|
||||
assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64);
|
||||
|
||||
let
|
||||
inherit (lib) optionals;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-good";
|
||||
version = "1.18.2";
|
||||
|
|
@ -57,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1929nhjsvbl4bw37nfagnfsnxz737cm2x3ayz9ayrn9lwkfm45zp";
|
||||
};
|
||||
|
||||
|
|
@ -68,7 +64,7 @@ stdenv.mkDerivation rec {
|
|||
ninja
|
||||
gettext
|
||||
nasm
|
||||
] ++ optionals stdenv.isLinux [
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
wayland-protocols
|
||||
];
|
||||
|
||||
|
|
@ -98,39 +94,39 @@ stdenv.mkDerivation rec {
|
|||
xorg.libXfixes
|
||||
xorg.libXdamage
|
||||
wavpack
|
||||
] ++ optionals raspiCameraSupport [
|
||||
] ++ lib.optionals raspiCameraSupport [
|
||||
libraspberrypi
|
||||
] ++ optionals gtkSupport [
|
||||
] ++ lib.optionals gtkSupport [
|
||||
# for gtksink
|
||||
gtk3
|
||||
] ++ optionals qt5Support (with qt5; [
|
||||
] ++ lib.optionals qt5Support (with qt5; [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qtwayland
|
||||
qtx11extras
|
||||
]) ++ optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Cocoa
|
||||
] ++ optionals stdenv.isLinux [
|
||||
]) ++ lib.optionals stdenv.isDarwin [
|
||||
Cocoa
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libv4l
|
||||
libpulseaudio
|
||||
libavc1394
|
||||
libiec61883
|
||||
libgudev
|
||||
wayland
|
||||
] ++ optionals enableJack [
|
||||
] ++ lib.optionals enableJack [
|
||||
libjack2
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
|
||||
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
|
||||
] ++ optionals (!qt5Support) [
|
||||
] ++ lib.optionals (!qt5Support) [
|
||||
"-Dqt5=disabled"
|
||||
] ++ optionals (!gtkSupport) [
|
||||
] ++ lib.optionals (!gtkSupport) [
|
||||
"-Dgtk3=disabled"
|
||||
] ++ optionals (!enableJack) [
|
||||
] ++ lib.optionals (!enableJack) [
|
||||
"-Djack=disabled"
|
||||
] ++ optionals (!stdenv.isLinux) [
|
||||
] ++ lib.optionals (!stdenv.isLinux) [
|
||||
"-Ddv1394=disabled" # Linux only
|
||||
"-Doss4=disabled" # Linux only
|
||||
"-Doss=disabled" # Linux only
|
||||
|
|
@ -138,7 +134,7 @@ stdenv.mkDerivation rec {
|
|||
"-Dv4l2-gudev=disabled" # Linux-only
|
||||
"-Dv4l2=disabled" # Linux-only
|
||||
"-Dximagesrc=disabled" # Linux-only
|
||||
] ++ optionals (!raspiCameraSupport) [
|
||||
] ++ lib.optionals (!raspiCameraSupport) [
|
||||
"-Drpicamsrc=disabled"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
version = "1.18.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0jbzams9ggk3sq9ywv4gsl9rghyn203l2582m6l5c1sz9ka9m5in";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
version = "1.18.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1qjlp7az0hkzxvq53hwnp55sp6xhbybfwzaj66hp45jslsmj4fcp";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,9 @@
|
|||
, libintl
|
||||
, lib
|
||||
, opencore-amr
|
||||
, darwin
|
||||
, IOKit
|
||||
, CoreFoundation
|
||||
, DiskArbitration
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1nwbcv5yaib3d8icvyja3zf6lyjf5zf1hndbijrhj8j7xlia0dx3";
|
||||
};
|
||||
|
||||
|
|
@ -49,11 +51,11 @@ stdenv.mkDerivation rec {
|
|||
x264
|
||||
libintl
|
||||
opencore-amr
|
||||
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
IOKit
|
||||
CoreFoundation
|
||||
DiskArbitration
|
||||
]);
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
version = "1.18.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
|
||||
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1h67n7wk1297rzynknbyv44gdacblvkcvb37x8yxi5d0zms2qywc";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
|
|||
patchShebangs ./configure
|
||||
'';
|
||||
|
||||
configureFlags = lib.optionals stdenv.isAarch64 [ "--disable-sse" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pngquant.org/lib/";
|
||||
description = "Image quantization library";
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
|
|||
version = "${majorVersion}.${minorVersion}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz";
|
||||
url = "https://www.vtk.org/files/release/${majorVersion}/VTK-${version}.tar.gz";
|
||||
sha256 = sourceSha256;
|
||||
};
|
||||
|
||||
|
|
@ -94,6 +94,6 @@ in stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ knedlsepp tfmoraes lheckemann ];
|
||||
platforms = with platforms; unix;
|
||||
# /nix/store/xxxxxxx-apple-framework-Security/Library/Frameworks/Security.framework/Headers/Authorization.h:192:7: error: variably modified 'bytes' at file scope
|
||||
broken = if stdenv.isDarwin && (majorVersion == 7 || majorVersion == 8) then true else false;
|
||||
broken = stdenv.isDarwin && (lib.versions.major majorVersion == "7" || lib.versions.major majorVersion == "8");
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, bottle
|
||||
, chardet
|
||||
, dateutil
|
||||
, google_api_python_client
|
||||
, google-api-python-client
|
||||
, lxml
|
||||
, oauth2client
|
||||
, ply
|
||||
|
|
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
|||
bottle
|
||||
chardet
|
||||
dateutil
|
||||
google_api_python_client
|
||||
google-api-python-client
|
||||
lxml
|
||||
oauth2client
|
||||
ply
|
||||
|
|
|
|||
|
|
@ -21,5 +21,7 @@ buildPythonPackage rec {
|
|||
homepage = "https://bitbucket.org/sgillies/descartes/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ knedlsepp ];
|
||||
# all tests are failing
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
, six
|
||||
, dateutil
|
||||
, fusepy
|
||||
, google_api_python_client
|
||||
, google-api-python-client
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
buildInputs = [ gipc greenlet httplib2 six ];
|
||||
propagatedBuildInputs = [ dateutil fusepy google_api_python_client ];
|
||||
propagatedBuildInputs = [ dateutil fusepy google-api-python-client ];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace gdrivefs/resources/requirements.txt \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy3k
|
||||
, docutils, installShellFiles
|
||||
, google_api_python_client, simplejson, oauth2client, setuptools, xdg
|
||||
, google-api-python-client, simplejson, oauth2client, setuptools, xdg
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
|
||||
nativeBuildInputs = [ docutils installShellFiles ];
|
||||
propagatedBuildInputs = [
|
||||
google_api_python_client simplejson oauth2client setuptools xdg
|
||||
google-api-python-client simplejson oauth2client setuptools xdg
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, google-auth
|
||||
, googleapis_common_protos
|
||||
, googleapis-common-protos
|
||||
, grpcio
|
||||
, protobuf
|
||||
, pytz
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
googleapis_common_protos
|
||||
googleapis-common-protos
|
||||
google-auth
|
||||
grpcio
|
||||
protobuf
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, grpcio
|
||||
, googleapis_common_protos
|
||||
, googleapis-common-protos
|
||||
, pytest
|
||||
}:
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
sha256 = "0bfb5b56f648f457021a91c0df0db4934b6e0c300bd0f2de2333383fe958aa72";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ grpcio googleapis_common_protos ];
|
||||
propagatedBuildInputs = [ grpcio googleapis-common-protos ];
|
||||
|
||||
# non-standard test format, and python3 will load local google folder first
|
||||
# but tests cannot be ran if google folder is removed or moved
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, google_api_python_client
|
||||
, google-api-python-client
|
||||
, google-auth-oauthlib
|
||||
, jupyterhub
|
||||
, mwoauth
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
pytestFlagsArray = [ "oauthenticator/tests" ];
|
||||
|
||||
checkInputs = [
|
||||
google_api_python_client
|
||||
google-api-python-client
|
||||
google-auth-oauthlib
|
||||
mwoauth
|
||||
pyjwt
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, fetchPypi
|
||||
, isPy3k
|
||||
, protobuf
|
||||
, googleapis_common_protos
|
||||
, googleapis-common-protos
|
||||
, pytestCheckHook
|
||||
, pytz
|
||||
}:
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [ protobuf ];
|
||||
|
||||
checkInputs = [ pytestCheckHook pytz googleapis_common_protos ];
|
||||
checkInputs = [ pytestCheckHook pytz googleapis-common-protos ];
|
||||
|
||||
pythonImportsCheck = [ "proto" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, google_api_python_client
|
||||
, google-api-python-client
|
||||
, oauth2client
|
||||
, pyyaml
|
||||
}:
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google_api_python_client
|
||||
google-api-python-client
|
||||
oauth2client
|
||||
pyyaml
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, async-timeout
|
||||
, asynctest
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
|
|
|||
|
|
@ -48,11 +48,11 @@ buildPythonPackage rec {
|
|||
"-DPYTHON3_LIBRARY=${lib.getLib python}/lib"
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code";
|
||||
license = lib.licenses.gpl2;
|
||||
homepage = "http://www.pyside.org/docs/shiboken/";
|
||||
license = licenses.gpl2;
|
||||
homepage = "http://www.pyside.org/";
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +1,23 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }:
|
||||
{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytest-runner, wcwidth }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyte";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7e71d03e972d6f262cbe8704ff70039855f05ee6f7ad9d7129df9c977b5a88c5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytest-runner ];
|
||||
|
||||
propagatedBuildInputs = [ wcwidth ];
|
||||
|
||||
checkInputs = [ pytest pytestrunner ];
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
# tries to write to os.path.dirname(__file__) in test_input_output
|
||||
checkPhase = ''
|
||||
py.test -k "not test_input_output"
|
||||
'';
|
||||
disabledTests = [
|
||||
"test_input_output"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple VTXXX-compatible linux terminal emulator";
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
# AttributeError: 'KeywordMapping' object has no attribute 'get'
|
||||
doCheck = ! isPy27;
|
||||
doCheck = !isPy27;
|
||||
|
||||
disabledTests = [
|
||||
# Disable tests that require network access and use httpbin
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, futures
|
||||
, gdata
|
||||
, gnupg
|
||||
, google_api_python_client
|
||||
, google-api-python-client
|
||||
, html2text
|
||||
, libyaml
|
||||
, lxml
|
||||
|
|
@ -56,7 +56,7 @@ buildPythonPackage rec {
|
|||
feedparser
|
||||
gdata
|
||||
gnupg
|
||||
google_api_python_client
|
||||
google-api-python-client
|
||||
html2text
|
||||
libyaml
|
||||
lxml
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, python, autoreconfHook, pkg-config, makeWrapper
|
||||
, flex
|
||||
, gettext, libedit, glib, imagemagick, libxml2, boost, gnuplot, graphviz
|
||||
, gettext, libedit, glib, imagemagick6, libxml2, boost, gnuplot, graphviz
|
||||
, tesseract, gts, libXtst
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ autoreconfHook pkg-config flex makeWrapper
|
||||
python.pkgs.wrapPython ];
|
||||
|
||||
buildInputs = [ python gettext libedit glib imagemagick libxml2 boost
|
||||
buildInputs = [ python gettext libedit glib imagemagick6 libxml2 boost
|
||||
gnuplot graphviz tesseract gts
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin, perl }:
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation, perl }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wrangler";
|
||||
|
|
@ -13,15 +13,11 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk";
|
||||
|
||||
nativeBuildInputs = [ perl ] ++ lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
nativeBuildInputs = [ perl ]
|
||||
++ lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
curl
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
darwin.apple_sdk.frameworks.CoreFoundation
|
||||
];
|
||||
++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ];
|
||||
|
||||
# tries to use "/homeless-shelter" and fails
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ in
|
|||
|
||||
configureFlags = let
|
||||
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
|
||||
inherit (stdenv.hostPlatform) gcc isArch32;
|
||||
inherit (stdenv.hostPlatform) gcc isAarch32;
|
||||
in sharedConfigureFlags ++ [
|
||||
"--without-dtrace"
|
||||
] ++ (optionals isCross [
|
||||
|
|
|
|||
|
|
@ -2,9 +2,6 @@
|
|||
, openssl, systemd, lua, luajit, protobuf
|
||||
, enableProtoBuf ? false
|
||||
}:
|
||||
assert enableProtoBuf -> protobuf != null;
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdns-recursor";
|
||||
|
|
@ -19,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
boost openssl systemd
|
||||
lua luajit
|
||||
] ++ optional enableProtoBuf protobuf;
|
||||
] ++ lib.optional enableProtoBuf protobuf;
|
||||
|
||||
configureFlags = [
|
||||
"--enable-reproducible"
|
||||
|
|
@ -32,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
nixos = nixosTests.pdns-recursor;
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A recursive DNS server";
|
||||
homepage = "https://www.powerdns.com/";
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@
|
|||
"goalfeed" = ps: with ps; [ ]; # missing inputs: pysher
|
||||
"goalzero" = ps: with ps; [ ]; # missing inputs: goalzero
|
||||
"gogogate2" = ps: with ps; [ ]; # missing inputs: gogogate2-api
|
||||
"google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ];
|
||||
"google" = ps: with ps; [ google-api-python-client httplib2 oauth2client ];
|
||||
"google_assistant" = ps: with ps; [ aiohttp-cors ];
|
||||
"google_cloud" = ps: with ps; [ google-cloud-texttospeech ];
|
||||
"google_domains" = ps: with ps; [ ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, tcl, makeWrapper, autoreconfHook }:
|
||||
{ lib, stdenv, buildPackages, fetchurl, tcl, makeWrapper, autoreconfHook, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "expect";
|
||||
|
|
@ -9,19 +9,27 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0d1cp5hggjl93xwc8h1y6adbnrvpkk0ywkd00inz9ndxn21xm9s9";
|
||||
};
|
||||
|
||||
buildInputs = [ tcl ];
|
||||
nativeBuildInputs = [ makeWrapper autoreconfHook ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/buildroot/buildroot/master/package/expect/0001-enable-cross-compilation.patch";
|
||||
sha256 = "1jwx2l1slidvcpahxbyqs942l81jd62rzbxliyd9lwysk38c8b6b";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "s,/bin/stty,$(type -p stty),g" configure.in
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook makeWrapper tcl ];
|
||||
buildInputs = [ tcl ];
|
||||
|
||||
strictDeps = true;
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
configureFlags = [
|
||||
"--with-tcl=${tcl}/lib"
|
||||
"--with-tcl=${buildPackages.tcl}/lib"
|
||||
"--with-tclinclude=${tcl}/include"
|
||||
"--exec-prefix=\${out}"
|
||||
"--exec-prefix=${placeholder "out"}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1jivnjswlhwjfg5v9nwfg3vfssvqbdxxf9znwmfb5dgfblg9wxw9";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace 'CC=cc' 'CC=${stdenv.cc.targetPrefix}cc'
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/man/man6
|
||||
cp gti $out/bin
|
||||
|
|
@ -18,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://r-wos.org/hacks/gti";
|
||||
homepage = "https://r-wos.org/hacks/gti";
|
||||
license = licenses.mit;
|
||||
description = "Humorous typo-based git runner; drives a car over the terminal";
|
||||
maintainers = with maintainers; [ fadenb ];
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
|
||||
nativeBuildInputs = [ docutils ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ pygments requests requests-toolbelt setuptools ];
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
|
|
@ -49,7 +51,7 @@ python3Packages.buildPythonApplication rec {
|
|||
sed -e 's/^|build|//g' -i README.rst
|
||||
|
||||
toHtml() {
|
||||
${docutils}/bin/rst2html5 \
|
||||
rst2html5 \
|
||||
--strip-elements-with-class=no-web \
|
||||
--title=http \
|
||||
--no-generator \
|
||||
|
|
@ -63,7 +65,7 @@ python3Packages.buildPythonApplication rec {
|
|||
toHtml CHANGELOG.rst $docdir/html/CHANGELOG.html
|
||||
toHtml CONTRIBUTING.rst $docdir/html/CONTRIBUTING.html
|
||||
|
||||
${docutils}/bin/rst2man \
|
||||
rst2man \
|
||||
--strip-elements-with-class=no-web \
|
||||
--title=http \
|
||||
--no-generator \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, makeWrapper, buildEnv,
|
||||
breezy, coreutils, cvs, findutils, gawk, git, gnused, mercurial, nix, subversion
|
||||
{ lib, stdenv, makeWrapper, buildEnv
|
||||
, breezy, coreutils, cvs, findutils, gawk, git, gnused, mercurial, nix, subversion
|
||||
}:
|
||||
|
||||
let mkPrefetchScript = tool: src: deps:
|
||||
|
|
@ -22,7 +22,7 @@ let mkPrefetchScript = tool: src: deps:
|
|||
meta = with lib; {
|
||||
description = "Script used to obtain source hashes for fetch${tool}";
|
||||
maintainers = with maintainers; [ bennofs ];
|
||||
platforms = lib.platforms.unix;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
};
|
||||
in rec {
|
||||
|
|
@ -40,7 +40,7 @@ in rec {
|
|||
meta = with lib; {
|
||||
description = "Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes";
|
||||
maintainers = with maintainers; [ bennofs ];
|
||||
platforms = lib.platforms.unix;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
|
||||
let version = "4.4";
|
||||
in stdenv.mkDerivation {
|
||||
name = "hashdeep-${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hashdeep";
|
||||
version = "4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jessek";
|
||||
|
|
@ -18,6 +18,6 @@ in stdenv.mkDerivation {
|
|||
homepage = "https://github.com/jessek/hashdeep";
|
||||
license = licenses.gpl2;
|
||||
platforms = with platforms; linux ++ freebsd ++ openbsd;
|
||||
maintainers = [ lib.maintainers.karantan ];
|
||||
maintainers = [ maintainers.karantan ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0zkmwxyl1870ar6jr9h537vmqgkckqs9jd1yv6m4qqzdsmg5gdbq";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ perl coreutils ];
|
||||
# pod2man
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
propagatedBuildInputs = [ coreutils perl ];
|
||||
|
||||
postFixup = ''
|
||||
sed -e 's@/bin/rm@${coreutils}/bin/rm@' -i $out/bin/safe-rm
|
||||
|
|
|
|||
|
|
@ -24,6 +24,5 @@ python3Packages.buildPythonApplication rec {
|
|||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ dwarfmaster ];
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,10 +9,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0sxgg0ms5lhi4aqqvz1rj4s77yi9wymfm3l3gbjfd1qchy66kzrl";
|
||||
};
|
||||
|
||||
# for makeinfo
|
||||
nativeBuildInputs = [ texinfo ];
|
||||
|
||||
buildInputs = [ texinfo ];
|
||||
|
||||
checkInputs = [ which ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.gnu.org/software/wdiff/";
|
||||
description = "Comparing files on a word by word basis";
|
||||
|
|
|
|||
|
|
@ -3942,7 +3942,9 @@ in
|
|||
|
||||
wallutils = callPackage ../tools/graphics/wallutils { };
|
||||
|
||||
wrangler = callPackage ../development/tools/wrangler { };
|
||||
wrangler = callPackage ../development/tools/wrangler {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;
|
||||
};
|
||||
|
||||
wsl-open = callPackage ../tools/misc/wsl-open { };
|
||||
|
||||
|
|
@ -14183,7 +14185,7 @@ in
|
|||
|
||||
gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
|
||||
callPackage = newScope { libav = pkgs.ffmpeg; };
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL VideoToolbox;
|
||||
});
|
||||
|
||||
gusb = callPackage ../development/libraries/gusb { };
|
||||
|
|
|
|||
|
|
@ -2655,12 +2655,12 @@ in {
|
|||
|
||||
google-api-core = callPackage ../development/python-modules/google-api-core { };
|
||||
|
||||
google_api_python_client =
|
||||
let google_api_python_client = callPackage ../development/python-modules/google-api-python-client { };
|
||||
google-api-python-client =
|
||||
let google-api-python-client = callPackage ../development/python-modules/google-api-python-client { };
|
||||
in if isPy3k then
|
||||
google_api_python_client
|
||||
google-api-python-client
|
||||
else # Python 2.7 support was deprecated but is still needed by weboob and duplicity
|
||||
google_api_python_client.overridePythonAttrs (old: rec {
|
||||
google-api-python-client.overridePythonAttrs (old: rec {
|
||||
version = "1.7.6";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
|
|
@ -2668,7 +2668,7 @@ in {
|
|||
};
|
||||
});
|
||||
|
||||
googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { };
|
||||
googleapis-common-protos = callPackage ../development/python-modules/googleapis-common-protos { };
|
||||
|
||||
google-apputils = callPackage ../development/python-modules/google-apputils { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue