Merge remote-tracking branch 'upstream/master' into sage-8.9

This commit is contained in:
Timo Kaufmann 2019-09-23 23:58:37 +02:00
commit ba9e5a2785
28 changed files with 266 additions and 159 deletions

View file

@ -169,13 +169,14 @@ in {
systemd.services = with attrsets; mapAttrs' (name: config: nameValuePair "postgresql-wal-receiver-${name}" {
description = "PostgreSQL WAL receiver (${name})";
wantedBy = [ "multi-user.target" ];
startLimitIntervalSec = 0; # retry forever, useful in case of network disruption
serviceConfig = {
User = "postgres";
Group = "postgres";
KillSignal = "SIGINT";
Restart = "always";
RestartSec = 30;
RestartSec = 60;
};
inherit (config) environment;

View file

@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
];
propagatedBuildInputs = with pythonPackages; [
gst-python pygobject3 pykka tornado_4 requests
gst-python pygobject3 pykka tornado_4 requests setuptools
] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python;
# There are no tests

View file

@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Iris";
version = "3.39.0";
version = "3.40.0";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1d2g66gvm7yaz4nbxlh23lj2xfkhi3hsg2k646m1za510f8dzlag";
sha256 = "1cn68zmyvig114dsw7vhx761v9c1za3wnbq4y2z0f0cbl958n49v";
};
propagatedBuildInputs = [

View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "jormungandr";
version = "0.3.9999";
version = "0.5.0";
src = fetchgit {
url = "https://github.com/input-output-hk/${pname}";
rev = "v${version}";
sha256 = "11lr533fpispwbk4vsq9bnv40gkpybvpa7ajwczv9ky6afh8np5b";
sha256 = "19jqnja4mxyfgg79m4ak4815wjxvkg6qn04gk21c15xl3i8b4zf6";
fetchSubmodules = true;
};
cargoSha256 = "0b5phmvwv5cyjawlxd9rmlc403lxzm4gnw0mclq70g5g0msqzd9m";
cargoSha256 = "1grrxmczdmkf2sd0f0b2iblzzcp8qlrsad5dkm0r5vxch22rcx7d";
nativeBuildInputs = [ pkgconfig protobuf ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];

View file

@ -1,64 +1,75 @@
{ fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome2 }:
{ atomEnv, autoPatchelfHook, dpkg, fetchurl, makeDesktopItem, makeWrapper
, stdenv, udev, wrapGAppsHook }:
stdenv.mkDerivation rec {
let
inherit (stdenv.hostPlatform) system;
name = "simplenote-${pkgver}";
pkgver = "1.1.3";
pname = "simplenote";
src = fetchurl {
url = "https://github.com/Automattic/simplenote-electron/releases/download/v${pkgver}/Simplenote-linux-${pkgver}.tar.gz";
sha256 = "1z92yyjmg3bgfqfdpnysf98h9hhhnqzdqqigwlmdmn3d7fy49kcf";
};
version = "1.8.0";
buildCommand = let
packages = [
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr nss
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome2.GConf
xorg.libxcb
];
libPathNative = lib.makeLibraryPath packages;
libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages;
libPath = "${libPathNative}:${libPath64}";
in ''
mkdir -p $out/share/
mkdir -p $out/bin
tar xvzf $src -C $out/share/
mv $out/share/Simplenote-linux-x64 $out/share/simplenote
mv $out/share/simplenote/Simplenote $out/share/simplenote/simplenote
mkdir -p $out/share/applications
cat > $out/share/applications/simplenote.desktop << EOF
[Desktop Entry]
Name=Simplenote
Comment=Simplenote for Linux
Exec=$out/bin/simplenote
Icon=$out/share/simplenote/Simplenote.png
Type=Application
StartupNotify=true
Categories=Development;
EOF
fixupPhase
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${libPath}:$out/share/simplenote" \
$out/share/simplenote/simplenote
ln -s $out/share/simplenote/simplenote $out/bin/simplenote
'';
sha256 = {
x86_64-linux = "066gr1awdj5nwdr1z57mmvx7dd1z19g0wzsgbnrrb89bqfj67ykl";
}.${system};
meta = with stdenv.lib; {
description = "The simplest way to keep notes";
homepage = https://github.com/Automattic/simplenote-electron;
license = licenses.lgpl2;
homepage = "https://github.com/Automattic/simplenote-electron";
license = licenses.gpl2;
maintainers = with maintainers; [ kiwi ];
platforms = [ "x86_64-linux" ];
};
}
linux = stdenv.mkDerivation rec {
inherit pname version meta;
src = fetchurl {
url =
"https://github.com/Automattic/simplenote-electron/releases/download/"
+ "v${version}/Simplenote-linux-${version}-amd64.deb";
inherit sha256;
};
desktopItem = makeDesktopItem {
name = "simplenote";
comment = "Simplenote for Linux";
exec = "simplenote %U";
icon = "simplenote";
type = "Application";
startupNotify = "true";
desktopName = "Simplenote";
categories = "Development";
};
dontBuild = true;
dontConfigure = true;
dontPatchELF = true;
dontWrapGApps = true;
buildInputs = atomEnv.packages;
nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ];
unpackPhase = "dpkg-deb -x $src .";
installPhase = ''
mkdir -p "$out/bin"
cp -R "opt" "$out"
cp -R "usr/share" "$out/share"
chmod -R g-w "$out"
mkdir -p "$out/share/applications"
cp "${desktopItem}/share/applications/"* "$out/share/applications"
'';
runtimeDependencies = [ udev.lib ];
postFixup = ''
ls -ahl $out
makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \
"''${gappsWrapperArgs[@]}"
'';
};
in
linux

View file

@ -9,14 +9,14 @@
}:
stdenv.mkDerivation rec {
version = "0.7.25";
version = "0.7.26";
pname = "pynac";
src = fetchFromGitHub {
owner = "pynac";
repo = "pynac";
rev = "pynac-${version}";
sha256 = "0nnifvg6kzx0lq6gz7znind8g30v3d2pjfwgsdiks3vv9kv9nbj3";
sha256 = "09d2p74x1arkydlxy6pw4p4byi7r8q7f29w373h4d8a215kadc6d";
};
buildInputs = [

View file

@ -185,6 +185,7 @@ rec {
keyutils.lib
libjack2
fribidi
p11_kit
# libraries not on the upstream include list, but nevertheless expected
# by at least one appimage

View file

@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb";
};
outputs = [ "bin" "out" "dev" ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ ];
propagatedBuildInputs = [ libgcrypt ];
meta = with stdenv.lib; {

View file

@ -1,5 +1,5 @@
{ stdenv
, fetchFromGitHub
, fetchFromGitLab
, python
, wafHook
@ -22,75 +22,89 @@
, dia, tetex ? null, ghostscript ? null, texlive ? null
# generates python bindings
, generateBindings ? false, ncurses ? null
, pythonSupport ? false, ncurses ? null
# All modules can be enabled by choosing 'all_modules'.
# we include here the DCE mandatory ones
, modules ? [ "core" "network" "internet" "point-to-point" "fd-net-device" "netanim"]
, gcc6
, lib
}:
let
pythonEnv = python.withPackages(ps:
stdenv.lib.optional withManual ps.sphinx
++ stdenv.lib.optionals generateBindings (with ps;[ pybindgen pygccxml ])
++ stdenv.lib.optionals pythonSupport (with ps;[ pybindgen pygccxml ])
);
in
stdenv.mkDerivation rec {
pname = "ns-3";
version = "30";
name = "ns-3.${version}";
version = "28";
# the all in one https://www.nsnam.org/release/ns-allinone-3.27.tar.bz2;
# fetches everything (netanim, etc), this package focuses on ns3-core
src = fetchFromGitHub {
owner = "nsnam";
repo = "ns-3-dev-git";
rev = name;
sha256 = "17kzfjpgw2mvyx1c9bxccnvw67jpk09fxmcnlkqx9xisk10qnhng";
src = fetchFromGitLab {
owner = "nsnam";
repo = "ns-3-dev";
rev = "ns-3.${version}";
sha256 = "0smdi3gglmafpc7a20hj2lbmwks3d5fpsicpn39lmm3svazw0bvp";
};
nativeBuildInputs = [ wafHook ];
# ncurses is a hidden dependency of waf when checking python
buildInputs = lib.optionals generateBindings [ castxml ncurses ]
++ stdenv.lib.optional enableDoxygen [ doxygen graphviz imagemagick ]
++ stdenv.lib.optional withManual [ dia tetex ghostscript texlive.combined.scheme-medium ];
propagatedBuildInputs = [ gcc6 pythonEnv ];
outputs = [ "out" ] ++ lib.optional pythonSupport "py";
# ncurses is a hidden dependency of waf when checking python
buildInputs = lib.optionals pythonSupport [ castxml ncurses ]
++ lib.optional enableDoxygen [ doxygen graphviz imagemagick ]
++ lib.optional withManual [ dia tetex ghostscript texlive.combined.scheme-medium ];
propagatedBuildInputs = [ pythonEnv ];
postPatch = ''
patchShebangs doc/ns3_html_theme/get_version.sh
'';
wafConfigureFlags = with stdenv.lib; [
"--enable-modules=${stdenv.lib.concatStringsSep "," modules}"
"--enable-modules=${concatStringsSep "," modules}"
"--with-python=${pythonEnv.interpreter}"
]
++ optional (build_profile != null) "--build-profile=${build_profile}"
++ optional generateBindings [ ]
++ optional withExamples " --enable-examples "
++ optional doCheck " --enable-tests "
;
doCheck = true;
buildTargets = "build"
+ lib.optionalString enableDoxygen " doxygen"
+ lib.optionalString withManual "sphinx";
doCheck = true;
# to prevent fatal error: 'backward_warning.h' file not found
CXXFLAGS = "-D_GLIBCXX_PERMIT_BACKWARD_HASH";
# we need to specify the proper interpreter else ns3 can check against a
# different version even though we
checkPhase = ''
${pythonEnv.interpreter} ./test.py
postBuild = with stdenv.lib; let flags = concatStringsSep ";" (
optional enableDoxygen "./waf doxygen"
++ optional withManual "./waf sphinx"
);
in "${flags}"
;
postInstall = ''
moveToOutput "${pythonEnv.libPrefix}" "$py"
'';
hardeningDisable = [ "fortify" ];
# we need to specify the proper interpreter else ns3 can check against a
# different version
checkPhase = ''
${pythonEnv.interpreter} ./test.py --nowaf
'';
meta = {
homepage = http://www.nsnam.org;
license = stdenv.lib.licenses.gpl3;
# strictoverflow prevents clang from discovering pyembed when bindings
hardeningDisable = [ "fortify" "strictoverflow"];
meta = with stdenv.lib; {
homepage = "http://www.nsnam.org";
license = licenses.gpl3;
description = "A discrete time event network simulator";
platforms = with stdenv.lib.platforms; unix;
platforms = with platforms; unix;
maintainers = with maintainers; [ teto ];
};
}

View file

@ -19,6 +19,8 @@ buildPythonPackage rec {
sha256 = "19ls7hdmcaqrrq8przqy05s8chsy8315ic2zg185k6m64pvr0qhd";
};
outputs = [ "out" "dev" ];
propagatedBuildInputs = [
dateutil
jmespath

View file

@ -19,8 +19,8 @@
}@args:
import ./generic.nix ({
version = "1.0.2";
sha256 = "01ac51ae12c4324ca5809ce270f9dd1b67f5166fe63bd3e497e9ea3ca91946ff";
version = "1.1.0";
sha256 = "1nq53f5jipgy9jgyfxp43j40qfbmrhgn1cj8bp5rrb3liy3wbh7i";
dlopen_patch = ./dlopen-paths.patch;
disabled = pythonOlder "3.5";
inherit withXcffib;

View file

@ -1,46 +1,61 @@
commit 0435bc2577d4b18f54b78b2f5185abb2b2005982
Author: Alexander V. Nikolaev <avn@avnik.info>
Date: Sat Feb 6 08:09:06 2016 +0200
Patch dlopen() to allow direct paths to all required libs
Patch dlopen() to allow direct paths to all required libs
This is an update of the patch submitted in
https://github.com/NixOS/nixpkgs/commit/b13e44e094989d3a902f8c73b22e8d3c0cc7acf4
by Alexander V. Nikolaev <avn@avnik.info>
This patch is NixOS specific
---
cairocffi/__init__.py | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py
index 6061973..3538a58 100644
index 307d58c..43c29e3 100644
--- a/cairocffi/__init__.py
+++ b/cairocffi/__init__.py
@@ -21,19 +21,22 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip()
version = '1.16.0'
version_info = (1, 16, 0)
@@ -21,28 +21,26 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip()
version = '1.17.2'
version_info = (1, 17, 2)
+# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime
+# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be
+# required for runtime
+_LIBS = {
+ 'cairo': '@cairo@/lib/libcairo@ext@',
+ 'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
+ 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
+ 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
+}
+
-def dlopen(ffi, *names):
+def dlopen(ffi, name, *names):
def dlopen(ffi, library_names, filenames):
"""Try various names for the same library, for different platforms."""
- for name in names:
- for lib_name in (name, 'lib' + name):
- try:
- path = ctypes.util.find_library(lib_name)
- lib = ffi.dlopen(path or lib_name)
- if lib:
- return lib
- except OSError:
- pass
- raise OSError("dlopen() failed to load a library: %s" % ' / '.join(names))
+ path = _LIBS.get(name, None)
+ if path:
+ lib = ffi.dlopen(path)
+ if lib:
+ return lib
+ raise OSError("dlopen() failed to load a library: %s as %s" % (name, path))
- exceptions = []
-
for library_name in library_names:
- library_filename = find_library(library_name)
- if library_filename:
- filenames = (library_filename,) + filenames
- else:
- exceptions.append(
- 'no library called "{}" was found'.format(library_name))
-
- for filename in filenames:
- try:
- return ffi.dlopen(filename)
- except OSError as exception: # pragma: no cover
- exceptions.append(exception)
-
- error_message = '\n'.join( # pragma: no cover
- str(exception) for exception in exceptions)
- raise OSError(error_message) # pragma: no cover
+ path = _LIBS.get(library_name, None)
+ if path:
+ lib = ffi.dlopen(path)
+ if lib:
+ return lib
+
+ raise OSError("dlopen() failed to load a library: %s as %s" % (library_name, path))
cairo = dlopen(ffi, 'cairo', 'cairo-2', 'cairo-gobject-2', 'cairo.so.2')
cairo = dlopen(
--
2.19.2

View file

@ -26,6 +26,8 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace "'--always', '--match', 'v*']).decode('ascii').strip('\n')" ""
'';
dontUseCmakeConfigure = true;
# Python 3 works but has a broken import test that I couldn't
# figure out.
doCheck = !isPy3k;

View file

@ -21,7 +21,7 @@ buildPythonPackage rec {
sha256 = "f23d5cb7d862b104401d9021fc82e5fa0e0cf57b7660a1331425aab0c691d021";
};
foo = 1;
outputs = [ "out" "dev" ];
propagatedBuildInputs =
[ botocore

View file

@ -11,6 +11,8 @@ buildPythonPackage rec {
sha256 = "2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4";
};
outputs = [ "out" "dev" ];
NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
"test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout"
"test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event"

View file

@ -1122,6 +1122,17 @@ let
};
};
float-preview-nvim = buildVimPluginFrom2Nix {
pname = "float-preview-nvim";
version = "2019-04-07";
src = fetchFromGitHub {
owner = "ncm2";
repo = "float-preview.nvim";
rev = "c5431b6d9bd4a8002f1a3eec42e9458ef4453ff3";
sha256 = "0ylrp0pmg822m7zp7dhyhmb05zbiy4gbq40l4whs249v0v4s9vyd";
};
};
floobits-neovim = buildVimPluginFrom2Nix {
pname = "floobits-neovim";
version = "2018-08-01";

View file

@ -239,6 +239,7 @@ nathanaelkane/vim-indent-guides
nathangrigg/vim-beancount
navicore/vissort.vim
nbouscal/vim-stylish-haskell
ncm2/float-preview.nvim
ncm2/ncm2
ncm2/ncm2-bufword
ncm2/ncm2-jedi

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, kernel, bc }:
{ stdenv, fetchFromGitHub, kernel, bc, nukeReferences }:
stdenv.mkDerivation rec {
name = "rtl8812au-${kernel.version}-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1fy0f8ihxd0i5kr8gmky8v8xl0ns6bhxfdn64c97c5irzdvg37sr";
};
nativeBuildInputs = [ bc ];
nativeBuildInputs = [ bc nukeReferences ];
buildInputs = kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" "format" ];
@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
'';
postInstall = ''
nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko
'';
meta = with stdenv.lib; {
description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod";
homepage = https://github.com/zebulon2/rtl8812au-driver-5.2.20;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, kernel, bc }:
{ stdenv, fetchFromGitHub, kernel, bc, nukeReferences }:
stdenv.mkDerivation rec {
name = "rtl8821au-${kernel.version}-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1kmdxgbh0s0v9809kdsi39p0jbm5cf10ivy40h8qj9hn70g1gw8q";
};
nativeBuildInputs = [ bc ];
nativeBuildInputs = [ bc nukeReferences ];
buildInputs = kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" "format" ];
@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
'';
postInstall = ''
nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko
'';
meta = with stdenv.lib; {
description = "rtl8821AU, rtl8812AU and rtl8811AU chipset driver with firmware";
homepage = https://github.com/zebulon2/rtl8812au;

View file

@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi
in stdenv.mkDerivation rec {
pname = "rtlwifi_new";
version = "2018-02-17";
version = "2019-08-21";
src = fetchFromGitHub {
owner = "lwfinger";
repo = "rtlwifi_new";
rev = "0588ac0cc5f530e7764705416370b70d3c2afedc";
sha256 = "1vs8rfw19lcs04bapa97zlnl5x0kf02sdw5ik0hdm27wgk0z969m";
rev = "a108e3de87c2ed30b71c3c4595b79ab7a2f9e348";
sha256 = "15kjs9i9vvmn1cdzccd5cljf3m45r4ssm65klkj2fdkf3kljj38k";
};
hardeningDisable = [ "pic" "format" ];

View file

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "consul";
version = "1.6.0";
version = "1.6.1";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/consul";
@ -19,7 +19,7 @@ buildGoPackage rec {
owner = "hashicorp";
repo = pname;
inherit rev;
sha256 = "16rngyv9dp19gjbjwfvnmlfxbq67fxs55hgvvcyn9mplm1j0bb52";
sha256 = "00dvvxi7y80v2b6wzwyfzhxv1ksnl1m0nmdjl98dhq5ikb0v7p28";
};
preBuild = ''

View file

@ -11,15 +11,15 @@ stdenv.mkDerivation rec {
buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc ];
configureFlags = [
"--with-libc=libc.so.6"
];
configureFlags = ["--with-libc=libc${stdenv.targetPlatform.extensions.sharedLibrary}"];
dontAddDisableDepTrack = stdenv.isDarwin;
meta = with stdenv.lib; {
description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity.";
homepage = "https://www.inet.no/dante/";
maintainers = [ maintainers.arobyn ];
license = licenses.bsdOriginal;
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
};
}

View file

@ -38,7 +38,7 @@ in py.pkgs.buildPythonApplication rec {
# No tests included
doCheck = false;
propagatedBuildInputs = with py.pkgs; [
pythonPath = with py.pkgs; [
botocore
bcdoc
s3transfer
@ -49,6 +49,10 @@ in py.pkgs.buildPythonApplication rec {
pyyaml
groff
less
urllib3
dateutil
jmespath
futures
];
postInstall = ''

View file

@ -4,17 +4,17 @@ with lib;
let
version = "0.17.27";
version = "1.1.0";
# switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script
pulumiArchPackage = {
x86_64-linux = {
url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz";
sha256 = "13ajgc8x5l3s93hmz6jg88if10bvd319jmkljy4n26zdp30vfqmw";
sha256 = "1r498pxsjdj9mhdzh9vh4nw8fcjxfga44xlg43b0yakkgrp7c224";
};
x86_64-darwin = {
url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz";
sha256 = "0chpbnz2s4icwgmfq6kl8blz5mg4lpdqg061w3nh0p04adpgrn48";
sha256 = "02nr5yxn5aqgbwrnl4shgd6rh4n4v8giqki4qkbgx74xf3bbwihg";
};
};

View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, mkDerivation, pkgconfig, yubikey-personalization, qtbase, qmake, libyubikey }:
{ stdenv, fetchurl, mkDerivation, pkgconfig, qtbase, qmake, imagemagick
, libyubikey, yubikey-personalization }:
mkDerivation rec {
name = "yubikey-personalization-gui-3.1.25";
@ -8,12 +9,27 @@ mkDerivation rec {
sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8";
};
nativeBuildInputs = [ pkgconfig qmake ];
nativeBuildInputs = [ pkgconfig qmake imagemagick ];
buildInputs = [ yubikey-personalization qtbase libyubikey ];
installPhase = ''
mkdir -p $out/bin
cp build/release/yubikey-personalization-gui $out/bin
install -D -m0755 build/release/yubikey-personalization-gui "$out/bin/yubikey-personalization-gui"
install -D -m0644 resources/lin/yubikey-personalization-gui.1 "$out/share/man/man1/yubikey-personalization-gui.1"
# Desktop files
install -D -m0644 resources/lin/yubikey-personalization-gui.desktop "$out/share/applications/yubikey-personalization-gui.desktop"
install -D -m0644 resources/lin/yubikey-personalization-gui.desktop "$out/share/pixmaps/yubikey-personalization-gui.xpm"
# Icons
install -D -m0644 resources/lin/yubikey-personalization-gui.png "$out/share/icons/hicolor/128x128/apps/yubikey-personalization-gui.png"
for SIZE in 16 24 32 48 64 96; do
# set modify/create for reproducible builds
convert -scale ''${SIZE} +set date:create +set date:modify \
resources/lin/yubikey-personalization-gui.png \
yubikey-personalization-gui.png
install -D -m0644 yubikey-personalization-gui.png "$out/share/icons/hicolor/''${SIZE}x''${SIZE}/apps/yubikey-personalization-gui.png"
done
'';
meta = with stdenv.lib; {

View file

@ -1,17 +1,35 @@
{ stdenv, fetchurl, python3Packages }:
{ stdenv, fetchFromGitHub, python3Packages, docutils, }:
python3Packages.buildPythonApplication rec {
pname = "httpie";
version = "1.0.3";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "103fcigpxf4nqmrdqjnyz7d9n4n16906slwmmqqc0gkxv8hnw6vd";
src = fetchFromGitHub {
owner = "jakubroztocil";
repo = "httpie";
rev = version;
sha256 = "0y30sp0x3nmgzi4dqw1rc3705hnn36ij0zlyyx7g6fqdq8bd8p5q";
};
propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ];
dontUseSetuptoolsCheck = true;
doCheck = false;
disabledTests = [
"test_current_version"
"test_error"
];
checkInputs = with python3Packages; [
mock
pytest
pytest-httpbin
pytestCheckHook
];
# the tests call rst2pseudoxml.py from docutils
preCheck = ''
export PATH=${docutils}/bin:$PATH
'';
meta = {
description = "A command line HTTP client whose goal is to make CLI human-friendly";

View file

@ -8,22 +8,22 @@ let
url = "https://github.com/datawire/sshuttle.git";
rev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269";
sha256 = "1q20lnljndwcpgqv2qrf1k0lbvxppxf98a4g5r9zd566znhcdhx3";
leaveDotGit = true;
};
buildInputs = p.buildInputs ++ [ git ];
nativeBuildInputs = p.nativeBuildInputs ++ [ git ];
postPatch = "rm sshuttle/tests/client/test_methods_nat.py";
postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence";
});
in pythonPackages.buildPythonPackage rec {
pname = "telepresence";
version = "0.93";
version = "0.101";
src = fetchFromGitHub {
owner = "datawire";
repo = "telepresence";
rev = version;
sha256 = "1x8yjcqj8v35a5pxy2rxaixbznb4vk8ll958b4l46gnkfxf1kh1d";
sha256 = "1rxq22vcrw29682g7pdcwcjyifcg61z8y4my1di7yw731aldk274";
};
buildInputs = [ makeWrapper ];

View file

@ -23525,7 +23525,7 @@ in
netlogo = callPackage ../applications/science/misc/netlogo { };
ns-3 = callPackage ../development/libraries/science/networking/ns3 { };
ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; };
root = callPackage ../applications/science/misc/root {
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;