forked from mirrors/nixpkgs
Merge branch 'master' into cross-compiling-postgresql
This commit is contained in:
Ding Xiang Fei
commit
40c2bf6e42
|
|
@ -320,9 +320,6 @@ in
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
meta.doc = ./foundationdb.xml;
|
||||
meta.maintainers = with lib.maintainers; [ thoughtpolice ];
|
||||
|
||||
environment.systemPackages = [ pkg ];
|
||||
|
||||
users.users = optionalAttrs (cfg.user == "foundationdb") (singleton
|
||||
|
|
@ -413,4 +410,7 @@ in
|
|||
'';
|
||||
};
|
||||
};
|
||||
|
||||
meta.doc = ./foundationdb.xml;
|
||||
meta.maintainers = with lib.maintainers; [ thoughtpolice ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:xi="http://www.w3.org/2001/XInclude"
|
||||
version="5.0"
|
||||
xml:id="module-foundationdb">
|
||||
xml:id="module-services-foundationdb">
|
||||
|
||||
<title>FoundationDB</title>
|
||||
|
||||
|
|
|
|||
|
|
@ -43,6 +43,12 @@ in {
|
|||
defaultText = "pkgs.haskellPackages";
|
||||
};
|
||||
|
||||
home = mkOption {
|
||||
type = types.str;
|
||||
description = "Url for hoogle logo";
|
||||
default = "https://hoogle.haskell.org";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
|
@ -53,7 +59,7 @@ in {
|
|||
|
||||
serviceConfig = {
|
||||
Restart = "always";
|
||||
ExecStart = ''${hoogleEnv}/bin/hoogle server --local -p ${toString cfg.port}'';
|
||||
ExecStart = ''${hoogleEnv}/bin/hoogle server --local --port ${toString cfg.port} --home ${cfg.home}'';
|
||||
|
||||
User = "nobody";
|
||||
Group = "nogroup";
|
||||
|
|
|
|||
|
|
@ -560,6 +560,7 @@ in {
|
|||
mkdir -p ${cfg.statePath}/tmp/sockets
|
||||
mkdir -p ${cfg.statePath}/shell
|
||||
mkdir -p ${cfg.statePath}/db
|
||||
mkdir -p ${cfg.statePath}/uploads
|
||||
|
||||
rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
|
||||
mkdir -p ${cfg.statePath}/config
|
||||
|
|
@ -570,6 +571,7 @@ in {
|
|||
mkdir -p ${cfg.statePath}/log
|
||||
ln -sf ${cfg.statePath}/log /run/gitlab/log
|
||||
ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
|
||||
ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
|
||||
ln -sf $GITLAB_SHELL_CONFIG_PATH /run/gitlab/shell-config.yml
|
||||
chown -R ${cfg.user}:${cfg.group} /run/gitlab
|
||||
|
||||
|
|
@ -584,7 +586,9 @@ in {
|
|||
ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
|
||||
''}
|
||||
ln -sf ${cfg.statePath}/config /run/gitlab/config
|
||||
rm ${cfg.statePath}/lib
|
||||
if [ -e ${cfg.statePath}/lib ]; then
|
||||
rm ${cfg.statePath}/lib
|
||||
fi
|
||||
ln -sf ${pkgs.gitlab}/share/gitlab/lib ${cfg.statePath}/lib
|
||||
cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
|
||||
|
||||
|
|
@ -608,10 +612,11 @@ in {
|
|||
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName}
|
||||
touch "${cfg.statePath}/db-created"
|
||||
fi
|
||||
|
||||
# enable required pg_trgm extension for gitlab
|
||||
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
|
||||
fi
|
||||
|
||||
# enable required pg_trgm extension for gitlab
|
||||
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
|
||||
# Always do the db migrations just to be sure the database is up-to-date
|
||||
${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production
|
||||
|
||||
|
|
|
|||
|
|
@ -195,6 +195,17 @@ in
|
|||
};
|
||||
|
||||
helperd = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Enable the BeeGFS helperd.
|
||||
The helpered is need for logging purposes on the client.
|
||||
Disabling <literal>helperd</literal> allows for runing the client
|
||||
with <literal>allowUnfree = false</literal>.
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
|
|
|
|||
|
|
@ -546,7 +546,7 @@ in
|
|||
};
|
||||
|
||||
services.journald.rateLimitInterval = mkOption {
|
||||
default = "10s";
|
||||
default = "30s";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Configures the rate limiting interval that is applied to all
|
||||
|
|
@ -559,7 +559,7 @@ in
|
|||
};
|
||||
|
||||
services.journald.rateLimitBurst = mkOption {
|
||||
default = 100;
|
||||
default = 1000;
|
||||
type = types.int;
|
||||
description = ''
|
||||
Configures the rate limiting burst limit (number of messages per
|
||||
|
|
|
|||
|
|
@ -117,9 +117,9 @@ let
|
|||
];
|
||||
postBuild = ''
|
||||
mkdir -p $out/nix-support
|
||||
echo "file ${kernelTarget} $out/${kernelTarget}" >> $out/nix-support/hydra-build-products
|
||||
echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products
|
||||
echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products
|
||||
echo "file ${kernelTarget} ${build.kernel}/${kernelTarget}" >> $out/nix-support/hydra-build-products
|
||||
echo "file initrd ${build.netbootRamdisk}/initrd" >> $out/nix-support/hydra-build-products
|
||||
echo "file ipxe ${build.netbootIpxeScript}/netboot.ipxe" >> $out/nix-support/hydra-build-products
|
||||
'';
|
||||
preferLocalBuild = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "mopidy-gmusic";
|
||||
version = "2.0.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz";
|
||||
sha256 = "1xryw2aixfza3brxlgjdlg0lghlb17g7kay9zy56mlzp0jr7m87j";
|
||||
sha256 = "0a2s4xrrhnkv85rx4w5bj6ih9xm34jy0q71fdvbzmi827g9dw5sz";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,71 @@
|
|||
{ stdenv, fetchurl, python3Packages
|
||||
, file, intltool, gobjectIntrospection, libgudev
|
||||
, udisks, glib, gnome3, gst_all_1, libnotify
|
||||
, exiv2, exiftool, qt5, gdk_pixbuf
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "rapid-photo-downloader";
|
||||
version = "0.9.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz";
|
||||
sha256 = "193l55wdxwxmammyxwzp90sg0qw5r316443la3m9611sdpcmy8w3";
|
||||
};
|
||||
|
||||
# Disable version check and fix install tests
|
||||
postPatch = ''
|
||||
substituteInPlace raphodo/constants.py \
|
||||
--replace "disable_version_check = False" "disable_version_check = True"
|
||||
substituteInPlace raphodo/rescan.py \
|
||||
--replace "from preferences" "from raphodo.preferences"
|
||||
substituteInPlace raphodo/copyfiles.py \
|
||||
--replace "import problemnotification" "import raphodo.problemnotification"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ file intltool gobjectIntrospection ];
|
||||
|
||||
buildInputs = [
|
||||
libgudev
|
||||
udisks
|
||||
glib
|
||||
gnome3.gexiv2
|
||||
gst_all_1.gstreamer
|
||||
libnotify
|
||||
exiv2
|
||||
exiftool
|
||||
qt5.qtimageformats
|
||||
gdk_pixbuf
|
||||
] ++ (with python3Packages; [
|
||||
pyqt5
|
||||
pygobject3
|
||||
gphoto2
|
||||
pyzmq
|
||||
tornado
|
||||
psutil
|
||||
pyxdg
|
||||
arrow
|
||||
dateutil
|
||||
easygui
|
||||
colour
|
||||
pymediainfo
|
||||
sortedcontainers
|
||||
rawkit
|
||||
requests
|
||||
colorlog
|
||||
pyprind
|
||||
]);
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
|
||||
"--set PYTHONPATH \"$PYTHONPATH\""
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Photo and video importer for cameras, phones, and memory cards";
|
||||
homepage = http://www.damonlynch.net/rapid/;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "yEd-${version}";
|
||||
version = "3.17.2";
|
||||
version = "3.18.1";
|
||||
|
||||
src = requireFile {
|
||||
name = "${name}.zip";
|
||||
url = "https://www.yworks.com/en/products/yfiles/yed/";
|
||||
sha256 = "0wpfvd3jqxgjk3xqkamvlg7rk0w0pmrv7srjfqns447ccc3i7qg2";
|
||||
sha256 = "6aefd87cd925b4a4c86871a3772de243b4e520a86f82158189ae8c19a9a5ecf8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dbeaver-ce-${version}";
|
||||
version = "5.1.3";
|
||||
version = "5.1.4";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "dbeaver";
|
||||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
|
||||
sha256 = "1znkr28pfpclq2gl2prllb3hwq9v9rj5xl7xarq0hsggzfg9n071";
|
||||
sha256 = "14i7b3l89rkhqq4zgsdbvcs9pp60djv0rjbm86fpk2wi4zkrlzi5";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -51,6 +51,6 @@ mkChromiumDerivation (base: rec {
|
|||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
|
||||
timeout = 86400; # 24 hours
|
||||
timeout = 172800; # 48 hours
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.2.2";
|
||||
version = "6.2.3";
|
||||
name = "seafile-client-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haiwen";
|
||||
repo = "seafile-client";
|
||||
rev = "v${version}";
|
||||
sha256 = "19204fqi4x4q7hsc500y6gj0qdfzf4kjgfsr808w13qnh1lxhvr4";
|
||||
sha256 = "1wdpz7vxhn9mcc7kxhrz9c5dwd492akirz351wfi4xxy5np6p6kp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "bcftools";
|
||||
version = "1.8";
|
||||
version = "1.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2";
|
||||
sha256 = "1vgw2mwngq20c530zim52zvgmw1lci8rzl33pvh44xqk3xlzvjsa";
|
||||
sha256 = "1j3h638i8kgihzyrlnpj82xg1b23sijibys9hvwari3fy7kd0dkg";
|
||||
};
|
||||
|
||||
buildInputs = [ htslib zlib bzip2 lzma curl perl python ];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "gp2c-${version}";
|
||||
version = "0.0.10pl1";
|
||||
version = "0.0.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz";
|
||||
sha256 = "16hgmdvzxbmv63x1f72q1xgfyh0qhx7kaf9nbaamy0gdawxjxcav";
|
||||
sha256 = "1z69xj2dpd8yyi8108rz26c50xpv0k2j8qnk0bzy1c5lw3pd1adm";
|
||||
};
|
||||
|
||||
buildInputs = [ pari perl ];
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
let
|
||||
# if you bump version, update pkgs.tortoisehg too or ping maintainer
|
||||
version = "4.5.2";
|
||||
version = "4.6.2";
|
||||
name = "mercurial-${version}";
|
||||
inherit (python2Packages) docutils hg-git dulwich python;
|
||||
in python2Packages.buildPythonApplication {
|
||||
|
|
@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://mercurial-scm.org/release/${name}.tar.gz";
|
||||
sha256 = "14732hhw2ibvy5khqxjc8a983z3rib5vp9lqfbws80lm3kyryjm4";
|
||||
sha256 = "1bv6wgcdx8glihjjfg22khhc52mclsn4kwfqvzbzlg0b42h4xl0w";
|
||||
};
|
||||
|
||||
inherit python; # pass it so that the same version can be used in hg2git
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "tortoisehg-${version}";
|
||||
version = "4.5.2";
|
||||
version = "4.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
|
||||
sha256 = "0q12zjpgafdch4ns31k4afy25g837xm7v2qwj62806l2dz4rm4h9";
|
||||
sha256 = "1argpi5h0fv4ilahi52c98xgvsvz27lvqi41hzw1f81mhjgyhqik";
|
||||
};
|
||||
|
||||
pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ fi
|
|||
|
||||
if [[ "$isCpp" = 1 ]]; then
|
||||
if [[ "$cppInclude" = 1 ]]; then
|
||||
NIX_@infixSalt@_CFLAGS_COMPILE+=" ${NIX_@infixSalt@_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}"
|
||||
NIX_@infixSalt@_CFLAGS_COMPILE+=" ${NIX_@infixSalt@_CXXSTDLIB_COMPILE:-@default_cxx_stdlib_compile@}"
|
||||
fi
|
||||
NIX_@infixSalt@_CFLAGS_LINK+=" $NIX_@infixSalt@_CXXSTDLIB_LINK"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mate-control-center-${version}";
|
||||
version = "1.20.3";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
|
||||
sha256 = "0wpi8b3zz10xd5i7ir7nd737a9vl4q17rc5nh8vfrqpyrcilqzkd";
|
||||
sha256 = "0m40jr1midh5fzk3k97sydihlqfqjvzxlgmkx8w2j30a09h7230w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -972,6 +972,13 @@ self: super: {
|
|||
sha256 = "0i889zs46wn09d7iqdy99201zaqxb175cfs8jz2zi3mv4ywx3a0l";
|
||||
});
|
||||
|
||||
# https://github.com/simonmichael/hledger/issues/852
|
||||
hledger-lib = appendPatch super.hledger-lib (pkgs.fetchpatch {
|
||||
url = "https://github.com/simonmichael/hledger/commit/007b9f8caaf699852511634752a7d7c86f6adc67.patch";
|
||||
sha256 = "1lfp29mi1qyrcr9nfjigbyric0xb9n4ann5w6sr0g5sanr4maqs2";
|
||||
stripLen = 1;
|
||||
});
|
||||
|
||||
# Copy hledger man pages from data directory into the proper place. This code
|
||||
# should be moved into the cabal2nix generator.
|
||||
hledger = overrideCabal super.hledger (drv: {
|
||||
|
|
|
|||
|
|
@ -231,8 +231,8 @@ in {
|
|||
};
|
||||
|
||||
php71 = generic {
|
||||
version = "7.1.19";
|
||||
sha256 = "1wvhsxzmb78pcr36ginz93iv7rcrxp3p01rb34zxa2h4wdxkxi0k";
|
||||
version = "7.1.20";
|
||||
sha256 = "0i8xd6p4zdg8fl6f0j430raanlshsshr3s3jlm72b0gvi1n4f6rs";
|
||||
};
|
||||
|
||||
php72 = generic {
|
||||
|
|
|
|||
40
pkgs/development/libraries/jsonrpc-glib/default.nix
Normal file
40
pkgs/development/libraries/jsonrpc-glib/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
|
||||
let
|
||||
version = "3.28.1";
|
||||
pname = "jsonrpc-glib";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
|
||||
buildInputs = [ glib json-glib ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0avff2ldjvwrb8rnzlgslagdjf6x7bmdx69rsq20k6f38icw4ang";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
"-Denable_gtk_doc=true"
|
||||
];
|
||||
|
||||
# Tests fail non-deterministically
|
||||
# https://gitlab.gnome.org/GNOME/jsonrpc-glib/issues/2
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A library to communicate using the JSON-RPC 2.0 specification";
|
||||
homepage = https://gitlab.gnome.org/GNOME/jsonrpc-glib;
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = gnome3.maintainers;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
25
pkgs/development/libraries/msgpuck/default.nix
Normal file
25
pkgs/development/libraries/msgpuck/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "msgpuck-${version}";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rtsisyk";
|
||||
repo = "msgpuck";
|
||||
rev = "${version}";
|
||||
sha256 = "0cjq86kncn3lv65vig9cqkqqv2p296ymcjjbviw0j1s85cfflps0";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = ''A simple and efficient MsgPack binary serialization library in a self-contained header file'';
|
||||
homepage = https://github.com/rtsisyk/msgpuck;
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ izorkin ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,13 +3,13 @@
|
|||
stdenv.mkDerivation rec
|
||||
{
|
||||
name = "ptex-${version}";
|
||||
version = "2.1.33";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wdas";
|
||||
repo = "ptex";
|
||||
rev = "v${version}";
|
||||
sha256 = "15ijjq3w7hwgm4mqah0x4jzjy3v2nnmmv28lbqzmxzcxjgh4sjkn";
|
||||
sha256 = "0nfz0y66bmi6xckn1whi4sfd8i3ibln212fgm4img2z98b6vccyg";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "lib" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rdkafka-${version}";
|
||||
version = "0.11.4";
|
||||
version = "0.11.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edenhill";
|
||||
repo = "librdkafka";
|
||||
rev = "v${version}";
|
||||
sha256 = "11ps8sy4v8yvj4sha7d1q3rmhfw7l1rd52rnl01xam9862yasahs";
|
||||
sha256 = "1b0zp7k0775g5pzvkmpmsha63wx8wcwcas6w6wb09y0gymxz0xss";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "talloc-2.1.13";
|
||||
name = "talloc-2.1.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://samba/talloc/${name}.tar.gz";
|
||||
sha256 = "0iv09iv385x69gfzvassq6m3y0rd8ncylls95dm015xdy3drkww4";
|
||||
sha256 = "1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
36
pkgs/development/libraries/template-glib/default.nix
Normal file
36
pkgs/development/libraries/template-glib/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
|
||||
let
|
||||
version = "3.28.0";
|
||||
pname = "template-glib";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "18bic41f9cx8h6n5bz80z4ridb8c1h1yscicln8zsn23zmp44x3c";
|
||||
};
|
||||
|
||||
buildInputs = [ meson ninja pkgconfig gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ];
|
||||
nativeBuildInputs = [ glib gobjectIntrospection ];
|
||||
|
||||
mesonFlags = [
|
||||
"-Denable_gtk_doc=true"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome3.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A library for template expansion which supports calling into GObject Introspection from templates";
|
||||
homepage = https://gitlab.gnome.org/GNOME/template-glib;
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = gnome3.maintainers;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -11,6 +11,13 @@ let
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix notmuch build, see https://notmuchmail.org/faq/#index12h2
|
||||
# cannot fetchpatch this because base directory differs
|
||||
# TODO: remove on next xapian update
|
||||
./fix-notmuch-tagging.patch
|
||||
];
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
buildInputs = [ libuuid zlib ];
|
||||
|
|
@ -36,5 +43,5 @@ let
|
|||
in {
|
||||
# xapian-ruby needs 1.2.22 as of 2017-05-06
|
||||
xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
|
||||
xapian_1_4 = generic "1.4.5" "0axhqrj202hbll9mcx1qdm8gsqj19216w3z02gyjbycxvr9gkdc5";
|
||||
xapian_1_4 = generic "1.4.7" "1lxmlds3v5s1gng9nk1rvmln1zcksrw5ds509y0glylwch5qmw0k";
|
||||
}
|
||||
|
|
|
|||
31
pkgs/development/libraries/xapian/fix-notmuch-tagging.patch
Normal file
31
pkgs/development/libraries/xapian/fix-notmuch-tagging.patch
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
From f9e6f45b1c8f66bca8a3387f371b20d434b23a7d Mon Sep 17 00:00:00 2001
|
||||
From: Olly Betts <olly@survex.com>
|
||||
Date: Thu, 26 Jul 2018 17:26:52 +1200
|
||||
Subject: [PATCH 1/1] Revert "Enable open_nearby_postlist for writable
|
||||
databases"
|
||||
|
||||
The amended check isn't conservative enough as there may be postlist
|
||||
changes in the inverter while the table is unmodified. This breaks
|
||||
testcase T150-tagging.sh in notmuch's testsuite, reported by David
|
||||
Bremner.
|
||||
|
||||
This reverts commit 5489fb2f838c0f0b0a593b4c17df282a93a1fe5a.
|
||||
---
|
||||
xapian-core/backends/glass/glass_postlist.cc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/xapian-core/backends/glass/glass_postlist.cc b/xapian-core/backends/glass/glass_postlist.cc
|
||||
index 80e578b85..a47f14a68 100644
|
||||
--- a/backends/glass/glass_postlist.cc
|
||||
+++ b/backends/glass/glass_postlist.cc
|
||||
@@ -759,7 +759,7 @@ GlassPostList::open_nearby_postlist(const std::string & term_,
|
||||
(void)need_pos;
|
||||
if (term_.empty())
|
||||
RETURN(NULL);
|
||||
- if (!this_db.get() || this_db->postlist_table.is_modified())
|
||||
+ if (!this_db.get() || this_db->postlist_table.is_writable())
|
||||
RETURN(NULL);
|
||||
RETURN(new GlassPostList(this_db, term_, cursor->clone()));
|
||||
}
|
||||
--
|
||||
2.11.0
|
||||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "contextvars";
|
||||
version = "2.2";
|
||||
version = "2.3";
|
||||
disabled = !isPy36;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "046b385nfzkjh0wqmd268p2jkgn9fg6hz40npq7j1w3c8aqzhwvx";
|
||||
sha256 = "09fnni8cyxm070bfv9ay030qbyk0dfds5nq77s0p38h33hp08h93";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ immutables ];
|
||||
|
|
|
|||
20
pkgs/development/python-modules/easygui/default.nix
Normal file
20
pkgs/development/python-modules/easygui/default.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{ stdenv, fetchPypi, buildPythonPackage }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "easygui";
|
||||
version = "0.98.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1zmvmwgxyzvm83818skhn8b4wrci4kmnixaax8q3ia5cn7xrmj6v";
|
||||
};
|
||||
|
||||
doCheck = false; # No tests available
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Very simple, very easy GUI programming in Python";
|
||||
homepage = https://github.com/robertlugg/easygui;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
};
|
||||
}
|
||||
22
pkgs/development/python-modules/fluent-logger/default.nix
Normal file
22
pkgs/development/python-modules/fluent-logger/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, msgpack }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fluent-logger";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "09vii0iclfq6vhz37xyybksq9m3538hkr7z40sz2dlpf2rkg98mg";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ msgpack ];
|
||||
|
||||
# Tests fail because absent in package
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A structured logger for Fluentd (Python)";
|
||||
homepage = https://github.com/fluent/fluent-logger-python;
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
26
pkgs/development/python-modules/gphoto2/default.nix
Normal file
26
pkgs/development/python-modules/gphoto2/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ stdenv, fetchPypi, buildPythonPackage
|
||||
, pkgconfig
|
||||
, libgphoto2 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gphoto2";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1806bdjc18qh0wyayxymgjnqqqlxs2iwvgk594anxw9y69hrxqni";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
buildInputs = [ libgphoto2 ];
|
||||
|
||||
doCheck = false; # No tests available
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Python interface to libgphoto2";
|
||||
homepage = https://github.com/jim-easterbrook/python-gphoto2;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, buildPythonPackage, fetchPypi, libusb1 }:
|
||||
{ stdenv, lib, buildPythonPackage, fetchPypi, python, libusb1 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libusb1";
|
||||
|
|
@ -17,6 +17,10 @@ buildPythonPackage rec {
|
|||
|
||||
buildInputs = [ libusb1 ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m usb1.testUSB1
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/vpelletier/python-libusb1;
|
||||
description = "Python ctype-based wrapper around libusb1";
|
||||
|
|
|
|||
42
pkgs/development/python-modules/pymediainfo/default.nix
Normal file
42
pkgs/development/python-modules/pymediainfo/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ stdenv, fetchPypi, buildPythonPackage
|
||||
, libmediainfo
|
||||
, setuptools_scm
|
||||
, pytest, glibcLocales }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymediainfo";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1d0mxxycacimy46b08q44xyxkyji7rrs7viwc3wkpckhqs54q24x";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pymediainfo/__init__.py \
|
||||
--replace 'CDLL(library_file)' \
|
||||
'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}")' \
|
||||
--replace 'CDLL("libmediainfo.0.dylib")' \
|
||||
'CDLL("${libmediainfo}/lib/libmediainfo.0${stdenv.hostPlatform.extensions.sharedLibrary}")' \
|
||||
--replace 'CDLL("libmediainfo.dylib")' \
|
||||
'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}")' \
|
||||
--replace 'CDLL("libmediainfo.so.0")' \
|
||||
'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0")'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ setuptools_scm ];
|
||||
|
||||
checkInputs = [ glibcLocales pytest ];
|
||||
|
||||
checkPhase = ''
|
||||
export LC_ALL=en_US.UTF-8
|
||||
py.test -k 'not test_parse_url' tests
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Python wrapper for the mediainfo library";
|
||||
homepage = https://github.com/sbraz/pymediainfo;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
};
|
||||
}
|
||||
28
pkgs/development/python-modules/pyprind/default.nix
Normal file
28
pkgs/development/python-modules/pyprind/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ stdenv, fetchPypi, buildPythonPackage
|
||||
, psutil
|
||||
, pytest }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "PyPrind";
|
||||
version = "2.11.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0xg6m5hr33h9bdlrr42kc58jm2m87a9zsagy7n2m4n407d2snv64";
|
||||
};
|
||||
|
||||
buildInputs = [ psutil ];
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test tests
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Python Progress Bar and Percent Indicator Utility";
|
||||
homepage = https://github.com/rasbt/pyprind;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-flake8";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
# although pytest is a runtime dependency, do not add it as
|
||||
# propagatedBuildInputs in order to allow packages depend on another version
|
||||
|
|
@ -12,16 +12,13 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0s5fdivrmhjf6ybr6m2qb1h8hndv2jh2ir29qv36lhy9b7sc9kg5";
|
||||
sha256 = "c740ad6aa19e3958947d2118f70bed218caf1d2097039fb7318573a2a72f89a1";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
pytest . -k "not test_mtime_caching"
|
||||
pytest .
|
||||
'';
|
||||
|
||||
# https://github.com/tholo/pytest-flake8/issues/49
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "py.test plugin for efficiently checking PEP8 compliance";
|
||||
homepage = https://github.com/tholo/pytest-flake8;
|
||||
|
|
|
|||
28
pkgs/development/python-modules/rawkit/default.nix
Normal file
28
pkgs/development/python-modules/rawkit/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ stdenv, fetchPypi, buildPythonPackage
|
||||
, libraw
|
||||
, pytest, mock }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rawkit";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0vrhrpr70i61y5q5ysk341x1539ff1q1k82g59zq69lv16s0f76s";
|
||||
};
|
||||
|
||||
buildInputs = [ libraw ];
|
||||
|
||||
checkInputs = [ pytest mock ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test tests
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "CTypes based LibRaw bindings for Python";
|
||||
homepage = https://rawkit.readthedocs.org/;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jfrankenau ];
|
||||
};
|
||||
}
|
||||
|
|
@ -23,12 +23,17 @@ in buildPythonPackage rec {
|
|||
buildInputs = [ ft pillow ];
|
||||
|
||||
postPatch = ''
|
||||
rm tests/test_graphics_barcode.py
|
||||
# Remove all the test files that require access to the internet to pass.
|
||||
rm tests/test_lib_utils.py
|
||||
rm tests/test_platypus_general.py
|
||||
|
||||
# Remove the tests that require Vera fonts installed
|
||||
rm tests/test_graphics_render.py
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
LC_ALL="en_US.UTF-8" ${python.interpreter} tests/runAll.py
|
||||
cd tests
|
||||
LC_ALL="en_US.UTF-8" ${python.interpreter} runAll.py
|
||||
'';
|
||||
|
||||
# See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit
|
||||
|
|
@ -38,4 +43,4 @@ in buildPythonPackage rec {
|
|||
description = "An Open Source Python library for generating PDFs and graphics";
|
||||
homepage = http://www.reportlab.com/;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
license = "custom";
|
||||
maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ];
|
||||
platforms = ["x86_64-linux"];
|
||||
platforms = stdenv.lib.platforms.x86;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ with python.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "aws-sam-cli";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4740bfa23f39880d807aa75a2143259f7f15eec34c5fa5dde8fc04d8563ef521";
|
||||
sha256 = "2acf9517f467950adb4939746658091e60cf60ee80093ffd0d3d821cb8a1f9fc";
|
||||
};
|
||||
|
||||
# Tests are not included in the PyPI package
|
||||
|
|
@ -21,13 +21,20 @@ buildPythonApplication rec {
|
|||
boto3
|
||||
click
|
||||
cookiecutter
|
||||
dateparser
|
||||
docker
|
||||
enum34
|
||||
flask
|
||||
python-dateutil
|
||||
pyyaml
|
||||
six
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./requirements/base.txt \
|
||||
--replace 'aws-sam-translator==1.6.0' 'aws-sam-translator>=1.6.0';
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://github.com/awslabs/aws-sam-cli;
|
||||
description = "CLI tool for local development and testing of Serverless applications";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sbt-${version}";
|
||||
version = "1.1.6";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
|
||||
"https://cocl.us/sbt-${version}.tgz"
|
||||
];
|
||||
sha256 = "1hb8gcf3shcp4a65pnlqdlp8j5as7prqvw3d0b5bnfjfi0qbaigm";
|
||||
sha256 = "1rrn0v4bhgar3mrgs931ifggb8kfg23fv5cgvskrdd7iyvg0z9wc";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
24
pkgs/development/tools/golangci-lint/default.nix
Normal file
24
pkgs/development/tools/golangci-lint/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ buildGoPackage, fetchFromGitHub, lib }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "golangci-lint-${version}";
|
||||
version = "1.9.2";
|
||||
goPackagePath = "github.com/golangci/golangci-lint";
|
||||
|
||||
subPackages = [ "cmd/golangci-lint" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golangci";
|
||||
repo = "golangci-lint";
|
||||
rev = "v${version}";
|
||||
sha256 = "0r05j6ayk5778fkd5r1sgcwq675ra0vq82lqs125g70291ryha08";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output.";
|
||||
homepage = https://golangci.com/;
|
||||
license = licenses.agpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.manveru ];
|
||||
};
|
||||
}
|
||||
|
|
@ -34,12 +34,15 @@ stdenv.mkDerivation rec {
|
|||
"--datadir=\${doc}/share"
|
||||
"--mandir=\${man}/share/man"
|
||||
]
|
||||
# jq is linked to libjq:
|
||||
# jq is linked to libjq:
|
||||
++ stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}";
|
||||
|
||||
installCheckPhase = "$bin/bin/jq --help >/dev/null";
|
||||
doInstallCheck = true;
|
||||
doCheck = true;
|
||||
installCheckTarget = "check";
|
||||
|
||||
postInstallCheck = ''
|
||||
$bin/bin/jq --help >/dev/null
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = ''A lightweight and flexible command-line JSON processor'';
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "0.1.30";
|
||||
version = "0.1.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "projectatomic";
|
||||
repo = "skopeo";
|
||||
sha256 = "10lpiiki7mlhrp4bid40wys3lch7fars1whxsa5gy0frfgp89ghn";
|
||||
sha256 = "02z46wxhms8yph03ksl7i4hbqy15v3y1r43js9dxn0a45vxkm7lb";
|
||||
};
|
||||
|
||||
defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "dolphin-emu-${version}";
|
||||
version = "2018-07-02";
|
||||
version = "2018-07-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolphin-emu";
|
||||
repo = "dolphin";
|
||||
rev = "87c5d00e2085090e51c1d44e4fd271437123c722";
|
||||
sha256 = "04f0my5k1vrj3pcg07m6wy4in4cs95db8367bp7zkraparmj1mjk";
|
||||
rev = "7c2d2548a88abf9a5fa0bff52e00c57d093a9e19";
|
||||
sha256 = "0x9h8s6fa04vcdwaqgrd5jpbgadgpkj3m4g2w1mp97libvr7hpy4";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.2.2";
|
||||
version = "6.2.3";
|
||||
name = "seafile-shared-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haiwen";
|
||||
repo = "seafile";
|
||||
rev = "v${version}";
|
||||
sha256 = "05swp7sjp7pzgp8hjjr2prg0wq213l04iyqdfwwasdczdx6j6g59";
|
||||
sha256 = "019q5xsrhl6x8ngy0mzjdakm7m63gxyw8v7a223zwpw0i86l8hms";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ];
|
||||
|
|
|
|||
|
|
@ -1,36 +1,37 @@
|
|||
{ stdenv, fetchurl, pkgconfig, unzip, which
|
||||
, libuuid, attr, xfsprogs, cppunit, rdma-core
|
||||
, zlib, openssl, sqlite, jre, openjdk, ant
|
||||
, openssh, perl, gfortran
|
||||
, openssh, perl, gfortran, influxdb, curl
|
||||
} :
|
||||
|
||||
let
|
||||
version = "6.18";
|
||||
version = "7.0";
|
||||
|
||||
subdirs = [
|
||||
"beeond_thirdparty/build"
|
||||
"beeond_thirdparty_gpl/build"
|
||||
"beegfs_thirdparty/build"
|
||||
"beegfs_opentk_lib/build"
|
||||
"beegfs_common/build"
|
||||
"beegfs_admon/build"
|
||||
"beegfs_java_lib/build"
|
||||
"beegfs_ctl/build"
|
||||
"beegfs_fsck/build"
|
||||
"beegfs_helperd/build"
|
||||
"beegfs_meta/build"
|
||||
"beegfs_mgmtd/build"
|
||||
"beegfs_online_cfg/build"
|
||||
"beegfs_storage/build"
|
||||
"beegfs_utils/build"
|
||||
"thirdparty/build"
|
||||
"opentk_lib/build"
|
||||
"common/build"
|
||||
"admon/build"
|
||||
"java_lib/build"
|
||||
"ctl/build"
|
||||
"fsck/build"
|
||||
"helperd/build"
|
||||
"meta/build"
|
||||
"mgmtd/build"
|
||||
"storage/build"
|
||||
"utils/build"
|
||||
"mon/build"
|
||||
"upgrade/beegfs_mirror_md/build"
|
||||
];
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "beegfs-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.beegfs.com/pub/v6/repository/archive.tar.bz2?ref=${version}";
|
||||
sha256 = "1g874qyxh4v53ah3lzchrqi0jci7wngr54q3f4d9q0kzvvifripn";
|
||||
url = "https://git.beegfs.com/pub/v7/repository/archive.tar.bz2?ref=${version}";
|
||||
sha256 = "1wsljd5ybyhl94aqrdfvcs8a0l8w4pr0bs1vhjrf4y7ldhw35m3k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which unzip pkgconfig cppunit openjdk ant perl ];
|
||||
|
|
@ -45,7 +46,10 @@ in stdenv.mkDerivation rec {
|
|||
jre
|
||||
rdma-core
|
||||
openssh
|
||||
gfortran ];
|
||||
gfortran
|
||||
influxdb
|
||||
curl
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ]; # required for building beeond
|
||||
|
||||
|
|
@ -65,11 +69,13 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
buildPhase = ''
|
||||
for i in ${toString subdirs}; do
|
||||
make -C $i BEEGFS_OPENTK_IBVERBS=1
|
||||
make -C $i BEEGFS_OPENTK_IBVERBS=1 ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
|
||||
done
|
||||
make -C beegfs_admon/build admon_gui BEEGFS_OPENTK_IBVERBS=1
|
||||
make -C admon/build admon_gui BEEGFS_OPENTK_IBVERBS=1
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
binDir=$out/bin
|
||||
docDir=$out/share/doc/beegfs
|
||||
|
|
@ -79,43 +85,45 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
mkdir -p $binDir $libDir $libDirPkg $docDir $includeDir
|
||||
|
||||
cp beegfs_admon/build/beegfs-admon $binDir
|
||||
cp beegfs_admon/build/dist/usr/bin/beegfs-admon-gui $binDir
|
||||
cp beegfs_admon_gui/dist/beegfs-admon-gui.jar $libDirPkg
|
||||
cp beegfs_admon/build/dist/etc/beegfs-admon.conf $docDir
|
||||
cp admon/build/beegfs-admon $binDir
|
||||
cp admon/build/dist/usr/bin/beegfs-admon-gui $binDir
|
||||
cp admon_gui/dist/beegfs-admon-gui.jar $libDirPkg
|
||||
cp admon/build/dist/etc/beegfs-admon.conf $docDir
|
||||
|
||||
cp beegfs_java_lib/build/jbeegfs.jar $libDirPkg
|
||||
cp beegfs_java_lib/build/libjbeegfs.so $libDir
|
||||
cp java_lib/build/jbeegfs.jar $libDirPkg
|
||||
cp java_lib/build/libjbeegfs.so $libDir
|
||||
|
||||
cp beegfs_ctl/build/beegfs-ctl $binDir
|
||||
cp beegfs_fsck/build/beegfs-fsck $binDir
|
||||
cp ctl/build/beegfs-ctl $binDir
|
||||
cp fsck/build/beegfs-fsck $binDir
|
||||
|
||||
cp beegfs_utils/scripts/beegfs-check-servers $binDir
|
||||
cp beegfs_utils/scripts/beegfs-df $binDir
|
||||
cp beegfs_utils/scripts/beegfs-net $binDir
|
||||
cp utils/scripts/beegfs-check-servers $binDir
|
||||
cp utils/scripts/beegfs-df $binDir
|
||||
cp utils/scripts/beegfs-net $binDir
|
||||
|
||||
cp beegfs_helperd/build/beegfs-helperd $binDir
|
||||
cp beegfs_helperd/build/dist/etc/beegfs-helperd.conf $docDir
|
||||
cp helperd/build/beegfs-helperd $binDir
|
||||
cp helperd/build/dist/etc/beegfs-helperd.conf $docDir
|
||||
|
||||
cp beegfs_client_module/build/dist/sbin/beegfs-setup-client $binDir
|
||||
cp beegfs_client_module/build/dist/etc/beegfs-client.conf $docDir
|
||||
cp client_module/build/dist/sbin/beegfs-setup-client $binDir
|
||||
cp client_module/build/dist/etc/beegfs-client.conf $docDir
|
||||
|
||||
cp beegfs_meta/build/beegfs-meta $binDir
|
||||
cp beegfs_meta/build/dist/sbin/beegfs-setup-meta $binDir
|
||||
cp beegfs_meta/build/dist/etc/beegfs-meta.conf $docDir
|
||||
cp meta/build/beegfs-meta $binDir
|
||||
cp meta/build/dist/sbin/beegfs-setup-meta $binDir
|
||||
cp meta/build/dist/etc/beegfs-meta.conf $docDir
|
||||
|
||||
cp beegfs_mgmtd/build/beegfs-mgmtd $binDir
|
||||
cp beegfs_mgmtd/build/dist/sbin/beegfs-setup-mgmtd $binDir
|
||||
cp beegfs_mgmtd/build/dist/etc/beegfs-mgmtd.conf $docDir
|
||||
cp mgmtd/build/beegfs-mgmtd $binDir
|
||||
cp mgmtd/build/dist/sbin/beegfs-setup-mgmtd $binDir
|
||||
cp mgmtd/build/dist/etc/beegfs-mgmtd.conf $docDir
|
||||
|
||||
cp beegfs_storage/build/beegfs-storage $binDir
|
||||
cp beegfs_storage/build/dist/sbin/beegfs-setup-storage $binDir
|
||||
cp beegfs_storage/build/dist/etc/beegfs-storage.conf $docDir
|
||||
cp storage/build/beegfs-storage $binDir
|
||||
cp storage/build/dist/sbin/beegfs-setup-storage $binDir
|
||||
cp storage/build/dist/etc/beegfs-storage.conf $docDir
|
||||
|
||||
cp beegfs_opentk_lib/build/libbeegfs-opentk.so $libDir
|
||||
cp opentk_lib/build/libbeegfs-opentk.so $libDir
|
||||
|
||||
cp beegfs_client_devel/build/dist/usr/share/doc/beegfs-client-devel/examples/* $docDir
|
||||
cp -r beegfs_client_devel/include/* $includeDir
|
||||
cp upgrade/beegfs_mirror_md/build/beegfs-mirror-md $binDir
|
||||
|
||||
cp client_devel/build/dist/usr/share/doc/beegfs-client-devel/examples/* $docDir
|
||||
cp -r client_devel/include/* $includeDir
|
||||
|
||||
cp beeond_thirdparty_gpl/build/parallel $out/bin
|
||||
cp beeond_thirdparty/build/pcopy/p* $out/bin
|
||||
|
|
@ -137,7 +145,8 @@ in stdenv.mkDerivation rec {
|
|||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
beegfs_common/build/test-runner --text
|
||||
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/opentk_lib/build/ \
|
||||
common/build/test-runner --text
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
} :
|
||||
|
||||
let
|
||||
version = "6.18";
|
||||
version = "7.0";
|
||||
in stdenv.mkDerivation {
|
||||
name = "beegfs-module-${version}-${kernel.version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.beegfs.com/pub/v6/repository/archive.tar.bz2?ref=${version}";
|
||||
sha256 = "1g874qyxh4v53ah3lzchrqi0jci7wngr54q3f4d9q0kzvvifripn";
|
||||
url = "https://git.beegfs.com/pub/v7/repository/archive.tar.bz2?ref=${version}";
|
||||
sha256 = "1wsljd5ybyhl94aqrdfvcs8a0l8w4pr0bs1vhjrf4y7ldhw35m3k";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "fortify" "pic" "stackprotector" ];
|
||||
|
|
@ -27,7 +27,7 @@ in stdenv.mkDerivation {
|
|||
find -type f -name "*.mk" -exec sed -i "s:/bin/true:true:" \{} \;
|
||||
'';
|
||||
|
||||
preBuild = "cd beegfs_client_module/build";
|
||||
preBuild = "cd client_module/build";
|
||||
|
||||
installPhase = ''
|
||||
instdir=$out/lib/modules/${kernel.modDirVersion}/extras/fs/beegfs
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "0.74.0";
|
||||
version = "0.74.2";
|
||||
components = {
|
||||
"abode" = ps: with ps; [ ];
|
||||
"ads" = ps: with ps; [ ];
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ let
|
|||
extraBuildInputs = extraPackages py.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "0.74.0";
|
||||
hassVersion = "0.74.2";
|
||||
|
||||
in with py.pkgs; buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
|
|
@ -89,7 +89,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "home-assistant";
|
||||
rev = version;
|
||||
sha256 = "05njkzh4hwz3vbxq2j98znnk8yzs9zkzcd4d99qwcw2hn9kdc385";
|
||||
sha256 = "02wdvkcl4zjw009a5ylblk5blpf5rhlvch8vsg4cx07sj9xgjzmw";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -161,6 +161,15 @@
|
|||
inputs = [ pkgs.pam ];
|
||||
};
|
||||
|
||||
push-stream ={
|
||||
src = fetchFromGitHub {
|
||||
owner = "wandenberg";
|
||||
repo = "nginx-push-stream-module";
|
||||
rev = "0.5.4";
|
||||
sha256 = "0izn7lqrp2zfl738aqa9i8c5lba97wkhcnqg8qbw3ipp5cysb2hr";
|
||||
};
|
||||
};
|
||||
|
||||
rtmp ={
|
||||
src = fetchFromGitHub {
|
||||
owner = "arut";
|
||||
|
|
@ -214,4 +223,23 @@
|
|||
sha256 = "1cjisxw1wykll683nw09k0i1nvzslp4dr59x58cvarpk43paim2y";
|
||||
};
|
||||
};
|
||||
|
||||
upstream-tarantool = {
|
||||
src = fetchFromGitHub {
|
||||
owner = "tarantool";
|
||||
repo = "nginx_upstream_module";
|
||||
rev = "v2.7";
|
||||
sha256 = "05dwj0caj910p7kan2qjvm6x2x601igryhny2xzr47hhsk5q1cnx";
|
||||
};
|
||||
inputs = [ pkgs.msgpuck.dev pkgs.yajl ];
|
||||
};
|
||||
|
||||
vts = {
|
||||
src = fetchFromGitHub {
|
||||
owner = "vozlt";
|
||||
repo = "nginx-module-vts";
|
||||
rev = "v0.1.18";
|
||||
sha256 = "1jq2s9k7hah3b317hfn9y3g1q4g4x58k209psrfsqs718a9sw8c7";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{ coreutils, db, fetchurl, openldap, openssl, pcre, perl, pkgconfig, stdenv
|
||||
, enableLDAP ? false
|
||||
{ coreutils, db, fetchurl, openssl, pcre, perl, pkgconfig, stdenv
|
||||
, enableLDAP ? false, openldap
|
||||
, enableMySQL ? false, mysql, zlib
|
||||
, enableAuthDovecot ? false, dovecot
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -11,10 +13,13 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ coreutils db openssl pcre perl ]
|
||||
++ stdenv.lib.optional enableLDAP openldap;
|
||||
buildInputs = [ coreutils db openssl perl pcre ]
|
||||
++ stdenv.lib.optional enableLDAP openldap
|
||||
++ stdenv.lib.optionals enableMySQL [ mysql zlib ]
|
||||
++ stdenv.lib.optional enableAuthDovecot dovecot;
|
||||
|
||||
preBuild = ''
|
||||
${stdenv.lib.optionalString enableMySQL "PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${mysql}/share/mysql/pkgconfig/"}
|
||||
sed '
|
||||
s:^\(BIN_DIRECTORY\)=.*:\1='"$out"'/bin:
|
||||
s:^\(CONFIGURE_FILE\)=.*:\1=/etc/exim.conf:
|
||||
|
|
@ -39,8 +44,19 @@ stdenv.mkDerivation rec {
|
|||
${stdenv.lib.optionalString enableLDAP ''
|
||||
s:^# \(LDAP_LIB_TYPE=OPENLDAP2\)$:\1:
|
||||
s:^# \(LOOKUP_LDAP=yes\)$:\1:
|
||||
s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lldap:
|
||||
s:^# \(LOOKUP_LIBS\)=.*:\1=-lldap:
|
||||
''}
|
||||
${stdenv.lib.optionalString enableMySQL ''
|
||||
s:^# \(LOOKUP_MYSQL=yes\)$:\1:
|
||||
s:^# \(LOOKUP_MYSQL_PC=mariadb\)$:\1:
|
||||
s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient:
|
||||
s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient:
|
||||
s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${mysql}/include/mysql/:
|
||||
''}
|
||||
${stdenv.lib.optionalString enableAuthDovecot ''
|
||||
s:^# \(AUTH_DOVECOT\)=.*:\1=yes:
|
||||
''}
|
||||
#/^\s*#.*/d
|
||||
#/^\s*$/d
|
||||
' < src/EDITME > Local/Makefile
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name= "nextcloud-${version}";
|
||||
version = "13.0.4";
|
||||
version = "13.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
|
||||
sha256 = "18d514145fcddc86f48d0a5fa4a0d4b07617135a1b23107137a6ea3ed519bd54";
|
||||
sha256 = "1sl0kvn52m6p7rglwhgfb737y1897897hc5g2fcbg6i594ld6451";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,19 +1,25 @@
|
|||
{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, libsodium, lzma }:
|
||||
{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libsodium
|
||||
, llvmPackages, clang_39, lzma }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
name = "rdedup-${version}";
|
||||
version = "2.0.0";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dpc";
|
||||
repo = "rdedup";
|
||||
rev = "v${version}";
|
||||
sha256 = "14r6x1wi5mwadarm0vp6qnr5mykv4g0kxz9msq76fhwghwb9k1d9";
|
||||
rev = "e0f26f379a434f76d238c7a5fa6ddd8ae8b32f19";
|
||||
sha256 = "1nhf8ap0w99aa1h0l599cx90lcvfvjaj67nw9flq9bmmzpn53kp9";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig libsodium lzma ];
|
||||
cargoSha256 = "1x6wchlcxb1frww6y04gfx4idxv9h0g9qfxrhgb6g5qy3bqhqq3p";
|
||||
|
||||
cargoSha256 = "0wyswc4b4hkiw20gz0w94vv1qgcb2zq0cdaj9zxvyr5l0abxip9w";
|
||||
nativeBuildInputs = [ pkgconfig llvmPackages.libclang clang_39 ];
|
||||
buildInputs = [ openssl libsodium lzma ];
|
||||
|
||||
configurePhase = ''
|
||||
export LIBCLANG_PATH="${llvmPackages.libclang}/lib"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Data deduplication with compression and public key encryption";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, perl }:
|
||||
{ stdenv, fetchFromGitHub, substituteAll, perl, file, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "lesspipe-${version}";
|
||||
|
|
@ -14,6 +14,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0vb7bpap8vy003ha10hc7hxl17y47sgdnrjpihgqxkn8k0bfqbbq";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
file = "${file}/bin/file";
|
||||
tput = "${ncurses}/bin/tput";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A preprocessor for less";
|
||||
longDescription = ''
|
||||
|
|
|
|||
22
pkgs/tools/misc/lesspipe/fix-paths.patch
Normal file
22
pkgs/tools/misc/lesspipe/fix-paths.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
--- a/lesspipe.sh.in
|
||||
+++ b/lesspipe.sh.in
|
||||
@@ -48,8 +48,8 @@ if [[ "$LESS_ADVANCED_PREPROCESSOR" = '' ]]; then
|
||||
fi
|
||||
|
||||
filecmd() {
|
||||
- file -L -s "$@"
|
||||
- file -L -s -i "$@" 2> /dev/null | sed -n 's/.*charset=/;/p' | tr a-z A-Z
|
||||
+ @file@ -L -s "$@"
|
||||
+ @file@ -L -s -i "$@" 2> /dev/null | sed -n 's/.*charset=/;/p' | tr a-z A-Z
|
||||
}
|
||||
|
||||
sep=: # file name separator
|
||||
@@ -546,7 +546,7 @@ isfinal() {
|
||||
|
||||
# color requires -r or -R when calling less
|
||||
typeset COLOR
|
||||
- if [[ $(tput colors) -ge 8 && ("$LESS" = *-*r* || "$LESS" = *-*R*) ]]; then
|
||||
+ if [[ $(@tput@ colors) -ge 8 && ("$LESS" = *-*r* || "$LESS" = *-*R*) ]]; then
|
||||
COLOR="--color=always"
|
||||
fi
|
||||
|
||||
54
pkgs/tools/package-management/nix-top/default.nix
Normal file
54
pkgs/tools/package-management/nix-top/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, ruby
|
||||
, makeWrapper
|
||||
, getent # /etc/passwd
|
||||
, ncurses # tput
|
||||
, procps # ps
|
||||
, binutils-unwrapped # strings
|
||||
, coreutils
|
||||
, findutils
|
||||
}:
|
||||
|
||||
# No gems used, so mkDerivation is fine.
|
||||
let
|
||||
additionalPath = lib.makeBinPath [ getent ncurses binutils-unwrapped coreutils findutils ];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nix-top-${version}";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "samueldr";
|
||||
repo = "nix-top";
|
||||
rev = "v${version}";
|
||||
sha256 = "0560a9g8n4p764r3va1nn95iv4bg71g8h0wws1af2p5g553j4zps";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ruby
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/libexec/nix-top
|
||||
install -D -m755 ./nix-top $out/bin/nix-top
|
||||
wrapProgram $out/bin/nix-top \
|
||||
--prefix PATH : "$out/libexec/nix-top:${additionalPath}"
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
ln -s /bin/stty $out/libexec/nix-top
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tracks what nix is building";
|
||||
homepage = https://github.com/samueldr/nix-top;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ samueldr ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
name = "proselint-${version}";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
doCheck = false; # fails to pass because it tries to run in home directory
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/p/proselint/${name}.tar.gz";
|
||||
sha256 = "1g8vx04gmv0agmggz1ml5vydfppqvl8dzjvqm6vqw5rzafa89m08";
|
||||
sha256 = "1fibk24fx00bfn0z4iikcv519cz2nkcil9k187sf3adb2ldzg4ab";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click future six ];
|
||||
|
|
|
|||
|
|
@ -8330,6 +8330,8 @@ with pkgs;
|
|||
|
||||
msgpack-tools = callPackage ../development/tools/msgpack-tools { };
|
||||
|
||||
msgpuck = callPackage ../development/libraries/msgpuck { };
|
||||
|
||||
msitools = callPackage ../development/tools/misc/msitools { };
|
||||
|
||||
multi-ghc-travis = haskell.lib.justStaticExecutables haskellPackages.multi-ghc-travis;
|
||||
|
|
@ -9825,6 +9827,8 @@ with pkgs;
|
|||
emscripten = emscripten.override {python=python2;};
|
||||
};
|
||||
|
||||
jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { };
|
||||
|
||||
libjson = callPackage ../development/libraries/libjson { };
|
||||
|
||||
libb64 = callPackage ../development/libraries/libb64 { };
|
||||
|
|
@ -14205,6 +14209,8 @@ with pkgs;
|
|||
|
||||
golint = callPackage ../development/tools/golint { };
|
||||
|
||||
golangci-lint = callPackage ../development/tools/golangci-lint { };
|
||||
|
||||
godef = callPackage ../development/tools/godef { };
|
||||
|
||||
goimports = callPackage ../development/tools/goimports { };
|
||||
|
|
@ -15017,6 +15023,8 @@ with pkgs;
|
|||
|
||||
theano = callPackage ../data/fonts/theano { };
|
||||
|
||||
template-glib = callPackage ../development/libraries/template-glib { };
|
||||
|
||||
tempora_lgc = callPackage ../data/fonts/tempora-lgc { };
|
||||
|
||||
terminus_font = callPackage ../data/fonts/terminus-font { };
|
||||
|
|
@ -18037,6 +18045,8 @@ with pkgs;
|
|||
|
||||
rapcad = libsForQt5.callPackage ../applications/graphics/rapcad { boost = boost159; };
|
||||
|
||||
rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { };
|
||||
|
||||
rapidsvn = callPackage ../applications/version-management/rapidsvn { };
|
||||
|
||||
ratmen = callPackage ../tools/X11/ratmen {};
|
||||
|
|
@ -21367,6 +21377,8 @@ with pkgs;
|
|||
|
||||
nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; };
|
||||
|
||||
nix-top = callPackage ../tools/package-management/nix-top { };
|
||||
|
||||
nix-repl = callPackage ../tools/package-management/nix-repl { nix = nix1; };
|
||||
|
||||
nix-review = callPackage ../tools/package-management/nix-review { };
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ with pkgs;
|
|||
|
||||
runCommand "nixpkgs-metrics"
|
||||
{ buildInputs = [ nix time ];
|
||||
# requiredSystemFeatures = [ "benchmark" ]; # TODO: a 1-job machine for this on Hydra?
|
||||
requiredSystemFeatures = [ "benchmark" ];
|
||||
}
|
||||
''
|
||||
export NIX_DB_DIR=$TMPDIR
|
||||
|
|
|
|||
|
|
@ -2211,6 +2211,8 @@ in {
|
|||
|
||||
easydict = callPackage ../development/python-modules/easydict { };
|
||||
|
||||
easygui = callPackage ../development/python-modules/easygui { };
|
||||
|
||||
EasyProcess = callPackage ../development/python-modules/easyprocess { };
|
||||
|
||||
easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { };
|
||||
|
|
@ -2546,6 +2548,8 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
fluent-logger = callPackage ../development/python-modules/fluent-logger {};
|
||||
|
||||
python-forecastio = callPackage ../development/python-modules/python-forecastio { };
|
||||
|
||||
fpdf = callPackage ../development/python-modules/fpdf { };
|
||||
|
|
@ -3947,6 +3951,8 @@ in {
|
|||
|
||||
pylama = callPackage ../development/python-modules/pylama { };
|
||||
|
||||
pymediainfo = callPackage ../development/python-modules/pymediainfo { };
|
||||
|
||||
pyphen = callPackage ../development/python-modules/pyphen {};
|
||||
|
||||
pypoppler = buildPythonPackage rec {
|
||||
|
|
@ -4011,6 +4017,8 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
pyprind = callPackage ../development/python-modules/pyprind { };
|
||||
|
||||
python-axolotl = callPackage ../development/python-modules/python-axolotl { };
|
||||
|
||||
python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { };
|
||||
|
|
@ -4198,6 +4206,8 @@ in {
|
|||
|
||||
raven = callPackage ../development/python-modules/raven { };
|
||||
|
||||
rawkit = callPackage ../development/python-modules/rawkit { };
|
||||
|
||||
rethinkdb = buildPythonPackage rec {
|
||||
name = "rethinkdb-${version}";
|
||||
version = "2.3.0.post6";
|
||||
|
|
@ -6159,6 +6169,10 @@ in {
|
|||
|
||||
gpgme = toPythonModule (pkgs.gpgme.override { withPython=true; });
|
||||
|
||||
gphoto2 = callPackage ../development/python-modules/gphoto2 {
|
||||
inherit (pkgs) pkgconfig;
|
||||
};
|
||||
|
||||
grammalecte = callPackage ../development/python-modules/grammalecte { };
|
||||
|
||||
greenlet = callPackage ../development/python-modules/greenlet { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue