mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 07:23:20 +00:00
Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
9618abe87c
@ -2,8 +2,8 @@
|
||||
let
|
||||
lib = pkgs.lib;
|
||||
locationsXml = import ./lib-function-locations.nix { inherit pkgs nixpkgs; };
|
||||
in
|
||||
pkgs.stdenv.mkDerivation {
|
||||
functionDocs = import ./lib-function-docs.nix { inherit locationsXml pkgs; };
|
||||
in pkgs.stdenv.mkDerivation {
|
||||
name = "nixpkgs-manual";
|
||||
|
||||
buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing xmlformat ];
|
||||
@ -32,6 +32,7 @@ pkgs.stdenv.mkDerivation {
|
||||
postPatch = ''
|
||||
rm -rf ./functions/library/locations.xml
|
||||
ln -s ${locationsXml} ./functions/library/locations.xml
|
||||
ln -s ${functionDocs} ./functions/library/generated
|
||||
echo ${lib.version} > .version
|
||||
'';
|
||||
|
||||
|
||||
@ -12,4 +12,13 @@
|
||||
<xi:include href="./library/asserts.xml" />
|
||||
|
||||
<xi:include href="./library/attrsets.xml" />
|
||||
|
||||
<!-- These docs are generated via nixdoc. To add another generated
|
||||
library function file to this list, the file
|
||||
`lib-function-docs.nix` must also be updated. -->
|
||||
<xi:include href="./library/generated/strings.xml" />
|
||||
<xi:include href="./library/generated/trivial.xml" />
|
||||
<xi:include href="./library/generated/lists.xml" />
|
||||
<xi:include href="./library/generated/debug.xml" />
|
||||
<xi:include href="./library/generated/options.xml" />
|
||||
</section>
|
||||
|
||||
26
doc/lib-function-docs.nix
Normal file
26
doc/lib-function-docs.nix
Normal file
@ -0,0 +1,26 @@
|
||||
# Generates the documentation for library functons via nixdoc. To add
|
||||
# another library function file to this list, the include list in the
|
||||
# file `doc/functions/library.xml` must also be updated.
|
||||
|
||||
{ pkgs ? import ./.. {}, locationsXml }:
|
||||
|
||||
with pkgs; stdenv.mkDerivation {
|
||||
name = "nixpkgs-lib-docs";
|
||||
src = ./../lib;
|
||||
|
||||
buildInputs = [ nixdoc ];
|
||||
installPhase = ''
|
||||
function docgen {
|
||||
nixdoc -c "$1" -d "$2" -f "../lib/$1.nix" > "$out/$1.xml"
|
||||
}
|
||||
|
||||
mkdir -p $out
|
||||
ln -s ${locationsXml} $out/locations.xml
|
||||
|
||||
docgen strings 'String manipulation functions'
|
||||
docgen trivial 'Miscellaneous functions'
|
||||
docgen lists 'List manipulation functions'
|
||||
docgen debug 'Debugging functions'
|
||||
docgen options 'NixOS / nixpkgs option handling'
|
||||
'';
|
||||
}
|
||||
@ -1750,6 +1750,11 @@
|
||||
github = "hamhut1066";
|
||||
name = "Hamish Hutchings";
|
||||
};
|
||||
hansjoergschurr = {
|
||||
email = "commits@schurr.at";
|
||||
github = "hansjoergschurr";
|
||||
name = "Hans-Jörg Schurr";
|
||||
};
|
||||
haslersn = {
|
||||
email = "haslersn@fius.informatik.uni-stuttgart.de";
|
||||
github = "haslersn";
|
||||
@ -3911,6 +3916,10 @@
|
||||
github = "fkz";
|
||||
name = "Fabian Schmitthenner";
|
||||
};
|
||||
schmittlauch = {
|
||||
email = "t.schmittlauch+nixos@orlives.de";
|
||||
github = "schmittlauch";
|
||||
};
|
||||
schneefux = {
|
||||
email = "schneefux+nixos_pkg@schneefux.xyz";
|
||||
github = "schneefux";
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
, e2fsprogs
|
||||
, libfaketime
|
||||
, perl
|
||||
, lkl
|
||||
}:
|
||||
|
||||
let
|
||||
@ -18,16 +19,13 @@ in
|
||||
pkgs.stdenv.mkDerivation {
|
||||
name = "ext4-fs.img";
|
||||
|
||||
nativeBuildInputs = [e2fsprogs.bin libfaketime perl];
|
||||
nativeBuildInputs = [e2fsprogs.bin libfaketime perl lkl];
|
||||
|
||||
buildCommand =
|
||||
''
|
||||
# Add the closures of the top-level store objects.
|
||||
storePaths=$(cat ${sdClosureInfo}/store-paths)
|
||||
|
||||
# Also include a manifest of the closures in a format suitable for nix-store --load-db.
|
||||
cp ${sdClosureInfo}/registration nix-path-registration
|
||||
|
||||
# Make a crude approximation of the size of the target image.
|
||||
# If the script starts failing, increase the fudge factors here.
|
||||
numInodes=$(find $storePaths | wc -l)
|
||||
@ -38,55 +36,16 @@ pkgs.stdenv.mkDerivation {
|
||||
truncate -s $bytes $out
|
||||
faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U ${uuid} $out
|
||||
|
||||
# Populate the image contents by piping a bunch of commands to the `debugfs` tool from e2fsprogs.
|
||||
# For example, to copy /nix/store/abcd...efg-coreutils-8.23/bin/sleep:
|
||||
# cd /nix/store/abcd...efg-coreutils-8.23/bin
|
||||
# write /nix/store/abcd...efg-coreutils-8.23/bin/sleep sleep
|
||||
# sif sleep mode 040555
|
||||
# sif sleep gid 30000
|
||||
# In particular, debugfs doesn't handle absolute target paths; you have to 'cd' in the virtual
|
||||
# filesystem first. Likewise the intermediate directories must already exist (using `find`
|
||||
# handles that for us). And when setting the file's permissions, the inode type flags (__S_IFDIR,
|
||||
# __S_IFREG) need to be set as well.
|
||||
(
|
||||
echo write nix-path-registration nix-path-registration
|
||||
echo mkdir nix
|
||||
echo cd /nix
|
||||
echo mkdir store
|
||||
# Also include a manifest of the closures in a format suitable for nix-store --load-db.
|
||||
cp ${sdClosureInfo}/registration nix-path-registration
|
||||
cptofs -t ext4 -i $out nix-path-registration /
|
||||
|
||||
# XXX: This explodes in exciting ways if anything in /nix/store has a space in it.
|
||||
find $storePaths -printf '%y %f %h %m\n'| while read -r type file dir perms; do
|
||||
# echo "TYPE=$type DIR=$dir FILE=$file PERMS=$perms" >&2
|
||||
# Create nix/store before copying paths
|
||||
faketime -f "1970-01-01 00:00:01" mkdir -p nix/store
|
||||
cptofs -t ext4 -i $out nix /
|
||||
|
||||
echo "cd $dir"
|
||||
case $type in
|
||||
d)
|
||||
echo "mkdir $file"
|
||||
echo sif $file mode $((040000 | 0$perms)) # magic constant is __S_IFDIR
|
||||
;;
|
||||
f)
|
||||
echo "write $dir/$file $file"
|
||||
echo sif $file mode $((0100000 | 0$perms)) # magic constant is __S_IFREG
|
||||
;;
|
||||
l)
|
||||
echo "symlink $file $(readlink "$dir/$file")"
|
||||
;;
|
||||
*)
|
||||
echo "Unknown entry: $type $dir $file $perms" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
echo sif $file gid 30000 # chgrp to nixbld
|
||||
done
|
||||
) | faketime -f "1970-01-01 00:00:01" debugfs -w $out -f /dev/stdin > errorlog 2>&1
|
||||
|
||||
# The debugfs tool doesn't terminate on error nor exit with a non-zero status. Check manually.
|
||||
if egrep -q 'Could not allocate|File not found' errorlog; then
|
||||
cat errorlog
|
||||
echo "--- Failed to create EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---"
|
||||
return 1
|
||||
fi
|
||||
echo "copying store paths to image..."
|
||||
cptofs -t ext4 -i $out $storePaths /nix/store/
|
||||
|
||||
# I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build.
|
||||
if ! fsck.ext4 -n -f $out; then
|
||||
|
||||
@ -7,11 +7,18 @@ let
|
||||
swayPackage = pkgs.sway;
|
||||
|
||||
swayWrapped = pkgs.writeShellScriptBin "sway" ''
|
||||
if [[ "$#" -ge 1 ]]; then
|
||||
set -o errexit
|
||||
|
||||
if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then
|
||||
export _SWAY_WRAPPER_ALREADY_EXECUTED=1
|
||||
${cfg.extraSessionCommands}
|
||||
fi
|
||||
|
||||
if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then
|
||||
export DBUS_SESSION_BUS_ADDRESS
|
||||
exec sway-setcap "$@"
|
||||
else
|
||||
${cfg.extraSessionCommands}
|
||||
exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
|
||||
exec ${pkgs.dbus}/bin/dbus-run-session sway-setcap "$@"
|
||||
fi
|
||||
'';
|
||||
swayJoined = pkgs.symlinkJoin {
|
||||
|
||||
@ -33,6 +33,7 @@ let
|
||||
tor = import ./exporters/tor.nix { inherit config lib pkgs; };
|
||||
unifi = import ./exporters/unifi.nix { inherit config lib pkgs; };
|
||||
varnish = import ./exporters/varnish.nix { inherit config lib pkgs; };
|
||||
bind = import ./exporters/bind.nix { inherit config lib pkgs; };
|
||||
};
|
||||
|
||||
mkExporterOpts = ({ name, port }: {
|
||||
|
||||
@ -0,0 +1,55 @@
|
||||
{ config, lib, pkgs }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.bind;
|
||||
in
|
||||
{
|
||||
port = 9119;
|
||||
extraOpts = {
|
||||
bindURI = mkOption {
|
||||
type = types.str;
|
||||
default = "http://localhost:8053/";
|
||||
description = ''
|
||||
HTTP XML API address of an Bind server.
|
||||
'';
|
||||
};
|
||||
bindTimeout = mkOption {
|
||||
type = types.str;
|
||||
default = "10s";
|
||||
description = ''
|
||||
Timeout for trying to get stats from Bind.
|
||||
'';
|
||||
};
|
||||
bindVersion = mkOption {
|
||||
type = types.enum [ "xml.v2" "xml.v3" "auto" ];
|
||||
default = "auto";
|
||||
description = ''
|
||||
BIND statistics version. Can be detected automatically.
|
||||
'';
|
||||
};
|
||||
bindGroups = mkOption {
|
||||
type = types.listOf (types.enum [ "server" "view" "tasks" ]);
|
||||
default = [ "server" "view" ];
|
||||
description = ''
|
||||
List of statistics to collect. Available: [server, view, tasks]
|
||||
'';
|
||||
};
|
||||
};
|
||||
serviceOpts = {
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-bind-exporter}/bin/bind_exporter \
|
||||
-web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
|
||||
-bind.pid-file /var/run/named/named.pid \
|
||||
-bind.timeout ${toString cfg.bindTimeout} \
|
||||
-bind.stats-url ${cfg.bindURI} \
|
||||
-bind.stats-version ${cfg.bindVersion} \
|
||||
-bind.stats-groups ${concatStringsSep "," cfg.bindGroups} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -106,6 +106,25 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
bind = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
};
|
||||
metricProvider = {
|
||||
services.bind.enable = true;
|
||||
services.bind.extraConfig = ''
|
||||
statistics-channels {
|
||||
inet 127.0.0.1 port 8053 allow { localhost; };
|
||||
};
|
||||
'';
|
||||
};
|
||||
exporterTest = ''
|
||||
waitForUnit("prometheus-bind-exporter.service");
|
||||
waitForOpenPort(9119);
|
||||
succeed("curl -sSf http://localhost:9119/metrics" | grep -q 'bind_query_recursions_total 0');
|
||||
'';
|
||||
};
|
||||
|
||||
dovecot = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
|
||||
@ -28,7 +28,7 @@ assert withOnlineServices -> withTaglib;
|
||||
assert withReplaygain -> withTaglib;
|
||||
|
||||
let
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
pname = "cantata";
|
||||
fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
|
||||
fstats = x: map (fstat x);
|
||||
@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
|
||||
owner = "CDrummond";
|
||||
repo = "cantata";
|
||||
rev = "v${version}";
|
||||
sha256 = "11hjday5vj0wzkc8yb5wbs05jwa8mvgxswd5qvhpci0zkl975yzn";
|
||||
sha256 = "1m651fmdbnb50glym75kzma0bllvqbmrb2afp1g9g5cxm1898c0f";
|
||||
};
|
||||
|
||||
buildInputs = [ vlc qtbase qtmultimedia qtsvg ]
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gpodder";
|
||||
version = "3.10.5";
|
||||
version = "3.10.6";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gpodder";
|
||||
repo = "gpodder";
|
||||
rev = version;
|
||||
sha256 = "00lvma40d62h4haybabh15x1y7rnmd84whbjgjv773igwagkn9vw";
|
||||
sha256 = "11nccsnlxrj8wwl8dyz9a0yrzma6ipx5gwj2lc7m308z60r8wvjs";
|
||||
};
|
||||
|
||||
postPatch = with stdenv.lib; ''
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "lollypop";
|
||||
version = "0.9.908";
|
||||
version = "0.9.909";
|
||||
|
||||
format = "other";
|
||||
doCheck = false;
|
||||
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
url = "https://gitlab.gnome.org/World/lollypop";
|
||||
rev = "refs/tags/${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "0sjhp0lw41qdp5jah9shq69ga43rkxi3vijm57x8w147nj87ch7c";
|
||||
sha256 = "19d82dy0wprabg5kzcgs3ydmp9iz3h437n55cnlp20mbpya09k7n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "mopidy";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mopidy";
|
||||
repo = "mopidy";
|
||||
rev = "v${version}";
|
||||
sha256 = "012gg6x6d27adbfnwd4a607dl49bzk74az6h9djfvl2w0rbxzhhr";
|
||||
sha256 = "01vl162c7ssf69b0m65ys9fxnsqnfa1whwbprnc063lkcnrnlkr1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
@ -45,13 +45,13 @@ let
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "pulseeffects";
|
||||
version = "4.4.4";
|
||||
version = "4.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwmm";
|
||||
repo = "pulseeffects";
|
||||
rev = "v${version}";
|
||||
sha256 = "02h237c3l55ky7gl0mmd6qqp5zagbrqa39rii33s5pspvxi9rj3s";
|
||||
sha256 = "1dcly8rzbfnfqrl7biicbixdqgqazrwa4x8l3m3r8f4bf3sqpmhd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -18,9 +18,9 @@ let
|
||||
sha256Hash = "1rql4kxjic4qjcd8zssw2mmi55cxpzd0wp5g0kzwk5wybsfdcqhy";
|
||||
};
|
||||
latestVersion = { # canary & dev
|
||||
version = "3.4.0.8"; # "Android Studio 3.4 Canary 9"
|
||||
build = "183.5186062";
|
||||
sha256Hash = "04i7ys0qzj3039h41q4na6737gl55wpp6hiwfas2h6zwvj25a9z9";
|
||||
version = "3.4.0.9"; # "Android Studio 3.4 Canary 10"
|
||||
build = "183.5202479";
|
||||
sha256Hash = "067mkf8n7bwv0f900d6d2hwxdhcgnp6dxqf6v81y1hf285ybymld";
|
||||
};
|
||||
in rec {
|
||||
# Old alias
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "focuswriter-${version}";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
|
||||
sha256 = "0321wqhjfs020q113lgh959qq03zfamm72zk22mnqxf3ng3adc3g";
|
||||
sha256 = "0ny0bri9yp6wcsj9s8vd0j4mzx44yw57axjx5piv44q2jgsgz401";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig qmake qttools ];
|
||||
|
||||
@ -13,8 +13,8 @@ let
|
||||
else throw "ImageMagick is not supported on this platform.";
|
||||
|
||||
cfg = {
|
||||
version = "7.0.8-14";
|
||||
sha256 = "0pbrmzsjc8l4klfsz739rnmw61m712r82ryjl8ycvbxdzxwnwm9v";
|
||||
version = "7.0.8-22";
|
||||
sha256 = "1ivljgf192xh7pq1apdic923pvcb3aq74mx8d4hi65hhc9748gv7";
|
||||
patches = [];
|
||||
};
|
||||
in
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "goxel-${version}";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guillaumechereau";
|
||||
repo = "goxel";
|
||||
rev = "v${version}";
|
||||
sha256 = "0g6jkihjmsx6lyfl301qrq26gwvq89sk7xkkba6vrpklfs2jafkb";
|
||||
sha256 = "14rycn6sd3wp90c9ghpif1al3rv1fdgvhmpldmwap0pk790kfxs1";
|
||||
};
|
||||
|
||||
patches = [ ./disable-imgui_ini.patch ];
|
||||
|
||||
@ -93,6 +93,7 @@ let
|
||||
kcalc = callPackage ./kcalc.nix {};
|
||||
kcalcore = callPackage ./kcalcore.nix {};
|
||||
kcalutils = callPackage ./kcalutils.nix {};
|
||||
kcharselect = callPackage ./kcharselect.nix {};
|
||||
kcolorchooser = callPackage ./kcolorchooser.nix {};
|
||||
kcontacts = callPackage ./kcontacts.nix {};
|
||||
kdav = callPackage ./kdav.nix {};
|
||||
|
||||
19
pkgs/applications/kde/kcharselect.nix
Normal file
19
pkgs/applications/kde/kcharselect.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, kdoctools,
|
||||
kbookmarks, kconfig, kconfigwidgets, kcrash, kcoreaddons, ki18n, kwidgetsaddons, kxmlgui
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
name = "kcharselect";
|
||||
meta = {
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.schmittlauch ];
|
||||
description = "A tool to select special characters from all installed fonts and copy them into the clipboard";
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
kbookmarks kconfig kconfigwidgets kcoreaddons kcrash ki18n kwidgetsaddons kxmlgui
|
||||
];
|
||||
enableParallelBuilding = true;
|
||||
}
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "CopyQ-${version}";
|
||||
version = "3.7.1";
|
||||
version = "3.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hluk";
|
||||
repo = "CopyQ";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b3lrhrffvq46n9xc0lzbxhhn1lzmq2lrijjdwizc52458d6h90y";
|
||||
sha256 = "1f2q9lzs5z31rl689ai2hig4nrj8cg9g25hhsrj6r85q9vkwkqjs";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, conf ? null }:
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, ncurses, conf ? null }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
@ -17,9 +17,16 @@ stdenv.mkDerivation rec {
|
||||
preBuild = optionalString (conf!=null) "cp ${configFile} nnn.h";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ ncurses readline ];
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
|
||||
makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ];
|
||||
|
||||
# shell completions
|
||||
postInstall = ''
|
||||
install -Dm555 scripts/auto-completion/bash/nnn-completion.bash $out/share/bash-completion/completions/nnn.bash
|
||||
install -Dm555 scripts/auto-completion/zsh/_nnn -t $out/share/zsh/site-functions
|
||||
install -Dm555 scripts/auto-completion/fish/nnn.fish -t $out/share/fish/vendor_completions.d
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Small ncurses-based file browser forked from noice";
|
||||
|
||||
@ -76,11 +76,11 @@ let rpath = lib.makeLibraryPath [
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "0.57.18";
|
||||
version = "0.58.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "0p5j3kkkalnyi6brgd9vfv43is00g2b6p1y3hajjr2vbm9iwpzg7";
|
||||
sha256 = "0xybcgsxjmd8bxi4x4midzw71s23j8icpspqf5sadskhldvshzr3";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, freetype, fontconfig, libXft, libXrender, libxcb, expat
|
||||
, libuuid
|
||||
, gstreamer, gst-plugins-base, libxml2
|
||||
, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome2
|
||||
, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, at-spi2-core, gnome2
|
||||
, nss, nspr
|
||||
, patchelf, makeWrapper
|
||||
, proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
|
||||
@ -13,11 +13,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${product}-${version}";
|
||||
product = "vivaldi";
|
||||
version = "2.1.1337.51-1";
|
||||
version = "2.2.1388.37-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
|
||||
sha256 = "00rxp6rardxjg17g2b28y2rj8szqlainp4ga6c58z981zkxvdlls";
|
||||
sha256 = "07q04lvwnjn5kprlwyndv9h2s25637ngchch26ka8lry1lxkdv55";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
|
||||
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
|
||||
atk at-spi2-atk alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd
|
||||
atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd
|
||||
freetype fontconfig libXrender libuuid expat glib nss nspr
|
||||
gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf
|
||||
] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;
|
||||
|
||||
@ -1,23 +1,23 @@
|
||||
{ stdenv, fetchurl
|
||||
, dbus-glib, gtk3, libexif, libXScrnSaver, ninja, nss
|
||||
, pciutils, pkgconfig, python2, xdg_utils, gn
|
||||
, pciutils, pkgconfig, python2, xdg_utils, gn, at-spi2-core
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${product}-${version}";
|
||||
product = "vivaldi-ffmpeg-codecs";
|
||||
version = "70.0.3538.77";
|
||||
version = "71.0.3578.98";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
|
||||
sha512 = "128hvkcbyw70j31dj4jviqqjrzyfx38689nb8v0kk5vi2zlgfy5ibz2gyrv4bvrb53ld262y9pvam51nbdmrx2vqd9xrs173py7v0a0";
|
||||
sha512 = "3baldqqdm8jzrs37w756ijgzwpmvma73rqbpnfkf0j41rmikrjdl6w7ycll98jch8rhzpgz3yfb9nk0gmsgxs233wn441bcdkhr1syv";
|
||||
};
|
||||
|
||||
buildInputs = [ ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gtk3 libexif libXScrnSaver ninja nss pciutils python2 xdg_utils gn
|
||||
pkgconfig dbus-glib
|
||||
pkgconfig dbus-glib at-spi2-core.dev
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
{ stdenv, fetchurl, dpkg, makeDesktopItem, gnome2, gtk2, atk, cairo, pango, gdk_pixbuf, glib
|
||||
, freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi, libXcursor, libXdamage
|
||||
, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver
|
||||
, nss, nspr, alsaLib, cups, expat, udev, xdg_utils, hunspell, pulseaudio, pciutils
|
||||
{ stdenv, fetchurl, dpkg, makeDesktopItem, libuuid, gtk3, atk, cairo, pango
|
||||
, gdk_pixbuf, glib, freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi
|
||||
, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes
|
||||
, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev
|
||||
, xdg_utils, hunspell, pulseaudio, pciutils, at-spi2-atk
|
||||
}:
|
||||
let
|
||||
rpath = stdenv.lib.makeLibraryPath [
|
||||
@ -15,9 +16,10 @@ let
|
||||
freetype
|
||||
gdk_pixbuf
|
||||
glib
|
||||
gnome2.GConf
|
||||
gtk2
|
||||
gtk3
|
||||
at-spi2-atk
|
||||
hunspell
|
||||
libuuid
|
||||
libnotify
|
||||
libX11
|
||||
libXcomposite
|
||||
@ -41,7 +43,7 @@ let
|
||||
xorg.libxcb
|
||||
];
|
||||
|
||||
version = "3.3.2872";
|
||||
version = "3.5.2881";
|
||||
|
||||
plat = {
|
||||
"i686-linux" = "i386";
|
||||
@ -49,8 +51,8 @@ let
|
||||
}.${stdenv.hostPlatform.system};
|
||||
|
||||
sha256 = {
|
||||
"i686-linux" = "16dw4ycajxviqrf4i32rkrhg1j1mdkmk252y8vjwr18xlyn958qb";
|
||||
"x86_64-linux" = "04ysk91h2izyb41b243zki4j08bis9yzjq2va9bakp1lv6ywm8pw";
|
||||
"i686-linux" = "0s5j6acsiymsikvah9f1ywandzvcdx5m8csrc7ymhv0gx2a9xm1d";
|
||||
"x86_64-linux" = "17siis4xws27jmhf1gyb6cvip6clak27zxckyk0b312kkc4q363i";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
|
||||
in
|
||||
|
||||
@ -3,24 +3,20 @@
|
||||
let
|
||||
common = { stname, target, postInstall ? "" }:
|
||||
buildGoPackage rec {
|
||||
version = "0.14.54";
|
||||
version = "1.0.0";
|
||||
name = "${stname}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syncthing";
|
||||
repo = "syncthing";
|
||||
rev = "v${version}";
|
||||
sha256 = "0l73ka71l6gxv46wmlyzj8zhfpfj3vf6nv6x3x0z25ymr3wa2fza";
|
||||
sha256 = "1qkjnij9jw3d4pjkdr6npz5ps604qg6g36jnsng0k1r2qnrydnwh";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/syncthing/syncthing";
|
||||
|
||||
patches = [
|
||||
./add-stcli-target.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/syncthing/syncthing/commit/e7072feeb7669948c3e43f55d21aec15481c33ba.patch";
|
||||
sha256 = "1pcybww2vdx45zhd1sd53v7fp40vfgkwqgy8flv7hxw2paq8hxd4";
|
||||
})
|
||||
];
|
||||
BUILD_USER="nix";
|
||||
BUILD_HOST="nix";
|
||||
|
||||
@ -25,11 +25,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnucash-${version}";
|
||||
version = "3.3";
|
||||
version = "3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
|
||||
sha256 = "0grr5qi5rn1xvr7qx5d7mcxa2mcgycy2b325ry73bb485a6yv5l3";
|
||||
sha256 = "1ms2wg4sh5gq3rpjmmnp85rh5nc9ahca1imxkvhz4d3yiwy8hm52";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtkwave-${version}";
|
||||
version = "3.3.97";
|
||||
version = "3.3.98";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
|
||||
sha256 = "0jy5qk0b0np9xsxgnvv8jjgyw81l170wrm5q04qs48wpw7d0rm3v";
|
||||
sha256 = "1xi2b9yck8fagnjhnhhwrhz5rfvrs2h2m6m64m210m5xnfzbp9pg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, fdk_aac
|
||||
, ffmpeg
|
||||
@ -39,6 +40,13 @@ in stdenv.mkDerivation rec {
|
||||
sha256 = "0ri9qkqk3h71b1a5bwpjzqdr21bbmfqbykg48l779d20zln23n1i";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/obsproject/obs-studio/pull/1557.diff";
|
||||
sha256 = "162fnkxh2wyn6wrrm1kzv7c2mn96kx35vlmk2qwn1nqlifbpsfyq";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake
|
||||
pkgconfig
|
||||
];
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ fetchurl }:
|
||||
|
||||
fetchurl {
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/7882a52a634fbc2da03adc9616aa83b27b06d7a2.tar.gz";
|
||||
sha256 = "1gw480w1d1117l8hbp7rh1jmjjqx11pzb3995m5wi2q9mvi645x2";
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/62720a1288846aabc4e42d4404a85ea771d24a11.tar.gz";
|
||||
sha256 = "1qr07s0l7ip28639fbhwi8nhcyzs3mmhzqd0zny5an0dwxlx14qb";
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "closure-compiler-${version}";
|
||||
version = "20181125";
|
||||
version = "20181210";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
|
||||
sha256 = "1vg7cyya0r2sjrbcwf4pshg7jzgvb9ynpa0b41zkl4x1y0a16bkc";
|
||||
sha256 = "0c79ki4lacfwks5f2q7kzcg6v3a65zs5srm14k09gh5k1hvvnayd";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@ -93,9 +93,6 @@ self: super: {
|
||||
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
|
||||
};
|
||||
|
||||
# https://github.com/bitemyapp/esqueleto/issues/105
|
||||
esqueleto = markBrokenVersion "2.5.3" super.esqueleto;
|
||||
|
||||
# Fix test trying to access /home directory
|
||||
shell-conduit = overrideCabal super.shell-conduit (drv: {
|
||||
postPatch = "sed -i s/home/tmp/ test/Spec.hs";
|
||||
|
||||
@ -41,40 +41,6 @@ self: super: {
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
|
||||
# LTS-12.x versions do not compile.
|
||||
# base-orphans = self.base-orphans_0_8;
|
||||
# brick = self.brick_0_45;
|
||||
# cassava-megaparsec = doJailbreak super.cassava-megaparsec;
|
||||
# config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18
|
||||
# contravariant = self.contravariant_1_5;
|
||||
# fgl = self.fgl_5_7_0_1;
|
||||
# free = self.free_5_1;
|
||||
# haddock-library = dontCheck super.haddock-library_1_7_0;
|
||||
# HaTeX = doJailbreak super.HaTeX;
|
||||
# hpack = self.hpack_0_31_1;
|
||||
# hslua = self.hslua_1_0_1;
|
||||
# hslua-module-text = self.hslua-module-text_0_2_0;
|
||||
# hspec = self.hspec_2_6_0;
|
||||
# hspec-contrib = self.hspec-contrib_0_5_1;
|
||||
# hspec-core = self.hspec-core_2_6_0;
|
||||
# hspec-discover = self.hspec-discover_2_6_0;
|
||||
# hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x
|
||||
# hspec-meta = self.hspec-meta_2_6_0;
|
||||
# JuicyPixels = self.JuicyPixels_3_3_3;
|
||||
# lens = self.lens_4_17;
|
||||
# megaparsec = dontCheck (doJailbreak super.megaparsec);
|
||||
# pandoc = self.pandoc_2_5;
|
||||
# pandoc-citeproc = self.pandoc-citeproc_0_15;
|
||||
# pandoc-citeproc_0_15 = doJailbreak super.pandoc-citeproc_0_15;
|
||||
# patience = markBrokenVersion "0.1.1" super.patience;
|
||||
# polyparse = self.polyparse_1_12_1;
|
||||
# semigroupoids = self.semigroupoids_5_3_1;
|
||||
# tagged = self.tagged_0_8_6;
|
||||
# vty = self.vty_5_25_1;
|
||||
# wizards = doJailbreak super.wizards;
|
||||
# wl-pprint-extras = doJailbreak super.wl-pprint-extras;
|
||||
# yaml = self.yaml_0_11_0_0;
|
||||
|
||||
# https://github.com/tibbe/unordered-containers/issues/214
|
||||
unordered-containers = dontCheck super.unordered-containers;
|
||||
|
||||
@ -87,13 +53,16 @@ self: super: {
|
||||
psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x
|
||||
system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience"
|
||||
unicode-transforms = dontCheck super.unicode-transforms;
|
||||
RSA = dontCheck super.RSA; # https://github.com/GaloisInc/RSA/issues/14
|
||||
RSA = dontCheck super.RSA; # https://github.com/GaloisInc/RSA/issues/14
|
||||
monad-par = dontCheck super.monad-par; # https://github.com/simonmar/monad-par/issues/66
|
||||
|
||||
# https://github.com/jgm/skylighting/issues/55
|
||||
skylighting-core = dontCheck super.skylighting-core;
|
||||
|
||||
# Break out of "yaml >=0.10.4.0 && <0.11".
|
||||
# Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485
|
||||
stack = doJailbreak super.stack;
|
||||
|
||||
# Break out of "tasty >= 0.11 && < 1.2": https://github.com/jgm/pandoc/issues/5200
|
||||
pandoc = doJailbreak super.pandoc;
|
||||
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -322,6 +322,9 @@ self: super: builtins.intersectAttrs super {
|
||||
# https://github.com/bos/pcap/issues/5
|
||||
pcap = addExtraLibrary super.pcap pkgs.libpcap;
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/53336
|
||||
greenclip = addExtraLibrary super.greenclip pkgs.xorg.libXdmcp;
|
||||
|
||||
# The cabal files for these libraries do not list the required system dependencies.
|
||||
miniball = overrideCabal super.miniball (drv: {
|
||||
librarySystemDepends = [ pkgs.miniball ];
|
||||
|
||||
3495
pkgs/development/haskell-modules/hackage-packages.nix
generated
3495
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -1,33 +0,0 @@
|
||||
{ build-idris-package
|
||||
, fetchFromGitHub
|
||||
, effects
|
||||
, lib
|
||||
, ncurses
|
||||
}:
|
||||
build-idris-package {
|
||||
name = "curses";
|
||||
version = "2017-10-12";
|
||||
|
||||
idrisDeps = [ effects ];
|
||||
|
||||
extraBuildInputs = [ ncurses ];
|
||||
|
||||
postUnpack = ''
|
||||
sed -i 's/^libs = curses$/libs = ncurses/g' source/curses.ipkg
|
||||
sed -i 's/\#include <curses.h>/#include \<ncurses.h\>/g' source/src/cursesrun.h
|
||||
'';
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JakobBruenker";
|
||||
repo = "curses-idris";
|
||||
rev = "ea4bbcfcf691f0dc731f2dfa676011809db084cb";
|
||||
sha256 = "17q8hg5f61lk2kh3j4cwrwja282sihlcjdrx233z4237alp9w4g1";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "libusb binding for idris and Effectful curses programming";
|
||||
homepage = https://github.com/JakobBruenker/curses-idris;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.brainrape ];
|
||||
};
|
||||
}
|
||||
@ -75,8 +75,6 @@
|
||||
|
||||
cube = callPackage ./cube.nix {};
|
||||
|
||||
curses = callPackage ./curses.nix {};
|
||||
|
||||
data = callPackage ./data.nix {};
|
||||
|
||||
derive = callPackage ./derive.nix {};
|
||||
|
||||
@ -3,10 +3,10 @@ let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="angelscript";
|
||||
version = "2.32.0";
|
||||
version = "2.33.0";
|
||||
name="${baseName}-${version}";
|
||||
url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
|
||||
sha256 = "0675hza06v3grxyqfy70gzm57idmbbm7qvi6bg5vf8m6mpw757dl";
|
||||
sha256 = "18qywbi1k53xgnlr9v6ycin669j5v5qspq7lli4jhf6l4c5hk49n";
|
||||
};
|
||||
buildInputs = [
|
||||
unzip
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "groovy-${version}";
|
||||
version = "2.5.4";
|
||||
version = "2.5.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
|
||||
sha256 = "1s661d5kwiafv5i1pq2b7k8b2fd7m2zp3xwcrf4iv1iik033djdj";
|
||||
sha256 = "16hj2v6r89s3qrgbnkinwwzv16mphb6jjw8ijgmmd9y2063nchc2";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip makeWrapper ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "actor-framework-${version}";
|
||||
version = "0.16.2";
|
||||
version = "0.16.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actor-framework";
|
||||
repo = "actor-framework";
|
||||
rev = "${version}";
|
||||
sha256 = "0sdr9mrrkrj9nfwqbznz3pkqfsnsi8kanfy99x01js1spqihy1s3";
|
||||
sha256 = "0nqw1cv7wxbcn2qwm08qffb6k4n3kgvdiaphks5gjgm305jk4vnx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, makeWrapper
|
||||
, qtbase, libuuid, libcap, uwsgi, grantlee }:
|
||||
, qtbase, libuuid, libcap, uwsgi, grantlee, pcre
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cutelyst-${version}";
|
||||
@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
|
||||
buildInputs = [ qtbase libuuid libcap uwsgi grantlee ];
|
||||
buildInputs = [ qtbase libuuid libcap uwsgi grantlee pcre ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPLUGIN_UWSGI=ON"
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.17.0";
|
||||
version = "1.17.2";
|
||||
name = "grpc-${version}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
sha256 = "17y8lhkx22qahjk89fa0bh76q76mk9vwza59wbwcpzmy0yhl2k23";
|
||||
sha256 = "1rq20951h5in3dy0waa60dsqj27kmg6ylp2gdsxyfrq5jarlj89g";
|
||||
};
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtkdatabox-0.9.3.0";
|
||||
name = "gtkdatabox-0.9.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gtkdatabox/${name}.tar.gz";
|
||||
sha256 = "1wigd4bdlrz4pma2l2wd3z8sx7pqmsvq845nya5vma9ibi96nhhz";
|
||||
sha256 = "1rdxnjgh6v3yjqgsfmamyzpfxckzchps4kqvvz88nifmd7ckhjfh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libcouchbase-${version}";
|
||||
version = "2.10.2";
|
||||
version = "2.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "couchbase";
|
||||
repo = "libcouchbase";
|
||||
rev = version;
|
||||
sha256 = "1znhy99nhiv21j2jwsx9dsmg8br01wg0hsf1yfwsjny0myv13xkm";
|
||||
sha256 = "0a3fin5rcwa3xwd980mrzrkr7dpjdwbri81mqwxw1fkppjqw23z4";
|
||||
};
|
||||
|
||||
cmakeFlags = "-DLCB_NO_MOCK=ON";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libraw-${version}";
|
||||
version = "0.19.1";
|
||||
version = "0.19.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz";
|
||||
sha256 = "1xjyw4n9gfr2r637pjbpbi3h98h9mdjn61b0hsxwqynq2vdij452";
|
||||
sha256 = "0i4nhjm5556xgn966x0i503ygk2wafq6z83kg0lisacjjab4f3a0";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" "dev" "doc" ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, libxml2, findXMLCatalogs, python2
|
||||
{ stdenv, fetchurl, libxml2, findXMLCatalogs, python2, libgcrypt
|
||||
, cryptoSupport ? false
|
||||
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
|
||||
}:
|
||||
@ -28,7 +28,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py";
|
||||
|
||||
buildInputs = [ libxml2.dev ] ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ];
|
||||
buildInputs = [ libxml2.dev ]
|
||||
++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ]
|
||||
++ stdenv.lib.optionals cryptoSupport [ libgcrypt ];
|
||||
|
||||
propagatedBuildInputs = [ findXMLCatalogs ];
|
||||
|
||||
|
||||
@ -5,15 +5,21 @@
|
||||
, backports_functools_lru_cache, requests_toolbelt
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
let
|
||||
srcInfo = if isPy3k then {
|
||||
version = "18.0.1";
|
||||
sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";
|
||||
} else {
|
||||
version = "17.4.1";
|
||||
sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv";
|
||||
};
|
||||
in buildPythonPackage rec {
|
||||
pname = "CherryPy";
|
||||
version = "18.0.1";
|
||||
|
||||
disabled = !isPy3k;
|
||||
inherit (srcInfo) version;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";
|
||||
inherit pname;
|
||||
inherit (srcInfo) version sha256;
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ];
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
, Babel
|
||||
, pytz
|
||||
, nine
|
||||
, nose
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -16,6 +17,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ Babel pytz nine ];
|
||||
checkInputs = [ nose ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Kajiki provides fast well-formed XML templates";
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ofxparse";
|
||||
version = "0.19";
|
||||
version = "0.20";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d8c81fd5089332106da1a2e8919c412c7c677f08af04d557ca767701a04e0918";
|
||||
sha256 = "0zn3grc6xhgzcc81qc3dxkkwk731cjjqqhb46smw12lk09cdnigb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six beautifulsoup4 lxml ];
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "parver";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1nylv880zxnm9waw32y8dmdc435jv5gjcajv8qahafm7v1prgcmq";
|
||||
sha256 = "0jzyylcmjxb0agc4fpdnzdnv2ajvp99rs9pz7qcklnhlmy8scdqv";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six attrs arpeggio ];
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
, gunicorn
|
||||
, jinja2
|
||||
, virtualenv
|
||||
, mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -28,6 +29,8 @@ buildPythonPackage rec {
|
||||
webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv
|
||||
];
|
||||
|
||||
checkInputs = [ mock ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Pecan";
|
||||
homepage = "https://github.com/pecan/pecan";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchPypi, fetchpatch
|
||||
, darwin
|
||||
}:
|
||||
|
||||
@ -13,6 +13,14 @@ buildPythonPackage rec {
|
||||
sha256 = "6e265c8f3da00b015d24b842bfeb111f856b13d24f2c57036582568dc650d6c3";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "disk_io_counters_fails.patch";
|
||||
url = "https://github.com/giampaolo/psutil/commit/8f99f3782663959062ee868bbfdbc336307a3a4d.diff";
|
||||
sha256 = "0j7wdgq8y20k27wcpmbgc1chd0vmbkxy8j0zwni1s4i7hyk64hmk";
|
||||
})
|
||||
];
|
||||
|
||||
# No tests in archive
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -4,6 +4,9 @@
|
||||
, mock
|
||||
, matplotlib
|
||||
, pkgs
|
||||
, nbconvert
|
||||
, markdown
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -15,8 +18,10 @@ buildPythonPackage rec {
|
||||
sha256 = "5e5298d90e06414a01f48e0d6aa4c36a70c5f223d929f2a9c7e2d388451c7357";
|
||||
};
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
buildInputs = [ mock pkgs.glibcLocales ];
|
||||
propagatedBuildInputs = [ matplotlib ];
|
||||
propagatedBuildInputs = [ matplotlib nbconvert markdown ];
|
||||
|
||||
# fails due to trying to run CSS as test
|
||||
doCheck = false;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyhomematic";
|
||||
version = "0.1.52";
|
||||
version = "0.1.53";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4947b75401245d3a69de698617bb81fcba1ed7fd56c15d339a5f3b2bbbc391f7";
|
||||
sha256 = "1crqdqbv7yqw2pasydy51ps048phbdn7s37xaba9npd1xm8g7jvh";
|
||||
};
|
||||
|
||||
# PyPI tarball does not include tests/ directory
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylint";
|
||||
version = "1.9.3";
|
||||
version = "1.9.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "09bc539f85706f2cca720a7ddf28f5c6cf8185708d6cb5bbf7a90a32c3b3b0aa";
|
||||
sha256 = "ee1e85575587c5b58ddafa25e1c1b01691ef172e139fc25585e5d3f02451da93";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest pytestrunner pyenchant ];
|
||||
|
||||
@ -2,23 +2,23 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pyasn1
|
||||
, pycrypto
|
||||
, pycryptodomex
|
||||
, pysmi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "4.4.6";
|
||||
version = "4.4.8";
|
||||
pname = "pysnmp";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e34ffa0dce5f69adabd478ff76c3e1b08e32ebb0767df8b178d0704f4a1ac406";
|
||||
sha256 = "1c42qicrh56m49374kxna2s2nmdwna3yqgnz16frzj0dw7vxrrhk";
|
||||
};
|
||||
|
||||
# NameError: name 'mibBuilder' is not defined
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = [ pyasn1 pycrypto pysmi ];
|
||||
propagatedBuildInputs = [ pyasn1 pycryptodomex pysmi ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://pysnmp.sf.net;
|
||||
@ -26,5 +26,4 @@ buildPythonPackage rec {
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ koral ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, fetchPypi
|
||||
, setuptools_scm
|
||||
, pytest
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -14,6 +15,15 @@ buildPythonPackage rec {
|
||||
sha256 = "0axbrpqal3cqw9zq6dakdbg49pnf5gvyvq6yn93hp1ayc7fnhzk3";
|
||||
};
|
||||
|
||||
# fixes support for pytest >3.6. Should be droppable during the
|
||||
# next bump.
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = https://github.com/pytest-dev/pytest-repeat/commit/f94b6940e3651b7593aca5a7a987eb56abe04cb1.patch;
|
||||
sha256 = "00da1gmpq9pslcmm8pw93jcbp8j2zymzqdsm6jq3xinkvjpsbmny";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ setuptools_scm pytest ];
|
||||
|
||||
checkPhase = ''
|
||||
|
||||
@ -25,11 +25,6 @@ buildPythonPackage rec {
|
||||
py.test
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
# File says it's utf-8 so instead of relying on the environment, fix the decoding when reading.
|
||||
substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ future six ecdsa rsa ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -4,6 +4,8 @@
|
||||
, unittest2
|
||||
, pyasn1
|
||||
, mock
|
||||
, isPy3k
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -18,6 +20,10 @@ buildPythonPackage rec {
|
||||
checkInputs = [ unittest2 mock ];
|
||||
propagatedBuildInputs = [ pyasn1 ];
|
||||
|
||||
preConfigure = stdenv.lib.optionalString (isPy3k && pythonOlder "3.7") ''
|
||||
substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://stuvel.eu/rsa;
|
||||
license = licenses.asl20;
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "8.15";
|
||||
version = "8.16";
|
||||
name = "checkstyle-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
|
||||
sha256 = "0zl064vx5gc6kglpw9lvd43v5zsdykr1whzy61bhijbbgnsrh9vb";
|
||||
sha256 = "1044imm1pmn4fb0bzg4k44qm1hwwsyf7l7lbnlrznbln7ymdy5ki";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,14 +1,15 @@
|
||||
{ stdenv, makeWrapper, writeScript, llvmPackages }:
|
||||
{ stdenv, writeScript, llvmPackages_latest }:
|
||||
|
||||
let
|
||||
clang = llvmPackages.clang-unwrapped;
|
||||
clang = llvmPackages_latest.clang-unwrapped;
|
||||
version = stdenv.lib.getVersion clang;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "clang-tools-${version}";
|
||||
builder = writeScript "builder" ''
|
||||
source $stdenv/setup
|
||||
unpackPhase = ":";
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
for tool in \
|
||||
clang-apply-replacements \
|
||||
clang-check \
|
||||
@ -16,11 +17,9 @@ stdenv.mkDerivation {
|
||||
clang-rename \
|
||||
clang-tidy
|
||||
do
|
||||
makeWrapper $clang/bin/$tool $out/bin/$tool --argv0 $tool
|
||||
ln -s ${clang}/bin/$tool $out/bin/$tool
|
||||
done
|
||||
'';
|
||||
buildInputs = [ makeWrapper ];
|
||||
inherit clang;
|
||||
meta = clang.meta // {
|
||||
description = "Standalone command line tools for C++ development";
|
||||
maintainers = with stdenv.lib.maintainers; [ aherrmann ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2, at-spi2-atk }:
|
||||
{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk }:
|
||||
|
||||
let
|
||||
version = "3.0.5";
|
||||
version = "4.0.0";
|
||||
name = "electron-${version}";
|
||||
|
||||
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
||||
@ -20,19 +20,19 @@ let
|
||||
src = {
|
||||
i686-linux = fetchurl {
|
||||
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip";
|
||||
sha256 = "1jrvvjx9q1aklp09fk9g5yg0qnq2gx8837d45aaig2ycy0srhdif";
|
||||
sha256 = "0yv2f7yf6ingjysswpnpnvqsjkdkp2rd4laawhziifzbfjda4yws";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
|
||||
sha256 = "1bgi980zwarmxmp98nwdlfy9qnid4y65aadl66n6wwvb6hs4zjmz";
|
||||
sha256 = "1kh2jds7jra9f1vcn2z1193cxcyvfxkldim4b9ij7chj9xzxwgln";
|
||||
};
|
||||
armv7l-linux = fetchurl {
|
||||
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip";
|
||||
sha256 = "1ayfcy7jm7mymmbdq08id9wpjj6cja2cyix1sw2r3m8gpn4l6ih2";
|
||||
sha256 = "1v492qfdgnj3fks2hrfc9lmsx5a5xk957rvismlpc2mjkjrwx2dq";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip";
|
||||
sha256 = "18cqg9zb98c0rfrdg7ri26dvhjwrwzj41jn8dfra9131xc84nl3i";
|
||||
sha256 = "18vpqif5grvhrkx6h64yzw1pf9013811gzq2qxaj8pzr6lck3irf";
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or throwSystem;
|
||||
|
||||
@ -47,7 +47,7 @@ let
|
||||
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${atomEnv.libPath}:${gtk2}/lib:${at-spi2-atk}/lib:$out/lib/electron" \
|
||||
--set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libuuid at-spi2-atk ]}:$out/lib/electron" \
|
||||
$out/lib/electron/electron
|
||||
|
||||
wrapProgram $out/lib/electron/electron \
|
||||
@ -60,7 +60,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
|
||||
sha256 = "18sjgb93hs73bx8wa0i8r64wdh927jdwpcsxd6pfq68lfw38g2ks";
|
||||
sha256 = "08n3xzgncb2hf645zn8b0rb1izq9pqh3726hf2g4nvrgfllivlg1";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jhiccup-${version}";
|
||||
version = "2.0.9";
|
||||
version = "2.0.10";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.azul.com/files/jHiccup-${version}-dist.zip";
|
||||
sha256 = "1y089kzj191j3vclkma4vi1w66pw4jqrnm5z0qw264wqcn0hnq11";
|
||||
sha256 = "1hsvi8wjh615fnjf75h7b5afp04chqcgvini30vfcn3m9a5icbgy";
|
||||
};
|
||||
|
||||
configurePhase = ":";
|
||||
|
||||
@ -17,11 +17,11 @@ let
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "insomnia-${version}";
|
||||
version = "6.2.3";
|
||||
version = "6.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
|
||||
sha256 = "1pq5y0w4yx2inyk6djcd1sb4c1m3awmn3mvr3smngwx9lsszn84i";
|
||||
sha256 = "15zf5nmsmz3ajb4xmhm3gynn36qp0ark0gah8qd0hqq76n9jmjnp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gzdoom-${version}";
|
||||
version = "3.6.0";
|
||||
version = "3.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coelckers";
|
||||
repo = "gzdoom";
|
||||
rev = "g${version}";
|
||||
sha256 = "03yklhdppncaswy6l3fcvy8l8v1icfnm9f0jlszvibcm5ba7z0j1";
|
||||
sha256 = "1c9zd4f7zalkmv0gvsavbydkmi6jw5pyf3q62456yvb6vjwg1xvd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
@ -43,8 +43,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://github.com/coelckers/gzdoom;
|
||||
description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
platforms = ["x86_64-linux"];
|
||||
maintainers = with maintainers; [ lassulus ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -81,6 +81,17 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
ansible-vim = buildVimPluginFrom2Nix {
|
||||
pname = "ansible-vim";
|
||||
version = "2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pearofducks";
|
||||
repo = "ansible-vim";
|
||||
rev = "01d0e7d4b87936d9cfe5a6038a6c9cec409a3c15";
|
||||
sha256 = "14x7lxwvfrvi27qmffh66fpc3fk21xkzfzps0vx6n3n7h56a7r2g";
|
||||
};
|
||||
};
|
||||
|
||||
argtextobj-vim = buildVimPluginFrom2Nix {
|
||||
pname = "argtextobj-vim";
|
||||
version = "2010-10-18";
|
||||
|
||||
@ -218,6 +218,7 @@ osyo-manga/vim-textobj-multiblock
|
||||
osyo-manga/vim-watchdogs
|
||||
pangloss/vim-javascript
|
||||
parsonsmatt/intero-neovim
|
||||
pearofducks/ansible-vim
|
||||
peterhoeg/vim-qml
|
||||
phanviet/vim-monokai-pro
|
||||
plasticboy/vim-markdown
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "android-udev-rules-${version}";
|
||||
version = "20180112";
|
||||
version = "20181031";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "M0Rf30";
|
||||
repo = "android-udev-rules";
|
||||
rev = version;
|
||||
sha256 = "13gj79nnd04szqlrrzzkdr6wi1fky08pi7x8xfbg0jj3d3v0giah";
|
||||
sha256 = "175js0vimv6b92cxl0sc4ihdj1k8yq3jrpbjy0zsvrm2367z7xqp";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,27 +1,27 @@
|
||||
{ stdenv, fetchFromGitHub, docutils, meson, ninja, pkgconfig
|
||||
, dbus, glib, linuxHeaders, systemd }:
|
||||
, dbus, linuxHeaders, systemd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dbus-broker-${version}";
|
||||
version = "13";
|
||||
version = "17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bus1";
|
||||
repo = "dbus-broker";
|
||||
rev = "v${version}";
|
||||
sha256 = "1yjkxpnl54pky6ha3y8dsds57lnk10lmriyzpzy0ha2npng2614x";
|
||||
sha256 = "19q5f1c658jdxvr2k2rb2xsnspybqjii4rifnlkzi1qzh0r152md";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ docutils meson ninja pkgconfig ];
|
||||
|
||||
buildInputs = [ dbus glib linuxHeaders systemd ];
|
||||
buildInputs = [ dbus linuxHeaders systemd ];
|
||||
|
||||
PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
|
||||
PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 ../README $out/share/doc/dbus-broker/README
|
||||
install -Dm644 $src/README.md $out/share/doc/dbus-broker/README
|
||||
|
||||
sed -i $out/lib/systemd/{system,user}/dbus-broker.service \
|
||||
-e 's,^ExecReload.*busctl,ExecReload=${systemd}/bin/busctl,'
|
||||
|
||||
@ -25,7 +25,7 @@ lib.overrideDerivation (buildLinux (args // rec {
|
||||
efiBootStub = false;
|
||||
} // (args.features or {});
|
||||
|
||||
extraMeta.hydraPlatforms = with stdenv.lib.platforms; [ aarch64 ];
|
||||
extraMeta.hydraPlatforms = [ "aarch64-linux" ];
|
||||
})) (oldAttrs: {
|
||||
postConfigure = ''
|
||||
# The v7 defconfig has this set to '-v7' which screws up our modDirVersion.
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "osrm-backend-${version}";
|
||||
version = "5.20.0";
|
||||
version = "5.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "Project-OSRM";
|
||||
repo = "osrm-backend";
|
||||
sha256 = "0frq16p4wms8zfb6mhn7xbxrvf81f1wn37lqlf5p1yjly5fbljhc";
|
||||
sha256 = "18v2lwx5iyn73b5bfh2r898cwps7m9pwym197dl8lg0jy88m129m";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "groonga-${version}";
|
||||
version = "8.0.9";
|
||||
version = "8.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.groonga.org/source/groonga/${name}.tar.gz";
|
||||
sha256 = "1fd5smhqchnjv0injj3x0zsqzffw1r4gq625znqljg6chny3cq08";
|
||||
sha256 = "1qwrzw0rvzkkmpgbk0rd5slj6h7jj53f0g685f5gwhg2dpxk52br";
|
||||
};
|
||||
|
||||
buildInputs = with stdenv.lib;
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
|
||||
# To make use of this plugin, need to add
|
||||
# programs.zsh.interactiveShellInit = ''
|
||||
# source ${pkgs.zsh-command-time}/share/zsh-command-time/command-time.plugin.zsh
|
||||
# source ${pkgs.zsh-command-time}/share/zsh/plugins/command-time/command-time.plugin.zsh
|
||||
# ZSH_COMMAND_TIME_COLOR="yellow"
|
||||
# ZSH_COMMAND_TIME_MIN_SECONDS=3
|
||||
# ZSH_COMMAND_TIME_ECHO=1
|
||||
# '';
|
||||
@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm444 $src/command-time.plugin.zsh --target-directory=$out/share/zsh-command-time
|
||||
install -Dm0444 $src/command-time.plugin.zsh --target-directory=$out/share/zsh/plugins/command-time
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ckbcomp-${version}";
|
||||
version = "1.187";
|
||||
version = "1.188";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "installer-team";
|
||||
repo = "console-setup";
|
||||
rev = version;
|
||||
sha256 = "1dcsgdai5lm1r0bhlcfwh01s9k11iwgnd0111gpgbv568rs5isqh";
|
||||
sha256 = "1741mg2wc5wa63clkijmv04zd6jxhc7c6aq7mkhqw1r4dhfhih19";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
@ -63,8 +63,8 @@ in rec {
|
||||
};
|
||||
|
||||
ansible_2_7 = generic {
|
||||
version = "2.7.4";
|
||||
sha256 = "0p1n6yyc632522fl2r247p0jg4mncc7z4hqngzbh1zxq3dcb12s9";
|
||||
version = "2.7.5";
|
||||
sha256 = "1fsif2jmkrrgiawsd8r6sxrqvh01fvrmdhas0p540a6i9fby3yda";
|
||||
};
|
||||
|
||||
ansible2 = ansible_2_7;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "abcMIDI-${version}";
|
||||
version = "2018.12.01";
|
||||
version = "2018.12.21";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://ifdo.ca/~seymour/runabc/${name}.zip";
|
||||
sha256 = "133kdyin2lwidlnd8ivjyymrrb0rr1028apj2biyp6l0l5yrqw78";
|
||||
sha256 = "1y2dwznbp4m7m6ddmqap2n411pdj1c1dirfw8lhyz0vpncx5fzai";
|
||||
};
|
||||
|
||||
# There is also a file called "makefile" which seems to be preferred by the standard build phase
|
||||
|
||||
23
pkgs/tools/audio/trx/default.nix
Normal file
23
pkgs/tools/audio/trx/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ stdenv, fetchgit, alsaLib, libopus, ortp, bctoolbox }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "trx-unstable-${version}";
|
||||
version = "2018-01-23";
|
||||
|
||||
src = fetchgit {
|
||||
url = "http://www.pogo.org.uk/~mark/trx.git";
|
||||
rev = "66b4707a24172751a131e24d2a800496c699137f";
|
||||
sha256 = "0w0960p25944b30lkc8n4lj14xgsf0fjpmxqwlz2r8wl642bqnfm";
|
||||
};
|
||||
|
||||
buildInputs = [ alsaLib libopus ortp bctoolbox ];
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A simple toolset for broadcasting live audio using RTP/UDP and Opus";
|
||||
homepage = http://www.pogo.org.uk/~mark/trx/;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.hansjoergschurr ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -3,12 +3,12 @@
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.5.18";
|
||||
version = "2.6.0";
|
||||
name = "dar-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/dar/${name}.tar.gz";
|
||||
sha256 = "14002ai4xji0dczgiargxs3z8yylswj8z94higcsw09xk13izlkk";
|
||||
sha256 = "0avaffkfrgj8vhvnpqi4s21bsrlxl0xafpyd3v9n3f9hs2gnm3wg";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]
|
||||
|
||||
@ -9,11 +9,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "blueman-${version}";
|
||||
version = "2.0.6";
|
||||
version = "2.0.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz";
|
||||
sha256 = "0bc1lfsjkbrg9f1jnw6mx7bp04x76ljy9g0rgx7n80vaj0hpz3bj";
|
||||
sha256 = "15q253081ahmb8k3yaqy99pc7ppbq3pxrx35bg4q9jmn6xv2kj63";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jhead-${version}";
|
||||
version = "3.02";
|
||||
version = "3.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.sentex.net/~mwandel/jhead/${name}.tar.gz";
|
||||
sha256 = "0apdqxqzssnlgn3z9ykvd487dvnbfsgxw1vklr0b916c7my77jc5";
|
||||
sha256 = "1hn0yqcicq3qa20h1g313l1a671r8mccpb9gz0w1056r500lw6c2";
|
||||
};
|
||||
|
||||
buildInputs = [ libjpeg ];
|
||||
|
||||
@ -13,13 +13,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ibus-typing-booster-${version}";
|
||||
version = "2.3.3";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mike-fabian";
|
||||
repo = "ibus-typing-booster";
|
||||
rev = version;
|
||||
sha256 = "0vzfnbld1k1ig1qgka30srmw1x53090xfn3cga80g64v0kqkwb5w";
|
||||
sha256 = "05nc9394lgpq3l8l3zpihcz3r9x5wmnbawip42l687p8vnbk8smb";
|
||||
};
|
||||
|
||||
patches = [ ./hunspell-dirs.patch ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bdf2psf-${version}";
|
||||
version = "1.187";
|
||||
version = "1.188";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
|
||||
sha256 = "05r5jg7n4hbdxcy3kc7038h1r0fkipwld6kd0d49nbkmywl2k1a8";
|
||||
sha256 = "1g9i50a3x9p7kbyjg7z8xgxcknqxkxvzb0gg2jl2zgwjsyvjy5wn";
|
||||
};
|
||||
|
||||
buildInputs = [ dpkg ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ddcutil-${version}";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rockowitz";
|
||||
repo = "ddcutil";
|
||||
rev = "v${version}";
|
||||
sha256 = "02jl0mr5m3h839j3drrkdycnvlhji4xdmnjcqfglds0ir1q1yapi";
|
||||
sha256 = "0ywrjp6r1z6jlwq1ycrr9qn3drjzbxvdf0v5f92rh68fwb06gn0y";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
@ -15,13 +15,13 @@ let binPath = stdenv.lib.makeBinPath [
|
||||
];
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "debootstrap-${version}";
|
||||
version = "1.0.111";
|
||||
version = "1.0.112";
|
||||
|
||||
src = fetchurl {
|
||||
# git clone git://git.debian.org/d-i/debootstrap.git
|
||||
# I'd like to use the source. However it's lacking the lanny script ? (still true?)
|
||||
url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
|
||||
sha256 = "1m2678y2cswd2z7pksknv1cwlv3ww1fmhz4kkhvxlhpmyyc4260w";
|
||||
sha256 = "1p7skj8821dhwgjq3f2v1fplzv5y6xfma6bh9ai6f8ry6vz0hvha";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "mimeo-${version}";
|
||||
version = "2018.11";
|
||||
version = "2018.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz";
|
||||
sha256 = "0qhsy6d1mg00s3mbykci7zk2n3qp2c27mh9nvjja9x8lx7xyfznm";
|
||||
sha256 = "1bjhqwfi8rrf1m4fwwqvg0qzk035qcnxlmhh4kxrpm6rqhw48vk8";
|
||||
};
|
||||
|
||||
buildInputs = [ file desktop-file-utils ];
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, utillinux}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.33";
|
||||
version = "6.34";
|
||||
name = "profile-sync-daemon-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz";
|
||||
sha256 = "0dzs51xbszzmcg82n2dil6nljj4gn0aw9rqjmhyi4a5frc8g6xmb";
|
||||
sha256 = "0v6yzgfwv3mhf1q2fp6abrvr15p9b1c1gahj3mdh5b4bfcsg3n5a";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ fetchurl, stdenv, emacs, curl, check, bc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "recutils-1.7";
|
||||
name = "recutils-1.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/recutils/${name}.tar.gz";
|
||||
sha256 = "0cdwa4094x3yx7vn98xykvnlp9rngvd58d19vs3vh5hrvggccg93";
|
||||
sha256 = "14xiln4immfsw8isnvwvq0h23f6z0wilpgsc4qzabnrzb5lsx3nz";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
@ -15,11 +15,6 @@ stdenv.mkDerivation rec {
|
||||
checkInputs = [ check bc ];
|
||||
doCheck = true;
|
||||
|
||||
# one file fails to compile with emacs 26
|
||||
postInstall = ''
|
||||
${emacs}/bin/emacs -Q -batch -f batch-byte-compile $out/share/emacs/site-lisp/*.el || true
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Tools and libraries to access human-editable, text-based databases";
|
||||
|
||||
|
||||
@ -19,11 +19,11 @@ buildPythonPackage rec {
|
||||
# The websites youtube-dl deals with are a very moving target. That means that
|
||||
# downloads break constantly. Because of that, updates should always be backported
|
||||
# to the latest stable release.
|
||||
version = "2018.12.17";
|
||||
version = "2019.01.02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1nd4zr3wd35vldm775m9wcgbzma2013yyj134lcz19ipjs38isrk";
|
||||
sha256 = "0iw8cfzghhkx2q7m3rwnhm3xyyh88qd2553fb287shkxyg9kz96b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
diff -u ddclient-3.8.1/ddclient ddclient-3.8.1.patched/ddclient
|
||||
--- ddclient-3.8.1/ddclient 2011-07-11 23:04:21.000000000 +0200
|
||||
+++ ddclient-3.8.1.patched/ddclient 2012-11-08 11:52:31.930647236 +0100
|
||||
@@ -19,6 +19,7 @@ use strict;
|
||||
use Getopt::Long;
|
||||
use Sys::Hostname;
|
||||
use IO::Socket;
|
||||
+use IO::Handle qw( );
|
||||
|
||||
my ($VERSION) = q$Revision: 157 $ =~ /(\d+)/;
|
||||
|
||||
@@ -675,7 +676,7 @@ $SIG{'TERM'} = sub { $caught_term = 1; };
|
||||
$SIG{'KILL'} = sub { $caught_kill = 1; };
|
||||
# don't fork() if foreground or force is on
|
||||
if (opt('foreground') || opt('force')) {
|
||||
- ;
|
||||
+ STDOUT->autoflush(1);
|
||||
} elsif (opt('daemon')) {
|
||||
$SIG{'CHLD'} = 'IGNORE';
|
||||
my $pid = fork;
|
||||
@ -2,19 +2,17 @@
|
||||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
name = "ddclient-${version}";
|
||||
version = "3.8.3";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/ddclient/${name}.tar.gz";
|
||||
sha256 = "1j8zdn7fy7i0bjk3jf0hxnbnshc2yf054vxq64imxdpfd7n5zgfy";
|
||||
sha256 = "0fwyhab8yga2yi1kdfkbqxa83wxhwpagmj1w1mwkg2iffh1fjjlw";
|
||||
};
|
||||
|
||||
# perl packages by default get devdoc which isn't present
|
||||
outputs = [ "out" ];
|
||||
|
||||
buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 ];
|
||||
|
||||
patches = [ ./ddclient-line-buffer-stdout.patch ];
|
||||
buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 DataValidateIP JSONPP ];
|
||||
|
||||
# Use iproute2 instead of ifconfig
|
||||
preConfigure = ''
|
||||
|
||||
@ -9,12 +9,12 @@ assert usePcre -> pcre != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "haproxy";
|
||||
version = "1.8.15";
|
||||
version = "1.9.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz";
|
||||
sha256 = "0cm008i7cz4gq0j7wxmpyzvwfcrmmck5ix34is5xxms624pqc4vi";
|
||||
sha256 = "0zc10ghcwj7hpi90yh2gsciq6q87sqkdik52s55xw1jn2xk9wqhn";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl zlib ]
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, openssl, zlib, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "polygraph-4.12.0";
|
||||
name = "polygraph-4.13.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.web-polygraph.org/downloads/srcs/${name}-src.tgz";
|
||||
sha256 = "1anrdc30yi9pb67642flmn7w82q37cnc45r9bh15mpbc66yk3kzz";
|
||||
sha256 = "1rwzci3n7q33hw3spd79adnclzwgwlxcisc9szzjmcjqhbkcpj1a";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl zlib ncurses ];
|
||||
|
||||
@ -7,10 +7,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "eid-mw-${version}";
|
||||
version = "4.4.11";
|
||||
version = "4.4.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "13mhz23j2gp5bywdq2xiwkk0gnc354j31ry8x35pzlwrcn19by10";
|
||||
sha256 = "14bgn2k0xbd6241qdghg787pgxy7k9rvcspaf74zwwyibaqknzyx";
|
||||
rev = "v${version}";
|
||||
repo = "eid-mw";
|
||||
owner = "Fedict";
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "LanguageTool-${version}";
|
||||
version = "4.3";
|
||||
version = "4.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.languagetool.org/download/${name}.zip";
|
||||
sha256 = "0zsz82jc39j5wjwynmjny7h82kjz7clyk37n6pxmi85ibbdm0zn4";
|
||||
sha256 = "0cdrh59jcwrj5zp2lhbi9wp29pzabp35i8f7lbrs6z1wib6mgmp1";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ jre ];
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
name = "google-compute-engine-${version}";
|
||||
version = "20181023";
|
||||
version = "20181206";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "compute-image-packages";
|
||||
rev = version;
|
||||
sha256 = "0bhh62f4kx4d7k673fvyzgr9h771lzk7dxhq3ld7zzcz0pmxlx3a";
|
||||
sha256 = "090gbkfk3jh403jzs133isxk8263i16vnj5021l7pxbjgj1zzzwf";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -5861,6 +5861,8 @@ in
|
||||
|
||||
trousers = callPackage ../tools/security/trousers { };
|
||||
|
||||
trx = callPackage ../tools/audio/trx { };
|
||||
|
||||
tryton = callPackage ../applications/office/tryton { };
|
||||
|
||||
trytond = callPackage ../applications/office/trytond { };
|
||||
@ -7322,6 +7324,8 @@ in
|
||||
stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
|
||||
});
|
||||
|
||||
llvmPackages_latest = llvmPackages_7;
|
||||
|
||||
manticore = callPackage ../development/compilers/manticore { };
|
||||
|
||||
mercury = callPackage ../development/compilers/mercury { };
|
||||
@ -17806,9 +17810,9 @@ in
|
||||
|
||||
inherit (kdeApplications)
|
||||
akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b
|
||||
kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks
|
||||
kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole kpkpass kitinerary
|
||||
kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okular spectacle;
|
||||
kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog
|
||||
keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole
|
||||
kpkpass kitinerary kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okular spectacle;
|
||||
|
||||
okteta = libsForQt5.callPackage ../applications/editors/okteta { };
|
||||
|
||||
|
||||
@ -380,18 +380,18 @@ let
|
||||
|
||||
luadbi = buildLuaPackage rec {
|
||||
name = "luadbi-${version}";
|
||||
version = "0.6";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mwild1";
|
||||
repo = "luadbi";
|
||||
rev = "v${version}";
|
||||
sha256 = "1cpl84pl75wqd9zph3w4srd5lxij359p8xmmf7xpdbxz67695vah";
|
||||
sha256 = "01i8018zb7w2bhaqglm7cnvbiirgd95b9d07irgz3sci91p08cwp";
|
||||
};
|
||||
|
||||
MYSQL_INC="-I${mysql.connector-c}/include/mysql";
|
||||
|
||||
buildInputs = [ mysql postgresql sqlite ];
|
||||
buildInputs = [ mysql.client mysql.connector-c postgresql sqlite ];
|
||||
|
||||
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace Makefile \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user