Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
3628af3b68
@ -105,13 +105,12 @@ in {
|
||||
description = ''
|
||||
Peers/devices which syncthing should communicate with.
|
||||
'';
|
||||
example = [
|
||||
{
|
||||
name = "bigbox";
|
||||
example = {
|
||||
bigbox = {
|
||||
id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU";
|
||||
addresses = [ "tcp://192.168.0.10:51820" ];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
type = types.attrsOf (types.submodule ({ config, ... }: {
|
||||
options = {
|
||||
|
||||
@ -169,6 +168,12 @@ in {
|
||||
description = ''
|
||||
folders which should be shared by syncthing.
|
||||
'';
|
||||
example = {
|
||||
"/home/user/sync" = {
|
||||
id = "syncme";
|
||||
devices = [ "bigbox" ];
|
||||
};
|
||||
};
|
||||
type = types.attrsOf (types.submodule ({ config, ... }: {
|
||||
options = {
|
||||
|
||||
|
||||
@ -37,7 +37,12 @@ let
|
||||
# opacity
|
||||
active-opacity = ${cfg.activeOpacity};
|
||||
inactive-opacity = ${cfg.inactiveOpacity};
|
||||
menu-opacity = ${cfg.menuOpacity};
|
||||
|
||||
wintypes:
|
||||
{
|
||||
popup_menu = { opacity = ${cfg.menuOpacity}; }
|
||||
dropdown_menu = { opacity = ${cfg.menuOpacity}; }
|
||||
};
|
||||
|
||||
opacity-rule = [
|
||||
${opacityRules}
|
||||
@ -45,7 +50,7 @@ let
|
||||
|
||||
# other options
|
||||
backend = ${toJSON cfg.backend};
|
||||
vsync = ${toJSON cfg.vSync};
|
||||
vsync = ${lib.boolToString cfg.vSync};
|
||||
refresh-rate = ${toString cfg.refreshRate};
|
||||
'' + cfg.extraOptions);
|
||||
|
||||
@ -189,15 +194,22 @@ in {
|
||||
};
|
||||
|
||||
vSync = mkOption {
|
||||
type = types.enum [
|
||||
"none" "drm" "opengl"
|
||||
"opengl-oml" "opengl-swc" "opengl-mswc"
|
||||
];
|
||||
default = "none";
|
||||
example = "opengl-swc";
|
||||
type = with types; either bool
|
||||
(enum [ "none" "drm" "opengl" "opengl-oml" "opengl-swc" "opengl-mswc" ]);
|
||||
default = false;
|
||||
apply = x:
|
||||
let
|
||||
res = x != "none";
|
||||
msg = "The type of services.compton.vSync has changed to bool:"
|
||||
+ " interpreting ${x} as ${lib.boolToString res}";
|
||||
in
|
||||
if isBool x then x
|
||||
else warn msg res;
|
||||
|
||||
description = ''
|
||||
Enable vertical synchronization using the specified method.
|
||||
See <literal>compton(1)</literal> man page an explanation.
|
||||
Enable vertical synchronization. Chooses the best method
|
||||
(drm, opengl, opengl-oml, opengl-swc, opengl-mswc) automatically.
|
||||
The bool value should be used, the others are just for backwards compatibility.
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -13,9 +13,9 @@ let
|
||||
sha256Hash = "0y4l9d1yrvv1csx6vl4jnqgqy96y44rl6p8hcxrnbvrg61iqnj30";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "3.5.0.14"; # "Android Studio 3.5 Beta 2"
|
||||
build = "191.5549111";
|
||||
sha256Hash = "1zy2x0m1nsx3yy64cp1jvgb9aqkribwm64mv50g9355sdz7qjhcf";
|
||||
version = "3.5.0.15"; # "Android Studio 3.5 Beta 3"
|
||||
build = "191.5585527";
|
||||
sha256Hash = "0b9yj3rf3nk8y9qfmf5kjh8rwn73v7ghym1bhz864r079h7lwr53";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "3.6.0.1"; # "Android Studio 3.6 Canary 1"
|
||||
|
||||
@ -380,12 +380,12 @@ in
|
||||
|
||||
webstorm = buildWebStorm rec {
|
||||
name = "webstorm-${version}";
|
||||
version = "2019.1.2"; /* updated by script */
|
||||
version = "2019.1.3"; /* updated by script */
|
||||
description = "Professional IDE for Web and JavaScript development";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
|
||||
sha256 = "198rbvhqjaix6qw36rlfafbv5aj0i6zr93adzgkilrn2l9v1jf07"; /* updated by script */
|
||||
sha256 = "1bhx2p40r15zvfr6q10bj5y8jaa3i9x9adchczp0irkd3w2jgvy3"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-webstorm";
|
||||
update-channel = "WebStorm RELEASE";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ mkDerivation, lib, stdenv, fetchurl, cmake, extra-cmake-modules
|
||||
{ mkDerivation, lib, stdenv, makeWrapper, fetchurl, cmake, extra-cmake-modules
|
||||
, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
|
||||
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
|
||||
, kio, kcrash
|
||||
@ -25,7 +25,7 @@ mkDerivation rec {
|
||||
sha256 = "0h2rplc76r82b8smk61zci1ijj9xkjmf20pdqa8fc2lz4zicjxh4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip ];
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
|
||||
@ -44,6 +44,12 @@ mkDerivation rec {
|
||||
"-DCMAKE_BUILD_TYPE=RelWithDebInfo"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
for i in $out/bin/*; do
|
||||
wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A free and open source painting application";
|
||||
homepage = https://krita.org/;
|
||||
|
||||
22
pkgs/applications/graphics/qview/default.nix
Normal file
22
pkgs/applications/graphics/qview/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{stdenv, fetchFromGitHub, qmake}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qview";
|
||||
version = "2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jurplel";
|
||||
repo = "qView";
|
||||
rev = version;
|
||||
sha256 = "1s29hz44rb5dwzq8d4i4bfg77dr0v3ywpvidpa6xzg7hnnv3mhi5";
|
||||
};
|
||||
nativeBuildInputs = [ qmake ];
|
||||
patchPhase = ''
|
||||
sed "s|/usr/|$out/|g" -i qView.pro
|
||||
'';
|
||||
meta = with stdenv.lib; {
|
||||
description = "Practical and minimal image viewer";
|
||||
homepage = "https://interversehq.com/qview/";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ acowley ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -4,7 +4,7 @@
|
||||
ki18n, xcb-util-cursor,
|
||||
kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins,
|
||||
knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
|
||||
qtx11extras, knewstuff
|
||||
qtx11extras, knewstuff, qttools
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -16,5 +16,9 @@ mkDerivation {
|
||||
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
|
||||
knewstuff
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace desktop/org.kde.spectacle.desktop \
|
||||
--replace "Exec=qdbus" "Exec=${lib.getBin qttools}/bin/qdbus"
|
||||
'';
|
||||
propagatedUserEnvPkgs = [ kipi-plugins libkipi ];
|
||||
}
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nnn-${version}";
|
||||
version = "2.4";
|
||||
pname = "nnn";
|
||||
version = "2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jarun";
|
||||
repo = "nnn";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0y55h5pxd20qw2ajhz8fsk45aynx0xzgr9kfr545hyhmfkg2nc49";
|
||||
sha256 = "0hvb0q6jg2nmvb40q43jj7v45afkjgcq6q9ldmmrh5558d0n65cw";
|
||||
};
|
||||
|
||||
configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf);
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
, google_talk_plugin, fribid, gnome3/*.gnome-shell*/
|
||||
, esteidfirefoxplugin
|
||||
, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
|
||||
, tridactyl-native
|
||||
, udev
|
||||
, kerberos
|
||||
}:
|
||||
@ -67,6 +68,7 @@ let
|
||||
([ ]
|
||||
++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass)
|
||||
++ lib.optional (cfg.enableBukubrow or false) bukubrow
|
||||
++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native
|
||||
++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell
|
||||
++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
|
||||
++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ callPackage, stdenv }:
|
||||
|
||||
let
|
||||
stableVersion = "2.1.18";
|
||||
stableVersion = "2.1.19";
|
||||
previewVersion = "2.2.0b1";
|
||||
addVersion = args:
|
||||
let version = if args.stable then stableVersion else previewVersion;
|
||||
@ -9,8 +9,8 @@ let
|
||||
in args // { inherit version branch; };
|
||||
mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
|
||||
mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
|
||||
guiSrcHash = "00hcri32vakz17ywbqd9lycxdai490ds0g1v8znm75ddvszfbv7i";
|
||||
serverSrcHash = "0f28f5f4dsr8h4q592dh9i1z0gp836gdgm8clwrkb7i01df0rrlf";
|
||||
guiSrcHash = "0bn0qry0djw17zwa16cc69273crnfzppik07f9w20hhr8kjiyvnx";
|
||||
serverSrcHash = "1af6pnmr24syx23pqvwchgwy74263k3ccrv7barxi71wsskjlw5a";
|
||||
in {
|
||||
guiStable = mkGui {
|
||||
stable = true;
|
||||
|
||||
@ -22,10 +22,10 @@ let
|
||||
doCheck = false;
|
||||
});
|
||||
aiohttp-cors = super.aiohttp-cors.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.5.3";
|
||||
version = "0.6.0";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in";
|
||||
sha256 = "1r0mb4dw0dc1lpi54dk5vxqs06nyhvagp76lyrvk7rd94z5mjkd4";
|
||||
};
|
||||
propagatedBuildInputs = with self; [ aiohttp ]
|
||||
++ stdenv.lib.optional (pythonOlder "3.5") typing;
|
||||
@ -45,8 +45,6 @@ in python.pkgs.buildPythonPackage {
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# "typing" is only required for Python 3.4 and breaks Python 3.7:
|
||||
sed -iE "s/.*typing.*//" requirements.txt
|
||||
# Only 2.x is problematic:
|
||||
sed -iE "s/prompt-toolkit==1.0.15/prompt-toolkit<2.0.0/" requirements.txt
|
||||
'';
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }:
|
||||
|
||||
let
|
||||
version = "1.1.4-1";
|
||||
version = "1.1.5-1";
|
||||
|
||||
description = ''
|
||||
An application that runs on your computer in the background and seamlessly encrypts
|
||||
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
|
||||
sha256 = "16w3l81j10syl2pis08sl752yapbgjy531qs0n1ghmsx2d12n7kl";
|
||||
sha256 = "1y5mphrs60zd6km9z64vskk70q9zzw4g6js7qvgl572wv81w2l75";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@ -75,7 +75,7 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://www.protonmail.com/bridge;
|
||||
homepage = "https://www.protonmail.com/bridge";
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ lightdiscord ];
|
||||
|
||||
214
pkgs/applications/networking/remote/citrix-workspace/default.nix
Normal file
214
pkgs/applications/networking/remote/citrix-workspace/default.nix
Normal file
@ -0,0 +1,214 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, requireFile
|
||||
, makeWrapper
|
||||
, libredirect
|
||||
, busybox
|
||||
, file
|
||||
, makeDesktopItem
|
||||
, tzdata
|
||||
, cacert
|
||||
, glib
|
||||
, gtk2
|
||||
, atk
|
||||
, gdk_pixbuf
|
||||
, cairo
|
||||
, pango
|
||||
, gnome3
|
||||
, xorg
|
||||
, libpng12
|
||||
, freetype
|
||||
, fontconfig
|
||||
, gtk_engines
|
||||
, alsaLib
|
||||
, libidn
|
||||
, zlib
|
||||
, version ? "19.3.0"
|
||||
}:
|
||||
|
||||
let
|
||||
# In 56e1bdc7f9c (libidn: 1.34 -> 1.35), libidn.so.11 became libidn.so.12.
|
||||
# Citrix looks for the former so we build version 1.34 to please the binary
|
||||
libidn_134 = libidn.overrideDerivation (_: rec {
|
||||
name = "libidn-1.34";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libidn/${name}.tar.gz";
|
||||
sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p";
|
||||
};
|
||||
});
|
||||
|
||||
versionInfo = let
|
||||
supportedVersions = {
|
||||
"19.3.0" = {
|
||||
major = "19";
|
||||
minor = "3";
|
||||
patch = "0";
|
||||
x64hash = "0mhpp29ca3dw9hx72i0qawdq35wcc7qzgxwzlx4aicwnm1gbil5c";
|
||||
x86hash = "1hxgj5lk5ghbpssbqjd404qr84gls967vwrh8ww5hg3pn86kyf8w";
|
||||
x64suffix = "5";
|
||||
x86suffix = "5";
|
||||
homepage = https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html;
|
||||
};
|
||||
};
|
||||
|
||||
# Copied this file largely from the citrix-receiver package
|
||||
# Leaving this here even though there are no deprecations yet
|
||||
# for ease of future maintenance
|
||||
deprecatedVersions = let
|
||||
versions = [ ];
|
||||
in
|
||||
lib.listToAttrs
|
||||
(lib.flip map versions
|
||||
(v: lib.nameValuePair v (throw "Unsupported citrix_workspace version: ${v}")));
|
||||
in
|
||||
deprecatedVersions // supportedVersions;
|
||||
|
||||
citrixWorkspaceForVersion = { major, minor, patch, x64hash, x86hash, x64suffix, x86suffix, homepage }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "citrix-workspace-${version}";
|
||||
version = "${major}.${minor}.${patch}";
|
||||
inherit homepage;
|
||||
|
||||
prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
|
||||
|
||||
src = requireFile rec {
|
||||
name = if stdenv.is64bit then "${prefixWithBitness}-${version}.${x64suffix}.tar.gz" else "${prefixWithBitness}-${version}.${x86suffix}.tar.gz";
|
||||
sha256 = if stdenv.is64bit then x64hash else x86hash;
|
||||
message = ''
|
||||
In order to use Citrix Workspace, you need to comply with the Citrix EULA and download
|
||||
the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from:
|
||||
|
||||
${homepage}
|
||||
|
||||
(if you do not find version ${version} there, try at
|
||||
https://www.citrix.com/downloads/workspace-app/
|
||||
|
||||
Once you have downloaded the file, please use the following command and re-run the
|
||||
installation:
|
||||
|
||||
nix-prefetch-url file://\$PWD/${name}
|
||||
'';
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
busybox
|
||||
file
|
||||
gtk2
|
||||
gdk_pixbuf
|
||||
];
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath [
|
||||
glib
|
||||
gtk2
|
||||
atk
|
||||
gdk_pixbuf
|
||||
cairo
|
||||
pango
|
||||
gnome3.dconf
|
||||
xorg.libX11
|
||||
xorg.libXext
|
||||
xorg.libXrender
|
||||
xorg.libXinerama
|
||||
xorg.libXfixes
|
||||
libpng12
|
||||
libidn_134
|
||||
zlib
|
||||
gtk_engines
|
||||
freetype
|
||||
fontconfig
|
||||
alsaLib
|
||||
stdenv.cc.cc # Fixes: Can not load [..]/opt/citrix-icaclient/lib/ctxh264_fb.so:(null)
|
||||
];
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "wfica";
|
||||
desktopName = "Citrix Workspace";
|
||||
genericName = "Citrix Workspace";
|
||||
exec = "wfica";
|
||||
icon = "wfica";
|
||||
comment = "Connect to remote Citrix server";
|
||||
categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
|
||||
mimeType = "application/x-ica";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
export ICAInstDir="$out/opt/citrix-icaclient"
|
||||
|
||||
sed -i \
|
||||
-e 's,^main_install_menu$,install_ICA_client,g' \
|
||||
-e 's,^integrate_ICA_client(),alias integrate_ICA_client=true\nintegrate_ICA_client_old(),g' \
|
||||
-e 's,^ANSWER=""$,ANSWER="$INSTALLER_YES",' \
|
||||
-e 's,/bin/true,true,g' \
|
||||
./${prefixWithBitness}/hinst
|
||||
|
||||
# Run the installer...
|
||||
bash ./${prefixWithBitness}/hinst CDROM "`pwd`"
|
||||
|
||||
echo "Deleting broken links..."
|
||||
for link in `find $ICAInstDir -type l `
|
||||
do
|
||||
[ -f "$link" ] || rm -v "$link"
|
||||
done
|
||||
|
||||
echo "Expanding certificates..."
|
||||
# As explained in https://wiki.archlinux.org/index.php/Citrix#Security_Certificates
|
||||
pushd "$ICAInstDir/keystore/cacerts"
|
||||
awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "cert." c ".pem"}' < ${cacert}/etc/ssl/certs/ca-bundle.crt
|
||||
popd
|
||||
|
||||
echo "Patching executables..."
|
||||
find $ICAInstDir -type f -exec file {} \; |
|
||||
grep 'ELF.*executable' |
|
||||
cut -f 1 -d : |
|
||||
grep -vi '\(.dll\|.so\)$' | # added as a workaround to https://github.com/NixOS/nixpkgs/issues/41729
|
||||
while read f
|
||||
do
|
||||
echo "Patching ELF intrepreter and rpath for $f"
|
||||
chmod u+w "$f"
|
||||
patchelf \
|
||||
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
|
||||
--set-rpath "$ICAInstDir:$libPath" "$f"
|
||||
done
|
||||
|
||||
echo "Wrapping wfica..."
|
||||
mkdir "$out/bin"
|
||||
|
||||
makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \
|
||||
--add-flags "-icaroot $ICAInstDir" \
|
||||
--set ICAROOT "$ICAInstDir" \
|
||||
--set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-extra}/lib/gtk-2.0" \
|
||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
|
||||
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
|
||||
--set LD_LIBRARY_PATH "$libPath" \
|
||||
--set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone"
|
||||
|
||||
echo "We arbitrarily set the timezone to UTC. No known consequences at this point."
|
||||
echo UTC > "$ICAInstDir/timezone"
|
||||
|
||||
echo "Installing desktop item..."
|
||||
mkdir -p $out/share/applications
|
||||
cp ${desktopItem}/share/applications/* $out/share/applications
|
||||
|
||||
# We introduce a dependency on the source file so that it need not be redownloaded everytime
|
||||
echo $src >> "$out/share/workspace_dependencies.pin"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
inherit homepage;
|
||||
description = "Citrix Workspace";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
|
||||
in citrixWorkspaceForVersion (lib.getAttr version versionInfo)
|
||||
@ -0,0 +1,19 @@
|
||||
{ citrix_workspace, extraCerts ? [], symlinkJoin }:
|
||||
|
||||
let
|
||||
|
||||
mkCertCopy = certPath:
|
||||
"cp ${certPath} $out/opt/citrix-icaclient/keystore/cacerts/";
|
||||
|
||||
in
|
||||
|
||||
if builtins.length extraCerts == 0 then citrix_workspace else symlinkJoin {
|
||||
name = "citrix-with-extra-certs-${citrix_workspace.version}";
|
||||
paths = [ citrix_workspace ];
|
||||
|
||||
postBuild = ''
|
||||
${builtins.concatStringsSep "\n" (map mkCertCopy extraCerts)}
|
||||
|
||||
sed -i -E "s,-icaroot (.+citrix-icaclient),-icaroot $out/opt/citrix-icaclient," $out/bin/wfica
|
||||
'';
|
||||
}
|
||||
@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
variant = if withQt then "qt" else "cli";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
|
||||
sha256 = "13605bpnnbqsdr8ybqnscbz9g422zmyymn4q5aci28vc1wylr1l6";
|
||||
sha256 = "0fz5lbyiw4a27fqc4ndi1w20bpcb6wi9k7vjv29l9fhd99kca7ky";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qalculate-gtk";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-gtk";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ayhzsxf2qgs4j1j0xl942ysfy3zl2z1fp7l2s5nh5awr41mhnqc";
|
||||
sha256 = "1yhhfqcxi1b7dfrl8qh16l9iwgzvw1p0hhl7nnjpxhdwxz880sv0";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -3,110 +3,67 @@
|
||||
, xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev
|
||||
, dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage
|
||||
, libXinerama, libXrandr, libXrender, libXext, xwininfo, libxdg_basedir }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "compton";
|
||||
version = "6.2";
|
||||
|
||||
let
|
||||
common = source: stdenv.mkDerivation (source // rec {
|
||||
name = "${source.pname}-${source.version}";
|
||||
COMPTON_VERSION = "v${version}";
|
||||
|
||||
nativeBuildInputs = (source.nativeBuildInputs or []) ++ [
|
||||
pkgconfig
|
||||
asciidoc
|
||||
docbook_xml_dtd_45
|
||||
docbook_xsl
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/compton-trans \
|
||||
--prefix PATH : ${lib.makeBinPath [ xwininfo ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fork of XCompMgr, a sample compositing manager for X servers";
|
||||
longDescription = ''
|
||||
A fork of XCompMgr, which is a sample compositing manager for X
|
||||
servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
|
||||
extensions. It enables basic eye-candy effects. This fork adds
|
||||
additional features, such as additional effects, and a fork at a
|
||||
well-defined and proper place.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ertes enzime twey ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
});
|
||||
|
||||
stableSource = rec {
|
||||
pname = "compton";
|
||||
version = "0.1_beta2.5";
|
||||
|
||||
COMPTON_VERSION = version;
|
||||
|
||||
buildInputs = [
|
||||
dbus libX11 libXcomposite libXdamage libXrender libXrandr libXext
|
||||
libXinerama libdrm pcre libxml2 libxslt libconfig libGL
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chjj";
|
||||
repo = "compton";
|
||||
rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8";
|
||||
sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/chjj/compton/;
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "yshui";
|
||||
repo = "compton";
|
||||
rev = COMPTON_VERSION;
|
||||
sha256 = "03fi9q8zw2qrwpkmy1bnavgfh91ci9in5fdi17g4s5s0n2l7yil7";
|
||||
};
|
||||
|
||||
gitSource = rec {
|
||||
pname = "compton-git";
|
||||
version = "5.1-rc2";
|
||||
nativeBuildInputs = [
|
||||
meson ninja
|
||||
pkgconfig
|
||||
asciidoc
|
||||
docbook_xml_dtd_45
|
||||
docbook_xsl
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
COMPTON_VERSION = "v${version}";
|
||||
buildInputs = [
|
||||
dbus libX11 libXext
|
||||
xorgproto
|
||||
libXinerama libdrm pcre libxml2 libxslt libconfig libGL
|
||||
libxcb xcbutilrenderutil xcbutilimage
|
||||
pixman libev
|
||||
libxdg_basedir
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yshui";
|
||||
repo = "compton";
|
||||
rev = COMPTON_VERSION;
|
||||
sha256 = "1qpy76kkhz8gfby842ry7lanvxkjxh4ckclkcjk4xi2wsmbhyp08";
|
||||
};
|
||||
mesonFlags = [
|
||||
"-Dbuild_docs=true"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dbus libX11 libXext
|
||||
xorgproto
|
||||
libXinerama libdrm pcre libxml2 libxslt libconfig libGL
|
||||
# Removed:
|
||||
# libXcomposite libXdamage libXrender libXrandr
|
||||
preBuild = ''
|
||||
git() { echo "v${version}"; }
|
||||
export -f git
|
||||
'';
|
||||
|
||||
# New:
|
||||
libxcb xcbutilrenderutil xcbutilimage
|
||||
pixman libev
|
||||
libxdg_basedir
|
||||
];
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
preBuild = ''
|
||||
git() { echo "v${version}"; }
|
||||
export -f git
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/compton-trans \
|
||||
--prefix PATH : ${lib.makeBinPath [ xwininfo ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fork of XCompMgr, a sample compositing manager for X servers";
|
||||
longDescription = ''
|
||||
A fork of XCompMgr, which is a sample compositing manager for X
|
||||
servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
|
||||
extensions. It enables basic eye-candy effects. This fork adds
|
||||
additional features, such as additional effects, and a fork at a
|
||||
well-defined and proper place.
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dvsync_drm=true"
|
||||
"-Dnew_backends=true"
|
||||
"-Dbuild_docs=true"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/yshui/compton/;
|
||||
};
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/yshui/compton";
|
||||
maintainers = with maintainers; [ ertes enzime twey ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
in {
|
||||
compton = common stableSource;
|
||||
compton-git = common gitSource;
|
||||
}
|
||||
|
||||
@ -24,6 +24,9 @@ rec {
|
||||
}) ''
|
||||
echo "#! $interpreter" > $out
|
||||
cat "$contentPath" >> $out
|
||||
${optionalString (check != "") ''
|
||||
${check} $out
|
||||
''}
|
||||
chmod +x $out
|
||||
${optionalString (types.path.check nameOrPath) ''
|
||||
mv $out tmp
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libqalculate";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "libqalculate";
|
||||
rev = "v${version}";
|
||||
sha256 = "1r0l0aik3fiyskpdgw93gxqgw109g6pa27y983rirhl6rricp3wf";
|
||||
sha256 = "0f82jss3kjxsk8znvrg1vfh756nnc15sbzr34ww1dvvrxipi7sns";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
@ -3,24 +3,25 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "liburing-${version}";
|
||||
version = "1.0.0pre118_${builtins.substring 0 7 src.rev}";
|
||||
version = "1.0.0pre131_${builtins.substring 0 7 src.rev}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "http://git.kernel.dk/liburing";
|
||||
rev = "2e719820d47cdb48308265f95547d2c9458bbfe7";
|
||||
sha256 = "0sm2k5f15ad9b9wh928kmbb399f5f7frfh96bi865pklavpcckf5";
|
||||
rev = "b422aa11cc58e9786fa1e343aa2bfa6d7a394445";
|
||||
sha256 = "0afm0kfhi025m5r0bri8if59m85rwg6kxlkx075lbwg9pw1n75w0";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
outputs = [ "out" "lib" "dev" "man" ];
|
||||
|
||||
installFlags =
|
||||
[ "prefix=$(out)"
|
||||
"includedir=$(dev)/include"
|
||||
"libdir=$(lib)/lib"
|
||||
"mandir=$(man)/share/man"
|
||||
];
|
||||
configurePhase = ''
|
||||
./configure \
|
||||
--prefix=$out \
|
||||
--includedir=$dev/include \
|
||||
--libdir=$lib/lib \
|
||||
--mandir=$man/share/man \
|
||||
'';
|
||||
|
||||
# Copy the examples into $out.
|
||||
postInstall = ''
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
# Select a specific optimization target (other than the default)
|
||||
# See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt
|
||||
, target ? null
|
||||
, enableStatic ? false
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
@ -124,7 +125,7 @@ stdenv.mkDerivation rec {
|
||||
PREFIX = placeholder "out";
|
||||
NUM_THREADS = 64;
|
||||
INTERFACE64 = blas64;
|
||||
NO_STATIC = true;
|
||||
NO_STATIC = !enableStatic;
|
||||
CROSS = stdenv.hostPlatform != stdenv.buildPlatform;
|
||||
HOSTCC = "cc";
|
||||
# Makefile.system only checks defined status
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, requireFile, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon
|
||||
{ stdenv, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon
|
||||
, xdg_utils
|
||||
# For glewinfo
|
||||
, libXmu, libXi, libXext }:
|
||||
@ -10,10 +10,10 @@ let
|
||||
libPath = "${stdenv.lib.makeLibraryPath packages}";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "genymotion-${version}";
|
||||
pname = "genymotion";
|
||||
version = "2.8.0";
|
||||
src = requireFile {
|
||||
url = https://www.genymotion.com/download/;
|
||||
src = fetchurl {
|
||||
url = "https://dl.genymotion.com/releases/genymotion-${version}/genymotion-${version}-linux_x64.bin";
|
||||
name = "genymotion-${version}-linux_x64.bin";
|
||||
sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk";
|
||||
};
|
||||
@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p phony-home $out/share/applications
|
||||
export HOME=$TMP/phony-home
|
||||
|
||||
mkdir ${name}
|
||||
echo "y" | sh $src -d ${name}
|
||||
sourceRoot=${name}
|
||||
mkdir ${pname}
|
||||
echo "y" | sh $src -d ${pname}
|
||||
sourceRoot=${pname}
|
||||
|
||||
substitute phony-home/.local/share/applications/genymobile-genymotion.desktop \
|
||||
$out/share/applications/genymobile-genymotion.desktop --replace "$TMP/${name}" "$out/libexec"
|
||||
$out/share/applications/genymobile-genymotion.desktop --replace "$TMP/${pname}" "$out/libexec"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,28 +1,19 @@
|
||||
{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild }:
|
||||
{ lib, fetchurl, buildDunePackage }:
|
||||
|
||||
if !stdenv.lib.versionAtLeast ocaml.version "4.03"
|
||||
then throw "earley is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.2";
|
||||
name = "ocaml${ocaml.version}-earley-${version}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rlepigre";
|
||||
repo = "ocaml-earley";
|
||||
rev = "ocaml-earley_${version}";
|
||||
sha256 = "110njakmx1hyq42hyr6gx6qhaxly860whfhd6r0vks4yfp68qvcx";
|
||||
buildDunePackage rec {
|
||||
version = "2.0.0";
|
||||
pname = "earley";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rlepigre/ocaml-earley/releases/download/${version}/earley-${version}.tbz";
|
||||
sha256 = "1kjr0wh3lji7f493kf48rphxnlv3sygj5a8rmx9z3xkpbd7aqyyw";
|
||||
};
|
||||
|
||||
buildInputs = [ which ocaml findlib ocamlbuild ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
minimumOCamlVersion = "4.03";
|
||||
|
||||
meta = {
|
||||
description = "Parser combinators based on Earley Algorithm";
|
||||
license = stdenv.lib.licenses.cecill-b;
|
||||
maintainers = [ stdenv.lib.maintainers.vbgl ];
|
||||
inherit (ocaml.meta) platforms;
|
||||
inherit (src.meta) homepage;
|
||||
license = lib.licenses.cecill-b;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
homepage = "https://github.com/rlepigre/ocaml-earley";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild, earley }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.2";
|
||||
name = "ocaml${ocaml.version}-earley_ocaml-${version}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rlepigre";
|
||||
repo = "ocaml-earley-ocaml";
|
||||
rev = "ocaml-earley-ocaml_${version}";
|
||||
sha256 = "0f8kr49r2xfs7cbzps4r9i92ckhwssaiydam846jrky3z5djn2jc";
|
||||
};
|
||||
|
||||
buildInputs = [ which ocaml findlib ocamlbuild ];
|
||||
|
||||
propagatedBuildInputs = [ earley ];
|
||||
|
||||
preBuild = "make";
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
installFlags = [ "BINDIR=$(out)/bin" ];
|
||||
|
||||
meta = {
|
||||
description = "Extensible OCaml parser to be used with Earley";
|
||||
license = stdenv.lib.licenses.cecill-b;
|
||||
maintainers = [ stdenv.lib.maintainers.vbgl ];
|
||||
inherit (ocaml.meta) platforms;
|
||||
inherit (src.meta) homepage;
|
||||
};
|
||||
}
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3";
|
||||
version = "1.9.96"; # N.B: if you change this, change botocore too
|
||||
version = "1.9.152"; # N.B: if you change this, change botocore too
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c103241394d396ee08548b03d5d1f0f89a7ad1dfa7ccca88a47131f329cca093";
|
||||
sha256 = "0qspp97rddshjfqmmnqbvrszr66wq0ag05j8lcfsb9rj6ymz5s5s";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore";
|
||||
version = "1.12.96"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
version = "1.12.152"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "55c1594041e6716847d5a8b38181e3cc44e245edbf4598ae2b99e3040073b2cf";
|
||||
sha256 = "1pj9k3x82f9cgr0flg0m5n6fh8rkxy3c0z1qgx5nqvyidswn793r";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -30,7 +30,8 @@ buildPythonPackage rec {
|
||||
# Python 3 works but has a broken import test that I couldn't
|
||||
# figure out.
|
||||
doCheck = !isPy3k;
|
||||
buildInputs = [ pkgs.cmake pkgs.libdynd.dev cython ];
|
||||
nativeBuildInputs = [ pkgs.cmake ];
|
||||
buildInputs = [ pkgs.libdynd.dev cython ];
|
||||
propagatedBuildInputs = [ numpy pkgs.libdynd ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,5 +1,14 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
, libGLU_combined, xorg, freetype, fontconfig, future}:
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, libGLU_combined
|
||||
, xorg
|
||||
, future
|
||||
, pytest
|
||||
, glibc
|
||||
, gtk2-x11
|
||||
, gdk_pixbuf
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.3.2";
|
||||
@ -10,15 +19,50 @@ buildPythonPackage rec {
|
||||
sha256 = "b00570e7cdf6971af8953b6ece50d83d13272afa5d1f1197c58c0f478dd17743";
|
||||
};
|
||||
|
||||
# find_library doesn't reliably work with nix (https://github.com/NixOS/nixpkgs/issues/7307).
|
||||
# Even naively searching `LD_LIBRARY_PATH` won't work since `libc.so` is a linker script and
|
||||
# ctypes.cdll.LoadLibrary cannot deal with those. Therefore, just hardcode the paths to the
|
||||
# necessary libraries.
|
||||
postPatch = let
|
||||
libs = [ libGLU_combined xorg.libX11 freetype fontconfig ];
|
||||
paths = builtins.concatStringsSep "," (map (l: "\"${l}/lib\"") libs);
|
||||
in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py";
|
||||
|
||||
doCheck = false;
|
||||
ext = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
in ''
|
||||
cat > pyglet/lib.py <<EOF
|
||||
import ctypes
|
||||
def load_library(*names, **kwargs):
|
||||
for name in names:
|
||||
path = None
|
||||
if name == 'GL':
|
||||
path = '${libGLU_combined}/lib/libGL${ext}'
|
||||
elif name == 'GLU':
|
||||
path = '${libGLU_combined}/lib/libGLU${ext}'
|
||||
elif name == 'c':
|
||||
path = '${glibc}/lib/libc${ext}.6'
|
||||
elif name == 'X11':
|
||||
path = '${xorg.libX11}/lib/libX11${ext}'
|
||||
elif name == 'gdk-x11-2.0':
|
||||
path = '${gtk2-x11}/lib/libgdk-x11-2.0${ext}'
|
||||
elif name == 'gdk_pixbuf-2.0':
|
||||
path = '${gdk_pixbuf}/lib/libgdk_pixbuf-2.0${ext}'
|
||||
if path is not None:
|
||||
return ctypes.cdll.LoadLibrary(path)
|
||||
raise Exception("Could not load library {}".format(names))
|
||||
EOF
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ future ];
|
||||
|
||||
# needs an X server. Keep an eye on
|
||||
# https://bitbucket.org/pyglet/pyglet/issues/219/egl-support-headless-rendering
|
||||
doCheck = false;
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
py.test tests/unit tests/integration
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://www.pyglet.org/";
|
||||
description = "A cross-platform windowing and multimedia library";
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy3k
|
||||
, python
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
@ -23,6 +24,9 @@ buildPythonPackage rec {
|
||||
sha256 = "1s7rp5bbiglnrfm33wf7x7kqj0ks3b21bqyz18c5g6vx39rxbrmh";
|
||||
};
|
||||
|
||||
# fails to find boost_python for some reason
|
||||
disabled = !isPy3k;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gym
|
||||
];
|
||||
|
||||
@ -4,7 +4,7 @@ buildGoPackage rec {
|
||||
name = "doctl-${version}";
|
||||
version = "${major}.${minor}.${patch}";
|
||||
major = "1";
|
||||
minor = "16";
|
||||
minor = "18";
|
||||
patch = "0";
|
||||
goPackagePath = "github.com/digitalocean/doctl";
|
||||
|
||||
@ -21,7 +21,7 @@ buildGoPackage rec {
|
||||
owner = "digitalocean";
|
||||
repo = "doctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "041fqanlk8px4nhxaxxs27gbqh8571szxfrcp0zmihdbr4nc70dv";
|
||||
sha256 = "1p43q1iyjj597gr47hn589fv7n26mny9niq7yb9hlmslkplsrb0a";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-make";
|
||||
version = "0.19.2";
|
||||
version = "0.19.3";
|
||||
|
||||
src =
|
||||
let
|
||||
@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "sagiegurari";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "175cflcm9k81fpp2pxz4hcaf8v3i7jqc9gcr4flnsqxjrh22vymp";
|
||||
sha256 = "11mkfwvzsr86w9675zpq8gcq5avsfvwffca26h6gkc7ahqcsx3ac";
|
||||
};
|
||||
cargo-lock = fetchurl {
|
||||
url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/f1e6360acfbe5ae573f8f31a82a5c881a6f0ed68/cargo-make-Cargo.lock";
|
||||
sha256 = "004dx4gyby5smpvawqv946mambcg59zq6n8h89hz61mxkh7frmh4";
|
||||
url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/3592410d14443cc6be675553a9c228401114fa5f/cargo-make-Cargo.lock";
|
||||
sha256 = "0m8m2pn8y7n1js1kkva4lxahz5j4d73lj7l45h8dd30lw2w4n3hg";
|
||||
};
|
||||
in
|
||||
runCommand "cargo-make-src" {} ''
|
||||
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
cargoSha256 = "1hmfg3x9p5a2vz2r3v8m5wgyabbybl5lcjvi930b9wi5cnfm756g";
|
||||
cargoSha256 = "00yvx87s8vngb97ldq2amdhdv3nn38liys7nilay73phx0xybx4p";
|
||||
|
||||
# Some tests fail because they need network access.
|
||||
# However, Travis ensures a proper build.
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv, makeWrapper, fetchurl, dpkg
|
||||
, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
|
||||
, gdk_pixbuf, glib, gnome2, nspr, nss, gtk3, gtk2, at-spi2-atk
|
||||
, gdk_pixbuf, glib, gnome2, nspr, nss, gtk3, gtk2, at-spi2-atk
|
||||
, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook
|
||||
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
|
||||
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2
|
||||
, libudev0-shim, glibc, curl, openssl, autoPatchelfHook
|
||||
@ -17,17 +18,18 @@ let
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "insomnia-${version}";
|
||||
version = "6.3.2";
|
||||
version = "6.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
|
||||
sha256 = "15zf5nmsmz3ajb4xmhm3gynn36qp0ark0gah8qd0hqq76n9jmjnp";
|
||||
sha256 = "0km7anw5xpcfr6j7pwqhv26pk7nxv1jywqlz0lpvgj6w85aafcm3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
makeWrapper
|
||||
gobject-introspection wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -46,6 +48,7 @@ in stdenv.mkDerivation rec {
|
||||
gnome2.pango
|
||||
gtk2
|
||||
gtk3
|
||||
gsettings-desktop-schemas
|
||||
libX11
|
||||
libXScrnSaver
|
||||
libXcomposite
|
||||
|
||||
@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0nqyhznnnvpgfa6rfv8rapjfpw99b67n97jfqp9r3hpib1b3ja6p";
|
||||
})
|
||||
];
|
||||
makeFlags = '' PREFIX="$(out)" '';
|
||||
makeFlags = "PREFIX=${placeholder "out"}";
|
||||
dontUseSconsInstall = true;
|
||||
meta = {
|
||||
inherit (s) version;
|
||||
description = ''A puzzle game with mechanics similar to Lemmings'';
|
||||
|
||||
@ -6,7 +6,7 @@ let
|
||||
, platform
|
||||
, extraMakeFlags ? []
|
||||
, extraMeta ? {}
|
||||
, version ? "2.0"
|
||||
, version ? "2.1"
|
||||
, ... } @ args:
|
||||
stdenv.mkDerivation (rec {
|
||||
|
||||
@ -17,7 +17,7 @@ let
|
||||
owner = "ARM-software";
|
||||
repo = "arm-trusted-firmware";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "087pkwa6slxff0aiz3v42gww007nww97bl1p96fvvs7rr1y14gjx";
|
||||
sha256 = "1gy5qskrjy8n3kxdcm1dx8b45l5b75n0pm8pq80wl6xic1ycy24r";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
@ -57,15 +57,7 @@ in rec {
|
||||
inherit buildArmTrustedFirmware;
|
||||
|
||||
armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec {
|
||||
version = "1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "apritzel";
|
||||
repo = "arm-trusted-firmware";
|
||||
# Branch: `allwinner`
|
||||
rev = "91f2402d941036a0db092d5375d0535c270b9121";
|
||||
sha256 = "0lbipkxb01w97r6ah8wdbwxir3013rp249fcqhlzh2gjwhp5l1ys";
|
||||
};
|
||||
platform = "sun50iw1p1";
|
||||
platform = "sun50i_a64";
|
||||
extraMeta.platforms = ["aarch64-linux"];
|
||||
filesToInstall = ["build/${platform}/release/bl31.bin"];
|
||||
};
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
buildUBoot = { version ? "2018.09"
|
||||
buildUBoot = { version ? "2019.04"
|
||||
, filesToInstall
|
||||
, installDir ? "$out"
|
||||
, defconfig
|
||||
@ -20,7 +20,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
|
||||
sha256 = "0s122kyz1svvs2yjzj4j9qravl3ra4vn0fjqgski7rlczqyg56w3";
|
||||
sha256 = "1vwv4bgbl7fjcm073zrphn17hnz5h5h778f88ivdsgbb2lnpgdvn";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -195,6 +195,20 @@ in rec {
|
||||
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
|
||||
};
|
||||
|
||||
ubootPine64LTS = buildUBoot rec {
|
||||
defconfig = "pine64-lts_defconfig";
|
||||
extraMeta.platforms = ["aarch64-linux"];
|
||||
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
|
||||
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
|
||||
};
|
||||
|
||||
ubootPinebook = buildUBoot rec {
|
||||
defconfig = "pinebook_defconfig";
|
||||
extraMeta.platforms = ["aarch64-linux"];
|
||||
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
|
||||
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
|
||||
};
|
||||
|
||||
ubootQemuAarch64 = buildUBoot rec {
|
||||
defconfig = "qemu_arm64_defconfig";
|
||||
extraMeta.platforms = ["aarch64-linux"];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.2-rc1";
|
||||
modDirVersion = "5.2.0-rc1";
|
||||
version = "5.2-rc2";
|
||||
modDirVersion = "5.2.0-rc2";
|
||||
extraMeta.branch = "5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
|
||||
sha256 = "169gjmciijgmwwfyz3n7pvf2x18pmfvgdk73s8jlx30ggwzgac1l";
|
||||
sha256 = "0fd6z6zx9a3ax5jyvxm7gmfzain26la5gf18fccxip7bfn72bj4f";
|
||||
};
|
||||
|
||||
# Should the testing kernels ever be built on Hydra?
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sysdig-${version}";
|
||||
version = "0.25";
|
||||
version = "0.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "draios";
|
||||
repo = "sysdig";
|
||||
rev = version;
|
||||
sha256 = "1591jz4fmgk5r3q410h771nzhv6wfqpnr7pn34kpc5rl0vhky37m";
|
||||
sha256 = "0mvm14s5lyxddf6fcfwrv7vd8r8vfw9z4447jl5mcvji2rnyywqz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl")
|
||||
|
||||
export INSTALL_MOD_PATH="$out"
|
||||
'' + optionalString (kernel != null) ''
|
||||
export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
|
||||
35
pkgs/servers/elasticmq-server-bin/default.nix
Normal file
35
pkgs/servers/elasticmq-server-bin/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ stdenv, fetchurl, jdk, jre, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elasticmq-server";
|
||||
version = "0.14.6";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${name}.jar";
|
||||
sha256 = "1cp2pmkc6gx7gr6109jlcphlky5rr6s1wj528r6hyhzdc01sjhhz";
|
||||
};
|
||||
|
||||
# don't do anything?
|
||||
unpackPhase = "${jdk}/bin/jar xf $src favicon.png";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/elasticmq-server
|
||||
|
||||
cp $src $out/share/elasticmq-server/elasticmq-server.jar
|
||||
|
||||
# TODO: how to add extraArgs? current workaround is to use JAVA_TOOL_OPTIONS environment to specify properties
|
||||
makeWrapper ${jre}/bin/java $out/bin/elasticmq-server \
|
||||
--add-flags "-jar $out/share/elasticmq-server/elasticmq-server.jar"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/softwaremill/elasticmq";
|
||||
description = "Message queueing system with Java, Scala and Amazon SQS-compatible interfaces";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ peterromfeldhk ];
|
||||
};
|
||||
}
|
||||
@ -20,11 +20,11 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "samba-${version}";
|
||||
version = "4.10.2";
|
||||
version = "4.10.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
|
||||
sha256 = "112yizx9cpjhi8c7mh9znqg0c9dkj3383hwr8dhgpykl3g2zv347";
|
||||
sha256 = "0xhfbh42dihccc85ffx243lyhf3jnphhi6xfcsr3a6mhsm7w1p26";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
@ -96,6 +96,6 @@ stdenv.mkDerivation rec {
|
||||
description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ abbradar schneefux ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "xonsh";
|
||||
version = "0.9.0";
|
||||
version = "0.9.4";
|
||||
|
||||
# fetch from github because the pypi package ships incomplete tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "scopatz";
|
||||
repo = "xonsh";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "1833xqw5y65cv3c71skqix1xh3qqgv1kps1500cczpyrc8daka23";
|
||||
sha256 = "1gxshi6k030a48bw4nr7rn9fh3cc0nmrkqjpxfrdxyq472d61477";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
{ stdenv, fetchgit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2019-05-26";
|
||||
version = "2019-05-28";
|
||||
name = "oh-my-zsh-${version}";
|
||||
rev = "1343ab67edd8a81b75aceca77ddb526be87a20c1";
|
||||
rev = "9930dd6e49df5630ac23c68b85465f0bb801d17f";
|
||||
|
||||
src = fetchgit { inherit rev;
|
||||
url = "https://github.com/robbyrussell/oh-my-zsh";
|
||||
sha256 = "1932vwzbxd0i76hsjxn6ww3ydpwyk0w1k51xsps5m1q86m19jn5b";
|
||||
sha256 = "1gncl7irz0drlg7rrnb9iqzslflhrpfgsjg7kmdkchp8gj7750hl";
|
||||
};
|
||||
|
||||
pathsToLink = [ "/share/oh-my-zsh" ];
|
||||
|
||||
31
pkgs/tools/X11/srandrd/default.nix
Normal file
31
pkgs/tools/X11/srandrd/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, libX11
|
||||
, libXrandr
|
||||
, libXinerama
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "srandrd";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jceb";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "07r1ck2ijj30n19ylndgw75ly9k3815kj9inpxblfnjpwbbw6ic0";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 libXrandr libXinerama ];
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/jceb/srandrd";
|
||||
description = "Simple randr daemon";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.utdemir ];
|
||||
};
|
||||
|
||||
}
|
||||
@ -33,11 +33,11 @@ let
|
||||
|
||||
in py.pkgs.buildPythonApplication rec {
|
||||
pname = "awscli";
|
||||
version = "1.16.106"; # N.B: if you change this, change botocore to a matching version too
|
||||
version = "1.16.162"; # N.B: if you change this, change botocore to a matching version too
|
||||
|
||||
src = py.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "169810cb895ac8608747e81480aebd2712f654ad2e49e1f1315f34d6052d5e2d";
|
||||
sha256 = "1v5n1klzkysshp73mhrminvkqqqw9mskdaw7xjhpqfrvcdnp60vv";
|
||||
};
|
||||
|
||||
# No tests included
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "yubikey-manager";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
srcs = fetchurl {
|
||||
url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "11rsmcaj60k3y5m5gdhr2nbbz0w5dm3m04klyxz0fh5hnpcmr7fm";
|
||||
sha256 = "1jmczk6r6609kzbq4ixispkm4qpvw94wdyfps7q3r96x75si1p1s";
|
||||
};
|
||||
|
||||
propagatedBuildInputs =
|
||||
|
||||
@ -1,29 +1,51 @@
|
||||
{ stdenv, fetchurl, bison, pkgconfig
|
||||
, glib, gtk2, libxml2, gettext, zlib, binutils, gnutls }:
|
||||
{ stdenv, fetchurl, fetchpatch, bison, pkgconfig, gettext, desktop-file-utils
|
||||
, glib, gtk2, libxml2, libbfd, zlib, binutils, gnutls
|
||||
}:
|
||||
|
||||
let
|
||||
name = "gtk-gnutella";
|
||||
version = "1.1.9";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}-${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtk-gnutella";
|
||||
version = "1.1.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2";
|
||||
sha256 = "1zvadgsskmpm82id9mbj24a2lyq38qv768ixv7nmfjl3d4wr2biv";
|
||||
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0sljjha4anfz1r1xq1c6qnnkjv62ld56p7xgj4bsi6lqmq1azvii";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison gettext pkgconfig ];
|
||||
buildInputs = [ binutils glib gnutls gtk2 libxml2 zlib ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Avoid namespace conflict with glibc 2.28 'statx' struct / remove after v1.1.14
|
||||
url = "https://github.com/gtk-gnutella/gtk-gnutella/commit/e4205a082eb32161e28de81f5cba8095eea8ecc7.patch";
|
||||
sha256 = "0ffkw2cw2b2yhydii8jm40vd40p4xl224l8jvhimg02lgs3zfbca";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/gtk-gnutella/raw/f30/f/gtk-gnutella-1.1.14-endian.patch";
|
||||
sha256 = "19q4lq8msknfz4mkbjdqmmgld16p30j2yx371p8spmr19q5i0sfn";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile.SH --replace "@exit 0" "@echo done"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ bison desktop-file-utils gettext pkgconfig ];
|
||||
buildInputs = [ binutils glib gnutls gtk2 libbfd libxml2 zlib ];
|
||||
|
||||
configureScript = "./build.sh";
|
||||
configureFlags = [ "--configure-only" ];
|
||||
|
||||
hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ];
|
||||
|
||||
configureScript = "./build.sh --configure-only";
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = ''
|
||||
install -Dm0444 src/${pname}.man $out/share/man/man1/${pname}.1
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://gtk-gnutella.sourceforge.net/;
|
||||
description = "Server/client for Gnutella";
|
||||
license = licenses.gpl2;
|
||||
description = "A GTK+ Gnutella client, optimized for speed and scalability";
|
||||
homepage = "http://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella
|
||||
changelog = "https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v${version}/ChangeLog";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,25 +1,20 @@
|
||||
{ stdenv, fetchFromGitHub, libpcap, pixiewps, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6.3";
|
||||
name = "reaver-wps-t6x-${version}";
|
||||
pname = "reaver-wps-t6x";
|
||||
version = "1.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "t6x";
|
||||
repo = "reaver-wps-fork-t6x";
|
||||
rev = "v${version}";
|
||||
sha256 = "1bccwp67q1q0h5m38gqxn9imq5rb75jbmv7fjr2n38v10jcga2pb";
|
||||
sha256 = "03v5jyb4if74rpg0mcd8700snb120b6w2gnsa3aqdgj5676ic5dn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ libpcap pixiewps ];
|
||||
|
||||
preConfigure = "cd src";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp reaver wash $out/bin/
|
||||
'';
|
||||
sourceRoot = "source/src";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Online and offline brute force attack against WPS";
|
||||
|
||||
44
pkgs/tools/networking/tridactyl-native/default.nix
Normal file
44
pkgs/tools/networking/tridactyl-native/default.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tridactyl-native";
|
||||
# this is actually the version of tridactyl itself; the native messenger will
|
||||
# probably not change with every tridactyl version
|
||||
version = "1.14.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tridactyl";
|
||||
repo = "tridactyl";
|
||||
rev = version;
|
||||
sha256 = "0d80c744qfv6jd03cmdp3p71xaj8lq8jzsa2m24jxv9q4ks2dcmj";
|
||||
};
|
||||
sourceRoot = "source/native";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.wrapPython
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
sed -i -e "s|REPLACE_ME_WITH_SED|$out/share/tridactyl/native_main.py|" "tridactyl.json"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/lib/mozilla/native-messaging-hosts"
|
||||
cp tridactyl.json "$out/lib/mozilla/native-messaging-hosts/"
|
||||
|
||||
mkdir -p "$out/share/tridactyl"
|
||||
cp native_main.py "$out/share/tridactyl"
|
||||
wrapPythonProgramsIn "$out/share/tridactyl"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Tridactyl native messaging host application";
|
||||
homepage = https://github.com/tridactyl/tridactyl;
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ timokau ];
|
||||
};
|
||||
}
|
||||
@ -59,6 +59,7 @@ mapAliases ({
|
||||
clawsMail = claws-mail; # added 2016-04-29
|
||||
clutter_gtk = clutter-gtk; # added 2018-02-25
|
||||
conkerorWrapper = conkeror; # added 2015-01
|
||||
compton-git = compton; # added 2019-05-20
|
||||
conntrack_tools = conntrack-tools; # added 2018-05
|
||||
cool-old-term = cool-retro-term; # added 2015-01-31
|
||||
cupsBjnp = cups-bjnp; # added 2016-01-02
|
||||
|
||||
@ -2093,6 +2093,16 @@ in
|
||||
citrix_receiver = citrix_receiver_unwrapped_13_8_0;
|
||||
};
|
||||
|
||||
citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { };
|
||||
citrix_workspace_unwrapped_19_3_0 = citrix_workspace_unwrapped.override { version = "19.3.0"; };
|
||||
|
||||
citrix_workspace = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix {
|
||||
citrix_workspace = citrix_workspace_unwrapped;
|
||||
};
|
||||
citrix_workspace_19_3_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix {
|
||||
citrix_workspace = citrix_workspace_unwrapped_19_3_0;
|
||||
};
|
||||
|
||||
citra = libsForQt5.callPackage ../misc/emulators/citra { };
|
||||
|
||||
cmst = libsForQt5.callPackage ../tools/networking/cmst { };
|
||||
@ -2627,6 +2637,8 @@ in
|
||||
|
||||
teamocil = callPackage ../tools/misc/teamocil { };
|
||||
|
||||
tridactyl-native = callPackage ../tools/networking/tridactyl-native { };
|
||||
|
||||
uudeview = callPackage ../tools/misc/uudeview { };
|
||||
|
||||
uutils-coreutils = callPackage ../tools/misc/uutils-coreutils {
|
||||
@ -3055,7 +3067,7 @@ in
|
||||
foundationdb61
|
||||
;
|
||||
|
||||
foundationdb = foundationdb60;
|
||||
foundationdb = foundationdb61;
|
||||
|
||||
fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { };
|
||||
|
||||
@ -5460,6 +5472,8 @@ in
|
||||
|
||||
quota = if stdenv.isLinux then linuxquota else unixtools.quota;
|
||||
|
||||
qview = libsForQt5.callPackage ../applications/graphics/qview {};
|
||||
|
||||
wiggle = callPackage ../development/tools/wiggle { };
|
||||
|
||||
radamsa = callPackage ../tools/security/radamsa { };
|
||||
@ -8696,6 +8710,8 @@ in
|
||||
pharo-spur64 = assert stdenv.is64bit; pharo-vms.spur64;
|
||||
pharo-launcher = callPackage ../development/pharo/launcher { };
|
||||
|
||||
srandrd = callPackage ../tools/X11/srandrd { };
|
||||
|
||||
srecord = callPackage ../development/tools/misc/srecord { };
|
||||
|
||||
srelay = callPackage ../tools/networking/srelay { };
|
||||
@ -14146,6 +14162,8 @@ in
|
||||
|
||||
elasticmq = callPackage ../servers/elasticmq { };
|
||||
|
||||
elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { };
|
||||
|
||||
eventstore = callPackage ../servers/nosql/eventstore {
|
||||
Nuget = dotnetPackages.Nuget;
|
||||
};
|
||||
@ -15935,6 +15953,8 @@ in
|
||||
ubootOrangePiZeroPlus2H5
|
||||
ubootPcduino3Nano
|
||||
ubootPine64
|
||||
ubootPine64LTS
|
||||
ubootPinebook
|
||||
ubootQemuAarch64
|
||||
ubootQemuArm
|
||||
ubootRaspberryPi
|
||||
@ -20937,7 +20957,7 @@ in
|
||||
|
||||
inherit (xorg) xcompmgr;
|
||||
|
||||
inherit (callPackage ../applications/window-managers/compton {}) compton compton-git;
|
||||
compton = callPackage ../applications/window-managers/compton {};
|
||||
|
||||
xdaliclock = callPackage ../tools/misc/xdaliclock {};
|
||||
|
||||
|
||||
@ -217,8 +217,6 @@ let
|
||||
|
||||
earley = callPackage ../development/ocaml-modules/earley { };
|
||||
|
||||
earley_ocaml = callPackage ../development/ocaml-modules/earley_ocaml { };
|
||||
|
||||
easy-format = callPackage ../development/ocaml-modules/easy-format { };
|
||||
|
||||
elina = callPackage ../development/ocaml-modules/elina { };
|
||||
|
||||
@ -104,6 +104,7 @@ in {
|
||||
optipng = super.optipng.override {
|
||||
static = true;
|
||||
};
|
||||
openblas = super.openblas.override { enableStatic = true; };
|
||||
openssl = super.openssl.override {
|
||||
static = true;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user