Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
dafee3d91a
@ -2190,7 +2190,7 @@
|
||||
name = "Imuli";
|
||||
};
|
||||
infinisil = {
|
||||
email = "infinisil@icloud.com";
|
||||
email = "contact@infinisil.com";
|
||||
github = "infinisil";
|
||||
name = "Silvan Mosberger";
|
||||
};
|
||||
|
||||
@ -49,11 +49,7 @@ let
|
||||
if [ -z "$browser" ]; then
|
||||
browser="$(type -P xdg-open || true)"
|
||||
if [ -z "$browser" ]; then
|
||||
browser="$(type -P w3m || true)"
|
||||
if [ -z "$browser" ]; then
|
||||
echo "$0: unable to start a web browser; please set \$BROWSER"
|
||||
exit 1
|
||||
fi
|
||||
browser="${pkgs.w3m-nographics}/bin/w3m"
|
||||
fi
|
||||
fi
|
||||
exec "$browser" ${manual.manualHTMLIndex}
|
||||
@ -187,8 +183,6 @@ in
|
||||
})
|
||||
|
||||
(mkIf cfg.doc.enable {
|
||||
# TODO(@oxij): put it here and remove from profiles?
|
||||
# environment.systemPackages = [ pkgs.w3m ]; # w3m-nox?
|
||||
environment.pathsToLink = [ "/share/doc" ];
|
||||
environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable "devdoc";
|
||||
})
|
||||
|
||||
@ -19,7 +19,7 @@ in
|
||||
};
|
||||
|
||||
interface = mkOption {
|
||||
default = "lo";
|
||||
default = "127.0.0.1";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Listening interface for the web UI
|
||||
|
||||
@ -133,7 +133,9 @@ def get_generations(profile=None):
|
||||
universal_newlines=True)
|
||||
gen_lines = gen_list.split('\n')
|
||||
gen_lines.pop()
|
||||
return [ (profile, int(line.split()[0])) for line in gen_lines ]
|
||||
|
||||
configurationLimit = @configurationLimit@
|
||||
return [ (profile, int(line.split()[0])) for line in gen_lines ][-configurationLimit:]
|
||||
|
||||
def remove_old_entries(gens):
|
||||
rex_profile = re.compile("^@efiSysMountPoint@/loader/entries/nixos-(.*)-generation-.*\.conf$")
|
||||
|
||||
@ -22,7 +22,7 @@ let
|
||||
|
||||
editor = if cfg.editor then "True" else "False";
|
||||
|
||||
inherit (cfg) consoleMode;
|
||||
inherit (cfg) consoleMode configurationLimit;
|
||||
|
||||
inherit (efi) efiSysMountPoint canTouchEfiVariables;
|
||||
|
||||
@ -57,6 +57,16 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
configurationLimit = mkOption {
|
||||
default = 100;
|
||||
example = 120;
|
||||
type = types.int;
|
||||
description = ''
|
||||
Maximum of configurations in boot menu. Otherwise boot partition could
|
||||
run out of disk space.
|
||||
'';
|
||||
};
|
||||
|
||||
consoleMode = mkOption {
|
||||
default = "keep";
|
||||
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jalv-${version}";
|
||||
version = "1.6.0";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.drobilla.net/${name}.tar.bz2";
|
||||
sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili";
|
||||
sha256 = "13al2hb9s3m7jgbg051x704bmzmcg4wb56cfh8z588kiyh0mxpaa";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig wafHook ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "padthv1-${version}";
|
||||
version = "0.9.6";
|
||||
version = "0.9.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/padthv1/${name}.tar.gz";
|
||||
sha256 = "0ddvlpjlg6zr9ckanqhisw0sgm8rxibvj1aj5dxzs9xb2wlwd8rr";
|
||||
sha256 = "1jd4bf6a1ipvg4yhb3xf3maqg68bx97ic9l57djmkirlrkh2a3wp";
|
||||
};
|
||||
|
||||
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtractor";
|
||||
version = "0.9.7";
|
||||
version = "0.9.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0z97c8h0m7070bfq0qsbf8hwzwcqjs7dln7na4mngyhc6vqkg63s";
|
||||
sha256 = "1llajl450yh7bka32ngm4xdva6a2nnxzjc497ydh07rwkap16smx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "samplv1-${version}";
|
||||
version = "0.9.7";
|
||||
version = "0.9.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
|
||||
sha256 = "1vgmcjccpgqqlmmwfg6m91nph81p2xaxydjx82n4l1yrr9lidn9h";
|
||||
sha256 = "138kd9szgn3b97s7crhsyj8pgwb0bn4l9knd4zliqjgj2f1bs9x0";
|
||||
};
|
||||
|
||||
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "snd-19.3";
|
||||
name = "snd-19.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/snd/${name}.tar.gz";
|
||||
sha256 = "16j3fqyw361wdsr1076f0p3va2y7wdzq1lvr4ijz1ajmbxdlc723";
|
||||
sha256 = "1g96r1js9rfxxczpaa1ggrz7i1zsj4px4fyz64kbqawzsn9xapg9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "synthv1-${version}";
|
||||
version = "0.9.7";
|
||||
version = "0.9.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
|
||||
sha256 = "0i70wm430fvksi3g985farrkhgb7mwhi7j06dl66cdj1n12jzzk7";
|
||||
sha256 = "15kabmxp38wqvavs5hr1dqasjjf1j977kzqggxfmzyi3y5fan3hj";
|
||||
};
|
||||
|
||||
buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];
|
||||
|
||||
@ -6,10 +6,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sigil-${version}";
|
||||
version = "0.9.13";
|
||||
version = "0.9.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "05wnq7av7fgqgcqd88qjwgn55vr4ciy4f0rgi722f52vy97bw9bj";
|
||||
sha256 = "0fmfbfpnmhclbbv9cbr1xnv97si6ls7331kk3ix114iqkngqwgl1";
|
||||
rev = version;
|
||||
repo = "Sigil";
|
||||
owner = "Sigil-Ebook";
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
|
||||
, cmake
|
||||
, gettext
|
||||
@ -14,39 +13,26 @@
|
||||
, hicolor-icon-theme
|
||||
, libsndfile
|
||||
, libxml2
|
||||
, libzip
|
||||
, pcre
|
||||
, poppler
|
||||
, portaudio
|
||||
, zlib
|
||||
|
||||
# Plugins don't appear to be working in this version, so disable them by not
|
||||
# building with Lua support by default. In a future version, try switching this
|
||||
# to 'true' and seeing if the top-level Plugin menu appears.
|
||||
, withLua ? false, lua
|
||||
# plugins
|
||||
, withLua ? true, lua
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xournalpp-${version}";
|
||||
version = "1.0.8";
|
||||
version = "1.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xournalpp";
|
||||
repo = "xournalpp";
|
||||
rev = version;
|
||||
sha256 = "01q84xjp9z1krna10gjj562km6i3wdq8cg7paxax1k6bh52ryvf6";
|
||||
sha256 = "0yg70hsx58s3wb5kzccivrqa7kvmdapygxmif1j64hddah2rqcn9";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch removes the unused 'xopp-recording.sh' file which breaks the
|
||||
# cmake build; this patch isn't in a release yet, and should be removed at
|
||||
# or after 1.0.9 is released.
|
||||
(fetchpatch {
|
||||
name = "remove-xopp-recording.sh.patch";
|
||||
url = "https://github.com/xournalpp/xournalpp/commit/a17a3f2c80c607a22d0fdeb66d38358bea7e4d85.patch";
|
||||
sha256 = "10pcpvklm6kr0lv2xrsbpg2037ni9j6dmxgjf56p466l3gz60iwy";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ];
|
||||
buildInputs =
|
||||
[ glib
|
||||
@ -55,6 +41,7 @@ stdenv.mkDerivation rec {
|
||||
hicolor-icon-theme
|
||||
libsndfile
|
||||
libxml2
|
||||
libzip
|
||||
pcre
|
||||
poppler
|
||||
portaudio
|
||||
@ -62,6 +49,8 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ lib.optional withLua lua;
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gphoto2-2.5.20";
|
||||
name = "gphoto2-2.5.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
|
||||
sha256 = "1xj80abkzvqrd6g1j1q946lhbp03gyapyxdwbhc0y14g1ash6vx3";
|
||||
sha256 = "1laqwhxr0xhbykmp0dhd3j4rr2lhj5y228s31afnqxp700hhk1yz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig gettext libtool ];
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
, mpdSupport ? true, mpd_clientlib
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "waybar-${version}";
|
||||
version = "0.6.7";
|
||||
pname = "waybar";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexays";
|
||||
repo = "Waybar";
|
||||
rev = version;
|
||||
sha256 = "1rkqxszay2fns8c2q0b668mjacr4wb7drlbfi55z9w5f9cfxgifw";
|
||||
sha256 = "0fylq8sz00zv7jvjp7pgckabvmhanpcsqfvpw8c84vy4d8dvqbkx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -47,7 +47,7 @@
|
||||
meta = with stdenv.lib; {
|
||||
description = "Highly customizable Wayland bar for Sway and Wlroots based compositors";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ FlorianFranzen minijackson ];
|
||||
maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xmrig-proxy-${version}";
|
||||
version = "2.14.1";
|
||||
version = "2.14.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xmrig";
|
||||
repo = "xmrig-proxy";
|
||||
rev = "v${version}";
|
||||
sha256 = "1sw00qz4yg8cwmm3s64bqr3lki6bxmlsi4ankyy2l4dx1vs9kf6r";
|
||||
sha256 = "11q4w5ncyyf2vgrb64zlr01n3adyaxja2pcqm5id9if0nvwwn4ga";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
let
|
||||
|
||||
mirror = https://get.geo.opera.com/pub/opera/desktop;
|
||||
version = "60.0.3255.109";
|
||||
version = "60.0.3255.170";
|
||||
|
||||
rpath = stdenv.lib.makeLibraryPath [
|
||||
|
||||
@ -96,7 +96,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
|
||||
sha256 = "0y3cjjzp41pa15sw8bp7n5ab8j8b1kk5h11b4pl6w8spsyk2cpqh";
|
||||
sha256 = "04bcy9qhrhps3712k229yn58ak2j93wcp613zd6l2zxb8a286991";
|
||||
};
|
||||
|
||||
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
|
||||
|
||||
@ -24,11 +24,11 @@ with python'.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "FlexGet";
|
||||
version = "2.21.2";
|
||||
version = "2.21.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3c11fd7c4bb7e1e9203acd4d452ae51d34843e65066a18c7c72445d7db28122a";
|
||||
sha256 = "0a3dz013xxlwxz94i243bahw15k5y45mgk0z1zgkp1xrbiwglwvc";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,46 +1,53 @@
|
||||
{
|
||||
stdenv,
|
||||
appimage-run,
|
||||
fetchurl,
|
||||
runtimeShell,
|
||||
gsettings-desktop-schemas,
|
||||
gtk3,
|
||||
gobject-introspection,
|
||||
wrapGAppsHook,
|
||||
}:
|
||||
{ appimageTools, symlinkJoin, lib, fetchurl, makeDesktopItem }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
# latest version that runs without errors
|
||||
# https://github.com/ssbc/patchwork/issues/972
|
||||
version = "3.11.4";
|
||||
let
|
||||
pname = "patchwork";
|
||||
version = "3.14.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ssbc/patchwork/releases/download/v${version}/Patchwork-${version}-linux-x86_64.AppImage";
|
||||
sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s";
|
||||
url = "https://github.com/ssbc/patchwork/releases/download/v${version}/ssb-${pname}-${version}-x86_64.AppImage";
|
||||
sha256 = "01vsldabv9nmbx8kzlgw275zykm72s1dxglnaq4jz5vbysbyn0qd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
buildInputs = [ appimage-run gtk3 gsettings-desktop-schemas gobject-introspection ];
|
||||
binary = appimageTools.wrapType2 {
|
||||
name = "${pname}";
|
||||
inherit src;
|
||||
};
|
||||
# we only use this to extract the icon
|
||||
appimage-contents = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
};
|
||||
|
||||
unpackPhase = ":";
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "patchwork";
|
||||
exec = "${binary}/bin/patchwork";
|
||||
icon = "ssb-patchwork.png";
|
||||
comment = "Decentralized messaging and sharing app";
|
||||
desktopName = "Patchwork";
|
||||
genericName = "Patchwork";
|
||||
categories = "Network;";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,share}
|
||||
cp $src $out/share/${pname}
|
||||
echo "#!${runtimeShell}" > $out/bin/${pname}
|
||||
echo "${appimage-run}/bin/appimage-run $out/share/${pname}" >> $out/bin/${pname}
|
||||
chmod +x $out/bin/${pname} $out/share/${pname}
|
||||
in
|
||||
symlinkJoin {
|
||||
inherit name;
|
||||
paths = [ binary ];
|
||||
|
||||
postBuild = ''
|
||||
mkdir -p $out/share/pixmaps/ $out/share/applications
|
||||
cp ${appimage-contents}/ssb-patchwork.png $out/share/pixmaps
|
||||
cp ${desktopItem}/share/applications/* $out/share/applications/
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB).";
|
||||
meta = with lib; {
|
||||
description = "A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)";
|
||||
longDescription = ''
|
||||
sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship.
|
||||
'';
|
||||
homepage = https://www.scuttlebutt.nz/;
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ thedavidmeister ];
|
||||
maintainers = with maintainers; [ thedavidmeister ninjatrappeur flokli ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,22 +1,31 @@
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, perlPackages
|
||||
, goffice, gnome3, wrapGAppsHook, gtk3, bison, pythonPackages
|
||||
, itstool
|
||||
, itstool, autoreconfHook
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (pythonPackages) python pygobject3;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gnumeric";
|
||||
version = "1.12.45";
|
||||
version = "1.12.45"; # TODO next release: remove gamma patch and autoreconfHook
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0c8dl1kvnj3g32qy3s92qpqpqfy0in59cx005gjvvzsflahav61h";
|
||||
};
|
||||
|
||||
patches = stdenv.lib.optional stdenv.isDarwin
|
||||
# https://gitlab.gnome.org/GNOME/gnumeric/issues/402
|
||||
(fetchurl {
|
||||
name = "math-gamma.patch";
|
||||
url = "https://gitlab.gnome.org/GNOME/gnumeric/uploads/cf8d162bc719de92e97d01cb0ba5b637/ppp";
|
||||
sha256 = "17wiigs06qc86a1nghwcg3pcnpa28123jblgsxpy3j7drardgnlp";
|
||||
});
|
||||
|
||||
configureFlags = [ "--disable-component" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ];
|
||||
nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin autoreconfHook;
|
||||
|
||||
# ToDo: optional libgda, introspection?
|
||||
buildInputs = [
|
||||
|
||||
@ -13,11 +13,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "eagle-${version}";
|
||||
version = "9.3.2";
|
||||
version = "9.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz";
|
||||
sha256 = "0xrrd2d86gxrkbqvssbg8zki40hk05h48w73b0hv7wnc7wg1msir";
|
||||
sha256 = "0p3kxryvk853rx24phcadvmqn6f37rnnql8sf6cqn9cqhrrkbvlq";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
||||
@ -34,8 +34,10 @@ in stdenv.mkDerivation (fBuildAttrs // {
|
||||
# https://github.com/bazelbuild/bazel/blob/9323c57607d37f9c949b60e293b573584906da46/src/main/cpp/startup_options.cc#L123-L124
|
||||
#
|
||||
# On macOS Bazel will use the system installed Xcode or CLT toolchain instead of the one in the PATH unless we pass BAZEL_USE_CPP_ONLY_TOOLCHAIN
|
||||
#
|
||||
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 USER=homeless-shelter bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch $bazelFlags $bazelTarget
|
||||
|
||||
# We disable multithreading for the fetching phase since it can lead to timeouts with many dependencies/threads:
|
||||
# https://github.com/bazelbuild/bazel/issues/6502
|
||||
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 USER=homeless-shelter bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch --loading_phase_threads=1 $bazelFlags $bazelTarget
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
@ -59,7 +61,9 @@ in stdenv.mkDerivation (fBuildAttrs // {
|
||||
|
||||
# Patching symlinks to remove build directory reference
|
||||
find $bazelOut/external -type l | while read symlink; do
|
||||
ln -sf $(readlink "$symlink" | sed "s,$NIX_BUILD_TOP,NIX_BUILD_TOP,") "$symlink"
|
||||
new_target="$(readlink "$symlink" | sed "s,$NIX_BUILD_TOP,NIX_BUILD_TOP,")"
|
||||
rm "$symlink"
|
||||
ln -sf "$new_target" "$symlink"
|
||||
done
|
||||
|
||||
cp -r $bazelOut/external $out
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "12.1.01";
|
||||
version = "12.1.02";
|
||||
in fetchzip rec {
|
||||
name = "unifont_upper-${version}";
|
||||
|
||||
@ -9,7 +9,7 @@ in fetchzip rec {
|
||||
|
||||
postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf";
|
||||
|
||||
sha256 = "11b14ka2w16vssxdhgq7k9bx7xx0sr36hfi2vzyimmaibasi1r74";
|
||||
sha256 = "1bpzsgn64762sjkx4hssbm4qw0c1szwli38pch7r8z8hk4mgcv92";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane";
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
buildGoPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dde-api";
|
||||
version = "3.18.3";
|
||||
version = "3.18.4.1";
|
||||
|
||||
goPackagePath = "pkg.deepin.io/dde/api";
|
||||
|
||||
@ -33,7 +33,7 @@ buildGoPackage rec {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0sbzjpjy2d7j22v5sw3mf472lcnsy81n2rgly87k79r5gk9x89ar";
|
||||
sha256 = "0bcjp5ijwa4wmx6p43lik6vjlb7d5rk7nf8xl495i3yk9x70wyfa";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
16
pkgs/desktops/deepin/dde-api/deps.nix
generated
16
pkgs/desktops/deepin/dde-api/deps.nix
generated
@ -32,8 +32,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/disintegration/imaging";
|
||||
rev = "061e8a750a4db9667cdf9e2af7f4029ba506cb3b";
|
||||
sha256 = "13fkknwz2iby5rdzv9sgam6p27zdgxis3sxgyls9sdir5lbhjhm7";
|
||||
rev = "465faf0892b5c7b3325643b0e47282e1331672e7";
|
||||
sha256 = "1z9rkphmqgyphznl53pp1gmf0dfrfrmr95bx46p422ldml26c5a0";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -41,8 +41,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/fogleman/gg";
|
||||
rev = "72436a171bf31757dc87fb8fa9f7485307350307";
|
||||
sha256 = "116ysxj7nv9zw5ff75p2mriwf6fx4qzdik9za8cy0l0vih78qvjq";
|
||||
rev = "f194ddec6f45226fc9e1b4a61b7237f186edd543";
|
||||
sha256 = "095g5hpqvpy5w9l4kb65cif013snsvlbw6sgln0kwdix0z099j3i";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -77,8 +77,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/image";
|
||||
rev = "6d32002ffd7577f23673706728e1c510698cecb1";
|
||||
sha256 = "03jzn07kfgdzzm4785xngcksv9ix6q1lf12b8j91flc0v7swsd1b";
|
||||
rev = "7e034cad644213bc79b336b52fce73624259aeca";
|
||||
sha256 = "04n4yi0p2yjv8sr9dmnzwc2k6hvzzvl6jdq2xd043kvjwzk583va";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -86,8 +86,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "f4e77d36d62c17c2336347bb2670ddbd02d092b7";
|
||||
sha256 = "0avjnglqqg9ya0cbhp23m4namykii219kxjywxn4cd7pfcc5arha";
|
||||
rev = "3b0461eec859c4b73bb64fdc8285971fd33e3938";
|
||||
sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools,
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, cmake, qttools,
|
||||
deepin-gettext-tools, dtkcore, dtkwidget, deepin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dde-calendar";
|
||||
version = "1.2.6";
|
||||
version = "1.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0k973rv0prvr7cg1xwg7kr14fkx13aslhiqc3q7vpakfk53qsw4n";
|
||||
sha256 = "00aqx24jccf88vvkpb9svyjz8knrqyjgd0152psf9dxc9q13f61h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkgconfig
|
||||
qmake
|
||||
qttools
|
||||
deepin-gettext-tools
|
||||
deepin.setupHook
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
buildGoPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dde-daemon";
|
||||
version = "3.27.1";
|
||||
version = "3.27.2.5";
|
||||
|
||||
goPackagePath = "pkg.deepin.io/dde/daemon";
|
||||
|
||||
@ -17,7 +17,7 @@ buildGoPackage rec {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1rbv7fals2bwhalw1hh3swmrdzclqbhny782shnrwqv53235xda3";
|
||||
sha256 = "117yhsb0axwblncyj02fhcyl4b7jl7vvh1bbx08bscih5lnvjihx";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
8
pkgs/desktops/deepin/dde-daemon/deps.nix
generated
8
pkgs/desktops/deepin/dde-daemon/deps.nix
generated
@ -77,8 +77,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/image";
|
||||
rev = "6d32002ffd7577f23673706728e1c510698cecb1";
|
||||
sha256 = "03jzn07kfgdzzm4785xngcksv9ix6q1lf12b8j91flc0v7swsd1b";
|
||||
rev = "7e034cad644213bc79b336b52fce73624259aeca";
|
||||
sha256 = "04n4yi0p2yjv8sr9dmnzwc2k6hvzzvl6jdq2xd043kvjwzk583va";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -86,8 +86,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "f4e77d36d62c17c2336347bb2670ddbd02d092b7";
|
||||
sha256 = "0avjnglqqg9ya0cbhp23m4namykii219kxjywxn4cd7pfcc5arha";
|
||||
rev = "3b0461eec859c4b73bb64fdc8285971fd33e3938";
|
||||
sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
||||
@ -8,13 +8,13 @@ let
|
||||
unwrapped = stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dde-dock";
|
||||
version = "4.9.9";
|
||||
version = "4.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0vscm808q63bbl84q9l3vhhd8mw86wfjdh55rvyj42qpa5q4mvlz";
|
||||
sha256 = "17iy78r0frpv42g521igfdcgdklbifzig1wzxq2nl14fq0bgxg4v";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dde-file-manager";
|
||||
version = "4.8.6.2";
|
||||
version = "4.8.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1qw9slssvy6c4j9czyqrhlr3pq6hzxybb86darja2vka84zmvwip";
|
||||
sha256 = "1m0ykw5a91rm5xcah8bzk21xsambqvncj8104ihdhf9h0z9kdmm2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dde-polkit-agent";
|
||||
version = "0.2.6";
|
||||
version = "0.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ih78sxhnn6hbx9mzhalx95dk18f217mjbvymf8dky2vkmw8vnmx";
|
||||
sha256 = "0syg121slpd6d9xpifgcf85lg9ca0k96cl1g3rjvsmczs2d2ffgf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -27,10 +27,6 @@ stdenv.mkDerivation rec {
|
||||
polkit-qt
|
||||
];
|
||||
|
||||
patches = [
|
||||
./dde-polkit-agent.plugins-dir.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
searchHardCodedPaths
|
||||
patchShebangs translate_generation.sh
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dde-qt-dbus-factory";
|
||||
version = "1.1.1";
|
||||
version = "1.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1b2i5m6fzkga72hbl85v2rng3qq53di39p7jj2f119wmlfbyp2vg";
|
||||
sha256 = "1jzfblsmnfpgym95mmbd8mjkk8wqqfb0kz6n6fy742hmqlzrpsj7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dde-session-ui";
|
||||
version = "4.9.6";
|
||||
version = "4.9.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1wk5mjv1g9my80cxpcycqkm2gjc5r5rrcpxmsl06w4g2c19k50x1";
|
||||
sha256 = "16nrlqw8p9s4ncypg4q2df9xpg37y6hqcjn0zmrsfnc5j3i0z82a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-anything";
|
||||
version = "0.0.7";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1qggqjjqz2y51pag0v5qniv6763mgrmzjmr7248xx2paw3a923vk";
|
||||
sha256 = "1kvyffrii4b012f6ld1ih14qrn7gg5cxbdpbkac0wxb22hnz0azm";
|
||||
};
|
||||
|
||||
outputs = [ "out" "modsrc" ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-desktop-base";
|
||||
version = "2019.04.24";
|
||||
version = "2019.06.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0mdfjkyjrccxlsg05mf80qcw8v5srlp80rvjkpnnbhfscq1fnpgn";
|
||||
sha256 = "1r158x4z4qalv4q1ni3aln05krdzblvr7y6wyciwl7cr5ag1i1jy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ deepin.setupHook ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-desktop-schemas";
|
||||
version = "3.13.0";
|
||||
version = "3.13.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0bamjcpmsl8xhw3ksgl11wv5xwcdhrkl1namikfzc4an03sk1rdq";
|
||||
sha256 = "03jqb47kjyb9b43m2yincfjn2i43ma1pn1hddyicrrpg937caa81";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-gtk-theme";
|
||||
version = "17.10.10";
|
||||
version = "17.10.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = "deepin-gtk-theme";
|
||||
rev = version;
|
||||
sha256 = "0vwly24cvjwhvda7g3l595vpf99d2z7b2zr0q5kna4df4iql7vn4";
|
||||
sha256 = "0zs6mq70yd1k3d9zm3q6zxnw1md56r4imad5imdxwx58yxdx47fw";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-icon-theme";
|
||||
version = "15.12.69";
|
||||
version = "15.12.71";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1y6r2as3acqkq8z1d44c82jfplihscmqc9fgpq1j0anznwcdj73k";
|
||||
sha256 = "12rzzjp906np95ckbxrd4mb345lm198wz69kxy48f8q1zg78q8iw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 xcursorgen ];
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-image-viewer";
|
||||
version = "1.3.13";
|
||||
version = "1.3.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ql3li63qiw92jx5jzmx3k115vdn3cjfysja3afjhmfngq1xibmj";
|
||||
sha256 = "0hz4f1kqcycyvggwfzpkblhhha87rqd427hq0mf31jfh5x17ymnh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-menu";
|
||||
version = "3.4.6";
|
||||
version = "3.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1gxf3slqx1s15bjrds29sas7ah6kp8c4pjvzwipncyx6qfgczj2a";
|
||||
sha256 = "09i0ybllymlj7s46pxma5py6x8nknfja4gxn5gj9kpf2c37qsqjc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-movie-reborn";
|
||||
version = "3.2.22.1";
|
||||
version = "3.2.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1qh079j4c2n33z0ykv87af9vfkmdxxrv6dy54wdqdpr7vrhn89gb";
|
||||
sha256 = "16mxym7dm6qk90q2w7xqm62047rq0lirrjmnnpaxshzaww9gngkh";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-screenshot";
|
||||
version = "4.1.10";
|
||||
version = "4.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "00zmmnvm5wv9fkc9fbqs23jsqs1mnr68afl4irj6y287ic0pj61i";
|
||||
sha256 = "16wy1ywp4lm7fg488laqxgxpir745rbpj9z410r6x7krpgjds189";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-terminal";
|
||||
version = "3.2.2.1";
|
||||
version = "3.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = "deepin-terminal";
|
||||
rev = version;
|
||||
sha256 = "08bhdd9q4aqy5yjbpqy918j63c3b2rrdqdkxh3fk258n1fm72gmw";
|
||||
sha256 = "09s5gvzfxfb353kb61x1b6z3h2aqgln3s3mah3f3zkf5y8hrp2pj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dtkcore";
|
||||
version = "2.0.12.1";
|
||||
version = "2.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1akfzkdhgsndm6rlr7snhpznxj0w351v6rr8vvnr6ka2dw75xsl4";
|
||||
sha256 = "0yc6zx8rhzg9mj2brggcsr1jy1pzfvgqy1h305y2dwnx5haazd04";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dtkwidget";
|
||||
version = "2.0.12.3";
|
||||
version = "2.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0z71il09gj1frkxfw3av97szh17spr6ss1k07l0prk1s1wm7yyfr";
|
||||
sha256 = "11ws0rl7rhlgwbqd4nqpqxhngf4lcyfrrdq33wzxwdlk33d69i1h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "go-dbus-factory";
|
||||
version = "0.7.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "080bcwbq00d91iazgl59cp5ra2x6xkhnc41ipvglvrkibq9zi1a4";
|
||||
sha256 = "06fqyad9f50gcjsjkh7929yyaprahdjhnd0dr4gl2797a7wysl3f";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder ''out''}" ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "go-gir-generator";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0jdhfnwrpp77893zxljr453w23kahqsdpd8a8i5jp6pyvkdm816j";
|
||||
sha256 = "1ydzll8zlk897iqcihvv6p046p0rzr4qqz2drmz2nx95njp8n03a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "qt5dxcb-plugin";
|
||||
version = "1.1.27";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1hs7r17qsqn3hgfjd0scagpj1dqys7i1507vxadfac4h1ahyxaz7";
|
||||
sha256 = "1zvab6qxdr49pmk6mbk7s0md7bx585p32lca0xbg8mrkajz7g8rq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "qt5integration";
|
||||
version = "0.3.11";
|
||||
version = "0.3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1p3bnjy449vy5mpxassjv6sr2dp887gsss000szk5s0p1agmydxq";
|
||||
sha256 = "140wb3vcm2ji8jhqdxv8f4shiknia1zk8fssqlp09kzc1cmb4ncy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "marco-${version}";
|
||||
version = "1.22.1";
|
||||
version = "1.22.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1j7pvq8ndyl2x8jmh95sj69cnf0q9qsjn7lkr3jz6hk103mga82f";
|
||||
sha256 = "0sc7x14229yj22ka1vlzbaqndwcgh6idypjmm9rydkj4n968jwry";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mate-themes-${version}";
|
||||
version = "3.22.19";
|
||||
version = "3.22.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1ycb8b8r0s8d1h1477135mynr53s5781gdb2ap8xlvj2g58492wq";
|
||||
sha256 = "0c3dhf8p9nc2maky4g9xr04iil9wwbdkmhpzynlc6lfg4ksqq2bx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool gtk3 ];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
name = "fasm-bin-${version}";
|
||||
|
||||
version = "1.73.11";
|
||||
version = "1.73.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://flatassembler.net/fasm-${version}.tgz";
|
||||
sha256 = "1zhbs72qc8bw5158zh6mvzznfamcx5a1bsmbmq9ci0d7wb58sxmg";
|
||||
sha256 = "19x5244bcg97mnx871daksj98fg4zxc8jmihl0napcd77xmiga8s";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -35,14 +35,12 @@
|
||||
# IE: programs coupled with the compiler
|
||||
, allowGoReference ? false
|
||||
|
||||
, meta ? {}, ... } @ args':
|
||||
, meta ? {}, ... } @ args:
|
||||
|
||||
|
||||
with builtins;
|
||||
|
||||
let
|
||||
args = lib.filterAttrs (name: _: name != "extraSrcs") args';
|
||||
|
||||
removeReferences = [ ] ++ lib.optional (!allowGoReference) go;
|
||||
|
||||
removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}'';
|
||||
@ -75,7 +73,7 @@ let
|
||||
goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs
|
||||
else extraSrcs;
|
||||
package = go.stdenv.mkDerivation (
|
||||
(builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // {
|
||||
(builtins.removeAttrs args [ "goPackageAliases" "disabled" "extraSrcs"]) // {
|
||||
|
||||
nativeBuildInputs = [ removeReferencesTo go ]
|
||||
++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
|
||||
|
||||
@ -4,15 +4,15 @@
|
||||
}:
|
||||
build-idris-package {
|
||||
name = "tparsec";
|
||||
version = "2018-12-21";
|
||||
version = "2019-06-18";
|
||||
|
||||
ipkgName = "TParsec";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gallais";
|
||||
repo = "idris-tparsec";
|
||||
rev = "6fafcaa894def6f2af86bc799e507013b56e7741";
|
||||
sha256 = "0alnw0hqjs200gvb5f58lb16rna48j1v6wnvq4q7zbw99dcxsxwn";
|
||||
rev = "3809afd8735b0054e5db788f18a7fa8ed71d8278";
|
||||
sha256 = "0wmgg1zg9p8gqlfvcsnww17jsifx9987cxqdq6kbdgasn26w2rqx";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
11
pkgs/development/interpreters/erlang/R22.nix
Normal file
11
pkgs/development/interpreters/erlang/R22.nix
Normal file
@ -0,0 +1,11 @@
|
||||
{ mkDerivation }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "22.0.4";
|
||||
sha256 = "1aqkhd6nwdn4xp5yz02zbymd4x8ij8fjw9ji8kh860n1a513k9ai";
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' '10.10'
|
||||
substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' ""
|
||||
'';
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-common";
|
||||
version = "0.3.9";
|
||||
version = "0.3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "04wrmrw83vypqzsq88b2q8kp5sfbv0qsci3bcxw0c2mfxqk8358n";
|
||||
sha256 = "0a7hi4crnc3j1j39qcnd44zqdfwzw1xghcf80marx5vdf1qdzy6p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hpx-${version}";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "STEllAR-GROUP";
|
||||
repo = "hpx";
|
||||
rev = "${version}";
|
||||
sha256 = "18dk9413qcgljdlw2jfkk21lwi4iwc57s41yqnc3jp8vdj96w32s";
|
||||
sha256 = "0yzxb8520qh9rvzsa190yzx21jn3d8rl8ac5v01767ygd0413hfk";
|
||||
};
|
||||
|
||||
buildInputs = [ boost hwloc gperftools ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "intel-gmmlib-${version}";
|
||||
version = "19.1.2";
|
||||
version = "19.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "gmmlib";
|
||||
rev = name;
|
||||
sha256 = "1nw5qg10dqkchx39vqk9nkqggk0in2kr794dqjp73njpirixgr2b";
|
||||
sha256 = "174bpkmr20ng9h9xf9fy85lj3pw6ysmbhcvhjfmj30xg3hs2ar3k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lasem";
|
||||
version = "0.4.3";
|
||||
version = "0.4.4";
|
||||
|
||||
outputs = [ "bin" "out" "dev" "man" "doc" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "13ym5pm2y3wk5hh9zb2535i3lnhnzyzs0na1knxwgvwxazwm1ng7";
|
||||
sha256 = "0fds3fsx84ylsfvf55zp65y8xqjj5n8gbhcsk02vqglivk7izw4v";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, cmake, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nss_wrapper-1.1.5";
|
||||
name = "nss_wrapper-1.1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://samba/cwrap/${name}.tar.gz";
|
||||
sha256 = "0srk7hffhkwl811q4pjy0n0gm8rh26akb2bh6avcpbns0zzn9ldn";
|
||||
sha256 = "1hijnwabj4nh0m0a913pq07iqq0bw8qb2zxcv73zbnsaay7pa55h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = lib.optional stdenv.isDarwin [ ./bsm-add-audit_token_to_pid.patch ];
|
||||
|
||||
configureFlags = [ "ac_cv_file__usr_include_mach_audit_triggers_defs=no" ];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.openbsm.org/;
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rdkafka-${version}";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edenhill";
|
||||
repo = "librdkafka";
|
||||
rev = "v${version}";
|
||||
sha256 = "1k4lk2vvvni87brs3j51by3j69ff2892jiq2f4979sxncq0apzlg";
|
||||
sha256 = "1jxwsizqwckjzirh9gsvlca46z4y3i47vcifs1fh8gxb2lvdfgwb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiorpcx";
|
||||
version = "0.18.3";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "aiorpcX";
|
||||
sha256 = "0k545hc7wl6sh1svydzbv6x7sx5pig2pqkl3yxs9riwmvzawx9xp";
|
||||
sha256 = "14np5r75rs0v45vsv20vbzmnv3qisvm9mdllj1j9s1633cvcik0k";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ attrs ];
|
||||
|
||||
@ -25,11 +25,11 @@ let
|
||||
|
||||
package = buildPythonPackage rec {
|
||||
pname = "buildbot";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1fdahbpihs93pj640y2079yilca6w7vlwirfcz221885ih148257";
|
||||
sha256 = "0qzr6my8zvaj0a1jwyaf254rdgm1xcyq8zp4b6fa5aqigfld4dfg";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "buildbot-pkg";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1ajgvnhwvryi10q9bklpfazi7vxw2my9jlqgwnjccycbr6yznzsw";
|
||||
sha256 = "0bpqiih15b5kzx1r542m8j7ydbnmgzhdnkaxv0z7gjv21k78m5i5";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
python = "py3";
|
||||
sha256 = "134b8y498bq5fp4863hj9058wr7mcw0xgl74br0f1dy9n7jdcl39";
|
||||
sha256 = "1ii01py78wkda9x4lqm0bxqmb4dhvbdmmz7sncm1lw7bhmhqh84w";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1yh8xij3wizz0f88chjpdijm7i35ql87g84ph3f76sqyr6aj6ckw";
|
||||
sha256 = "1y523hadw3398jwfpmi2f4g0s6dp9y191qzycrsbvbj147dp0qra";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ buildbot-pkg ];
|
||||
@ -48,7 +48,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "04iihy1s9r4n5jlk57pdjy3yvp6zym2iv2bgqjhw6fy0hff5j8ys";
|
||||
sha256 = "1prfr03igcmagydvxqhrh6k6wz16vk6fwgrm143jh3xmml6f16ll";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ buildbot-pkg ];
|
||||
@ -68,7 +68,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0bcilhcz9xnr8799d5j4sm6qz8pdjlckdck7a282nfs64liajsrh";
|
||||
sha256 = "1xkqiwxjppyns2s0239zzvbnr8b7vdakypj95mca89mmnyniflxj";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ buildbot-pkg ];
|
||||
@ -88,7 +88,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "13lr7lzi9sv0s6xrfalq0dkcys6fp7hn0787rjhnz9gc7x83aqjv";
|
||||
sha256 = "1jhvq61x0bzh03nd2ac11swdjn0ndnx3ac7x9v3m3v0pgr08rc28";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ buildbot-pkg ];
|
||||
|
||||
@ -1,12 +1,13 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, setuptoolsTrial, mock, twisted, future }:
|
||||
{ lib, buildPythonPackage, fetchPypi, setuptoolsTrial, mock, twisted, future,
|
||||
coreutils }:
|
||||
|
||||
buildPythonPackage (rec {
|
||||
pname = "buildbot-worker";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0nldf4ws1nrkhbapxiy2s8j9fjfbkhp17c5912p6qy3ximfcfa93";
|
||||
sha256 = "0lvgqcayd4f32895g3cwrbnjw6p94nrggbq7wfz5mwbhpgg6hv52";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ twisted future ];
|
||||
@ -14,7 +15,8 @@ buildPythonPackage (rec {
|
||||
checkInputs = [ setuptoolsTrial mock ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace buildbot_worker/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
|
||||
substituteInPlace buildbot_worker/scripts/logwatcher.py \
|
||||
--replace /usr/bin/tail "${coreutils}/bin/tail"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
18
pkgs/development/python-modules/midiutil/default.nix
Normal file
18
pkgs/development/python-modules/midiutil/default.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "MIDIUtil";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "02m9sqv36zrzgz5zg2w9qmz8snzlm27yg3ways2hgipgs4xriykr";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/MarkCWirt/MIDIUtil";
|
||||
description = "A pure python library for creating multi-track MIDI files";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.gnidorah ];
|
||||
};
|
||||
}
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "r2pipe";
|
||||
version = "1.3.1";
|
||||
version = "1.4.1";
|
||||
|
||||
postPatch = let
|
||||
r2lib = "${lib.getOutput "lib" radare2}/lib";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0xvv12q3cwbibim3r97dsz6lbj7xxhlbq7fdm4pznwfzg803cmiv";
|
||||
sha256 = "02r2xrnanzp7iskqbq8flzhc4d56hlzyf3qwqp3azys838y0kcyy";
|
||||
};
|
||||
|
||||
# Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't
|
||||
|
||||
38
pkgs/development/python-modules/scikitlearn/0.20.nix
Normal file
38
pkgs/development/python-modules/scikitlearn/0.20.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
, gfortran, glibcLocales
|
||||
, numpy, scipy, pytest, pillow
|
||||
}:
|
||||
|
||||
# 0.20.x is the last version that maintains python2 compatibility
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scikit-learn";
|
||||
version = "0.20.3";
|
||||
# UnboundLocalError: local variable 'message' referenced before assignment
|
||||
disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c503802a81de18b8b4d40d069f5e363795ee44b1605f38bc104160ca3bfe2c41";
|
||||
};
|
||||
|
||||
buildInputs = [ pillow gfortran glibcLocales ];
|
||||
propagatedBuildInputs = [ numpy scipy numpy.blas ];
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
LC_ALL="en_US.UTF-8";
|
||||
|
||||
doCheck = !stdenv.isAarch64;
|
||||
# Skip test_feature_importance_regression - does web fetch
|
||||
checkPhase = ''
|
||||
cd $TMPDIR
|
||||
HOME=$TMPDIR OMP_NUM_THREADS=1 pytest -k "not test_feature_importance_regression" --pyargs sklearn
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A set of python modules for machine learning and data mining";
|
||||
homepage = http://scikit-learn.org;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,13 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, python
|
||||
, gfortran, glibcLocales, joblib, pythonOlder
|
||||
, numpy, scipy, pytest, pillow, cython
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, gfortran, glibcLocales
|
||||
, numpy, scipy, pytest, pillow
|
||||
, cython
|
||||
, joblib
|
||||
, llvmPackages
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -11,13 +18,28 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0aafc312a55ebf58073151b9308761a5fcfa45b7f7730cea4b1f066f824c72db";
|
||||
sha256 = "1nvj9j16y1hz9gm0qwzpnx2zmz55c63k1fai643migsyll9c7bqa";
|
||||
};
|
||||
|
||||
buildInputs = [ pillow gfortran glibcLocales ];
|
||||
propagatedBuildInputs = [ numpy scipy numpy.blas joblib ];
|
||||
buildInputs = [
|
||||
pillow
|
||||
gfortran
|
||||
glibcLocales
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
llvmPackages.openmp
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
numpy.blas
|
||||
joblib
|
||||
];
|
||||
checkInputs = [ pytest ];
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
||||
LC_ALL="en_US.UTF-8";
|
||||
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "PySoundFile";
|
||||
version = "0.9.0.post1";
|
||||
name = pname + "-" + version;
|
||||
pname = "soundfile";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "43dd46a2afc0484c26930a7e59eef9365cee81bce7a4aadc5699f788f60d32c3";
|
||||
pname = "SoundFile";
|
||||
inherit version;
|
||||
sha256 = "0w8mjadairg6av88090kwsridd0k115672b91zlcmf37r0c64zv3";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
@ -29,10 +29,11 @@ buildPythonPackage rec {
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace soundfile.py --replace "'sndfile'" "'${libsndfile.out}/lib/libsndfile.so'"
|
||||
postPatch = ''
|
||||
substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'"
|
||||
'';
|
||||
|
||||
# https://github.com/bastibe/PySoundFile/issues/157
|
||||
disabled = isPyPy || stdenv.isi686;
|
||||
|
||||
}
|
||||
28
pkgs/development/tools/conftest/default.nix
Normal file
28
pkgs/development/tools/conftest/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "conftest";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "instrumenta";
|
||||
repo = "conftest";
|
||||
rev = "v${version}";
|
||||
sha256 = "0qq2kp9h91rirlhml5vyzmi7rd4v3pkqjk2bn7mvdn578jnwww24";
|
||||
};
|
||||
|
||||
buildFlagsArray = ''
|
||||
-ldflags=
|
||||
-X main.version=${version}
|
||||
'';
|
||||
|
||||
modSha256 = "0c9phka7n2cfi8lf0a3prks2pjna5dgf5lj6az82iklnq4p7177y";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Write tests against structured configuration data";
|
||||
homepage = https://github.com/instrumenta/conftest;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ yurrriq ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gtk2, gawk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
name = "visualvm-${version}";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip";
|
||||
sha256 = "0kic1rqxaj2rpnflj1wklsy3gjz50gcb0wak4qi3hjkz5rv6gp1y";
|
||||
sha256 = "0pnziy24mdjnphvbw9wcjdxxc2bn7fqmsc19vabvfcck49w9rbvb";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
||||
32
pkgs/development/tools/misc/sccache/default.nix
Normal file
32
pkgs/development/tools/misc/sccache/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
version = "0.2.8";
|
||||
name = "sccache-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "sccache";
|
||||
rev = version;
|
||||
sha256 = "08v8s24q6246mdjzl5lirqg0csxcmd17szmw4lw373hvq4xvf0yk";
|
||||
};
|
||||
cargoSha256 = "1lafzin92h1hb1hqmbrsxja44nj8mpbsxhwcjr6rf5yrclgwmcxj";
|
||||
cargoBuildFlags = [ "--features=all" ];
|
||||
nativeBuildInputs = [
|
||||
pkgconfig cargo rustc
|
||||
];
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
|
||||
# Tests fail because of client server setup which is not possible inside the pure environment,
|
||||
# see https://github.com/mozilla/sccache/issues/460
|
||||
checkPhase = null;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Ccache with Cloud Storage";
|
||||
homepage = https://github.com/mozilla/sccache;
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -7,11 +7,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "omnisharp-roslyn-${version}";
|
||||
version = "1.32.8";
|
||||
version = "1.32.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz";
|
||||
sha256 = "0k2a4awmzb7ppll2skyzaa94n3hxqm35ffibl0sygldk3symzwgp";
|
||||
sha256 = "0flmijar7ih9wp2i585035zhgwpqymr2y778x841bpgv412kxgpz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "enyo-doom-${version}";
|
||||
version = "1.06";
|
||||
version = "1.06.9";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "sdcofer70";
|
||||
repo = "enyo-doom";
|
||||
rev = version;
|
||||
sha256 = "17f9qq8gnim6glqlrg7189my4d5y40v76cbpaqgpvrhpyc7z9vf6";
|
||||
sha256 = "0vx5zy47cqrqdgyx31wg56ivva0qqiyww8bp1x32ax99danymjyf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -61,12 +61,12 @@ let
|
||||
|
||||
ale = buildVimPluginFrom2Nix {
|
||||
pname = "ale";
|
||||
version = "2019-06-13";
|
||||
version = "2019-06-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "w0rp";
|
||||
repo = "ale";
|
||||
rev = "6e28eec243c4df3cf3b67bac9f87fdd30c846cbd";
|
||||
sha256 = "15r479nwbxv29ryiiqn3yc7srg5yx1mj6whblxpnmjxjiwsy4yym";
|
||||
rev = "65ba4b85ec3011cccb9ea7135183e7fc8d7a0d69";
|
||||
sha256 = "00g2yjrq7gbdc9wmj2bpcpx6frvsyk69bbi05a8b43lpdkj5yzz5";
|
||||
};
|
||||
};
|
||||
|
||||
@ -180,6 +180,17 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
camelcasemotion = buildVimPluginFrom2Nix {
|
||||
pname = "camelcasemotion";
|
||||
version = "2019-06-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bkad";
|
||||
repo = "camelcasemotion";
|
||||
rev = "2a62526721b6a4324bec3408e4ed9f8eebf96f3b";
|
||||
sha256 = "1pj7q0ic6hs6niflp64izk5v3kdw951ram035v3xv1gjsp1aa5a6";
|
||||
};
|
||||
};
|
||||
|
||||
caw-vim = buildVimPluginFrom2Nix {
|
||||
pname = "caw-vim";
|
||||
version = "2019-06-13";
|
||||
@ -237,12 +248,12 @@ let
|
||||
|
||||
coc-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "coc-nvim";
|
||||
version = "2019-06-15";
|
||||
version = "2019-06-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc.nvim";
|
||||
rev = "02d34c39eb798f5902dd8c986842e14c479a7b17";
|
||||
sha256 = "1ww9q2cs88zy74p1y07c480dsjgf6g1prl10w86rhpxhjp9d4jhw";
|
||||
rev = "0cf54ed4f19374a7d6a81528675497ef82214e95";
|
||||
sha256 = "1dvwwzhw26rf82k03j1a82axga07nsihlnx6vhj9v9ab2di005i1";
|
||||
};
|
||||
};
|
||||
|
||||
@ -414,34 +425,34 @@ let
|
||||
|
||||
denite-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "denite-nvim";
|
||||
version = "2019-06-15";
|
||||
version = "2019-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "denite.nvim";
|
||||
rev = "54f322011a3a94d27e0814f1a7ae55385eab0a3e";
|
||||
sha256 = "08nvp4vr29g8q666cmnqv436p42i1l9bh7qgh4qnv62kms40jp3f";
|
||||
rev = "d1d1ac5a8e2a91fe99c5bb66ca32d6b85f9ac735";
|
||||
sha256 = "1np25k6vs7xkd1ljajhiifmxiaz1cpvq0syzhdr21d81dfi1piil";
|
||||
};
|
||||
};
|
||||
|
||||
deol-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "deol-nvim";
|
||||
version = "2019-06-12";
|
||||
version = "2019-06-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "deol.nvim";
|
||||
rev = "6ef9abb552873a53857ef9b4381a5a1eca95cd35";
|
||||
sha256 = "0n07xg5v2pyxhzk9rn37yc3i47c5qvni0vlsrpj6015q4g48v2z1";
|
||||
rev = "ed807a398fd5120a5dfbff7877517b25cd801bea";
|
||||
sha256 = "131wzadip0d0wgn32vy38w02mx199kvcg62ldfwr68nyad48j98l";
|
||||
};
|
||||
};
|
||||
|
||||
deoplete-clang = buildVimPluginFrom2Nix {
|
||||
pname = "deoplete-clang";
|
||||
version = "2019-03-06";
|
||||
version = "2019-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zchee";
|
||||
repo = "deoplete-clang";
|
||||
rev = "479124849641a779b0638f4c90d77fb735a58def";
|
||||
sha256 = "1qr1r55akx9j1n9gi3ix63dr55lbdsmx1sqhlclz4fr308x8rd11";
|
||||
rev = "30f17cb58b7838492fbe6b9d62b70b52c8ceedf7";
|
||||
sha256 = "0rdr8hxmlbf633ffr217l5vzqdxjxihp4vi2iq3k1491b0pwnzi0";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
};
|
||||
@ -471,12 +482,12 @@ let
|
||||
|
||||
deoplete-jedi = buildVimPluginFrom2Nix {
|
||||
pname = "deoplete-jedi";
|
||||
version = "2019-05-21";
|
||||
version = "2019-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zchee";
|
||||
repo = "deoplete-jedi";
|
||||
rev = "55471c298412ea3017b0189fd96c032a780963e1";
|
||||
sha256 = "1s85a6inp4j1k2llg8vgdiwb4n1rk9hdahrczl32fwxi95c0fv41";
|
||||
rev = "afd01dc2204d5003f89f6a93e1d3e1910d31fcd9";
|
||||
sha256 = "0p70v03wjdvyy8g13m8b2r288262zz5yw3yap11id38npykb0pvv";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
};
|
||||
@ -516,12 +527,12 @@ let
|
||||
|
||||
deoplete-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "deoplete-nvim";
|
||||
version = "2019-06-04";
|
||||
version = "2019-06-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "deoplete.nvim";
|
||||
rev = "3e22aabe7500317c5f269a6a552e95e4f8124152";
|
||||
sha256 = "1kx643c5rkbln1zaq43k2wnfph7nfkmp8x7dwnjq96q0s3rpjkck";
|
||||
rev = "aebaec4adbb65339601063f1ee533eef09220145";
|
||||
sha256 = "11kd4m3bwp8xn5i6am9am186rz8vw12zdissb3i86xa3dcgv856g";
|
||||
};
|
||||
};
|
||||
|
||||
@ -583,12 +594,12 @@ let
|
||||
|
||||
emmet-vim = buildVimPluginFrom2Nix {
|
||||
pname = "emmet-vim";
|
||||
version = "2019-06-07";
|
||||
version = "2019-06-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattn";
|
||||
repo = "emmet-vim";
|
||||
rev = "24fbb0aef7004e183e377c6c244a5dd8845ef07c";
|
||||
sha256 = "0hgp7aip5wc98rh43w9di8f6f19r03f4l7j6lzpks5gpsm4hwfz3";
|
||||
rev = "5a7c7930c675220121e62d8eecfdbee653e95bac";
|
||||
sha256 = "0ippqmdw2mhi34yvnpfh0v08v59zvn2nq815b8zfq1ci0j2q7smy";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
};
|
||||
@ -927,12 +938,12 @@ let
|
||||
|
||||
Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
|
||||
pname = "Jenkinsfile-vim-syntax";
|
||||
version = "2018-11-25";
|
||||
version = "2019-06-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinda";
|
||||
repo = "Jenkinsfile-vim-syntax";
|
||||
rev = "57c50f21de4a710d7f1c1e50d7ecc7e8d5301cec";
|
||||
sha256 = "0my1zpw5g2bjyx0d027a8klys7kgqg51n9pi773bhk0smqwmfp2b";
|
||||
rev = "bf7ca0927c82edc495f7fa67bebc58e92567aa20";
|
||||
sha256 = "1ikpbg8whabfir6xpb6z4hs8ay3rg9q2qw45sn1ggfikp7dxfwbx";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1191,12 +1202,12 @@ let
|
||||
|
||||
neomake = buildVimPluginFrom2Nix {
|
||||
pname = "neomake";
|
||||
version = "2019-06-07";
|
||||
version = "2019-06-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neomake";
|
||||
repo = "neomake";
|
||||
rev = "3e8f7c5b2f108e5a7e1cffff37321abd06edf997";
|
||||
sha256 = "1h0fk2097zfilbfawcg5k4j7p4ff17396pb3yfipd4ik9hfnbgk0";
|
||||
rev = "17f199f69fc9c4f93672293fdc2713e5c33987c2";
|
||||
sha256 = "1mvk3v0z7xffn2rigzj8fab4rdvlj9chfwmrshri0i9hza8kp1za";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1246,12 +1257,12 @@ let
|
||||
|
||||
neoterm = buildVimPluginFrom2Nix {
|
||||
pname = "neoterm";
|
||||
version = "2019-03-11";
|
||||
version = "2019-06-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kassio";
|
||||
repo = "neoterm";
|
||||
rev = "d177900cc851c4f7f57755134c42a36c155b3554";
|
||||
sha256 = "0c1wymqi5jznsgv24bldchxds3bkzyc7wsmb9v1himgln9bdhjdf";
|
||||
rev = "86eaa7552859effa21a1688e1aeb9f3db5cad784";
|
||||
sha256 = "1fg027lk4w1zj7300jmwqhcwywcsz10wxdq0pi23zqvz274nbl5f";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1279,23 +1290,23 @@ let
|
||||
|
||||
nerdcommenter = buildVimPluginFrom2Nix {
|
||||
pname = "nerdcommenter";
|
||||
version = "2019-06-08";
|
||||
version = "2019-06-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "scrooloose";
|
||||
repo = "nerdcommenter";
|
||||
rev = "17cec9747e464867676d8bee6cb7b411f17bd006";
|
||||
sha256 = "1ph87m17liifmffaq3iizinhmq2z59jfpydlnsv6d67x5ia58dc5";
|
||||
rev = "14cd7719acde39595ef408853123e208b906cf58";
|
||||
sha256 = "1ls83wif37g8hrm25xg1ra4q2yszwzm0ib9af8idgqs2wh3h0b0m";
|
||||
};
|
||||
};
|
||||
|
||||
nerdtree = buildVimPluginFrom2Nix {
|
||||
pname = "nerdtree";
|
||||
version = "2019-06-13";
|
||||
version = "2019-06-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "scrooloose";
|
||||
repo = "nerdtree";
|
||||
rev = "12dea6ccb2381a2b6b8ae0bf17b4078699bbfec3";
|
||||
sha256 = "0r3w1anbg57mifavb7lg4gdyji03hc9jmjs006prs2w8zfc9zqds";
|
||||
rev = "33fe2fdf16a95c12e8284364c780ed405dbaad17";
|
||||
sha256 = "01w3a6wkfjg55n27flsv3v0z0aav09nhwm70n2wfb25hgbqkcqxd";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1389,12 +1400,12 @@ let
|
||||
|
||||
onehalf = buildVimPluginFrom2Nix {
|
||||
pname = "onehalf";
|
||||
version = "2019-02-12";
|
||||
version = "2019-06-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sonph";
|
||||
repo = "onehalf";
|
||||
rev = "c0f08a297e69bc2826f748949e7ce4f0532797ee";
|
||||
sha256 = "0lg5bn5wa5mi7ldghnfwgkiprzs11is2pgsxc9a79wd7skr00smp";
|
||||
rev = "da0ca0b0036f2e9afe1a25592cd1ac41cce61112";
|
||||
sha256 = "0mrv6gmqfqc6lwnwhw788n6lpf36lwbwksbzw0l87rwj104ima9d";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1411,12 +1422,12 @@ let
|
||||
|
||||
papercolor-theme = buildVimPluginFrom2Nix {
|
||||
pname = "papercolor-theme";
|
||||
version = "2019-04-16";
|
||||
version = "2019-06-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NLKNguyen";
|
||||
repo = "papercolor-theme";
|
||||
rev = "129608399ad3cc49dde798741a64c14131dfc908";
|
||||
sha256 = "1jvazpk51azklm3la590k3318mnz2v4pg7sdjj5z9dsdvd69qi3y";
|
||||
rev = "8e7343ce8f28d5177939e394043ce0250e6f9a6e";
|
||||
sha256 = "08d0y7xr72d42jgb0y3w2qxl6i7kv4alqaplzmiw8xkd0m3dxss8";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1840,12 +1851,12 @@ let
|
||||
|
||||
tender-vim = buildVimPluginFrom2Nix {
|
||||
pname = "tender-vim";
|
||||
version = "2017-03-14";
|
||||
version = "2019-06-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jacoborus";
|
||||
repo = "tender.vim";
|
||||
rev = "6b0497a59233b3e67fb528a498069eb1d24743f9";
|
||||
sha256 = "1iqijk7xq0g6p3j8jgzgrhqizw87fnfryx73iaqqx5iyq1k8i9mn";
|
||||
rev = "19b5067d623ab5d74fa0b42a6ce9aa345e708b27";
|
||||
sha256 = "0hdc3qfibc41jcijjdj95j5vpz5ifhkn0rhgfmph33yn1cn154gx";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1882,6 +1893,17 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
tmux-complete-vim = buildVimPluginFrom2Nix {
|
||||
pname = "tmux-complete-vim";
|
||||
version = "2019-05-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wellle";
|
||||
repo = "tmux-complete.vim";
|
||||
rev = "897aaecdffd0133548ea7f8b5d76472236322ab6";
|
||||
sha256 = "0iazphx5708hwpzyys7mx7hilkrarh7g5251j18m1pg5smbbfjvr";
|
||||
};
|
||||
};
|
||||
|
||||
traces-vim = buildVimPluginFrom2Nix {
|
||||
pname = "traces-vim";
|
||||
version = "2019-06-11";
|
||||
@ -1983,12 +2005,12 @@ let
|
||||
|
||||
verilog_systemverilog-vim = buildVimPluginFrom2Nix {
|
||||
pname = "verilog_systemverilog-vim";
|
||||
version = "2019-06-06";
|
||||
version = "2019-06-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vhda";
|
||||
repo = "verilog_systemverilog.vim";
|
||||
rev = "ae5bf6d199ecf1d76159157973f03f91c57667b8";
|
||||
sha256 = "0dsda4x8ygbyvkcwjr5hb5ah0i4jfmq38ng6bf5f71rzl223s5yq";
|
||||
rev = "50294c3a1be2887a87289f136d51a82bf97d2b1b";
|
||||
sha256 = "1c1s7a99xqmy86mbgqvyfp9msvnk11shnkmjyzcv95432xf7jhqm";
|
||||
};
|
||||
};
|
||||
|
||||
@ -2247,12 +2269,12 @@ let
|
||||
|
||||
vim-android = buildVimPluginFrom2Nix {
|
||||
pname = "vim-android";
|
||||
version = "2019-06-07";
|
||||
version = "2019-06-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hsanson";
|
||||
repo = "vim-android";
|
||||
rev = "d7b0ce2416cdea3cefa8ab16ba9c2339bf3da2fb";
|
||||
sha256 = "0jxgagsv60nzjpy563m7bgpv8vn2lj743z5j7078qhclpql7cxk9";
|
||||
rev = "d7c9d7297100e4a3a501be185b34048553561bba";
|
||||
sha256 = "0ly3vi5w6gx78p3y3xs2mzhiymbw53yfcpr33sb1h7z1zcs6987w";
|
||||
};
|
||||
};
|
||||
|
||||
@ -2368,12 +2390,12 @@ let
|
||||
|
||||
vim-codefmt = buildVimPluginFrom2Nix {
|
||||
pname = "vim-codefmt";
|
||||
version = "2019-06-13";
|
||||
version = "2019-06-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "vim-codefmt";
|
||||
rev = "3be5d149e38b2e3582d6c1122632de7b802cd6f1";
|
||||
sha256 = "0m1nz8q7v6ljff7qgyzxc5qwadj6zmms26jzdxajq36a0l19n2yb";
|
||||
rev = "0de948ca411c65ee1d07be84ee406e38f7a725d8";
|
||||
sha256 = "1cyvj1q94frnii1mcx1f1dhl5z38ppmly6wjgz71hs1w5qdy12qh";
|
||||
};
|
||||
};
|
||||
|
||||
@ -2489,12 +2511,12 @@ let
|
||||
|
||||
vim-devicons = buildVimPluginFrom2Nix {
|
||||
pname = "vim-devicons";
|
||||
version = "2019-04-06";
|
||||
version = "2019-06-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ryanoasis";
|
||||
repo = "vim-devicons";
|
||||
rev = "cdc08fd72ffa2e4754c1ceefccd485f07a735177";
|
||||
sha256 = "1fv8ah0lfxn2hs4lzp1zbnmwmy5gzl2fgryawrvi7lyd5gxmqjpb";
|
||||
rev = "0468bc8fb183e1e7c1ffacd7b3f8e9c7f813f49d";
|
||||
sha256 = "0r063bdffjvkawjy4k2j88f0q9b39qgjcxsn7zzi71vs4c07xmsi";
|
||||
};
|
||||
};
|
||||
|
||||
@ -2522,12 +2544,12 @@ let
|
||||
|
||||
vim-dispatch = buildVimPluginFrom2Nix {
|
||||
pname = "vim-dispatch";
|
||||
version = "2019-06-12";
|
||||
version = "2019-06-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-dispatch";
|
||||
rev = "2c5b28387ab50f6e6c6034a5b362b24be63734a3";
|
||||
sha256 = "0angxakjzf3sanjdyykr9igsl3z2xrcfkicpylhnk1rvjjsxlcd9";
|
||||
rev = "219df23e822206a25e7c40bf4329774aa19f7732";
|
||||
sha256 = "1f7dvdl8wz6g4ikz5gx6rdhxyvcf4z9y0axzlkljs2ixmr48sxbr";
|
||||
};
|
||||
};
|
||||
|
||||
@ -2643,12 +2665,12 @@ let
|
||||
|
||||
vim-fireplace = buildVimPluginFrom2Nix {
|
||||
pname = "vim-fireplace";
|
||||
version = "2019-06-10";
|
||||
version = "2019-06-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-fireplace";
|
||||
rev = "cf0537f683ef6195fee453f330510b95536c8861";
|
||||
sha256 = "1p8ll6p69aj0q0ygn3pignivss88sa12lfznbkc9xlrrcky4birq";
|
||||
rev = "41698572eedf1f18027353d5f67b92b851cb5d14";
|
||||
sha256 = "1sdiqkqq77jqcbqhm93kjba8r30n68jvd93zxrszk891q1i666ss";
|
||||
};
|
||||
};
|
||||
|
||||
@ -2742,12 +2764,12 @@ let
|
||||
|
||||
vim-gitgutter = buildVimPluginFrom2Nix {
|
||||
pname = "vim-gitgutter";
|
||||
version = "2019-06-14";
|
||||
version = "2019-06-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "airblade";
|
||||
repo = "vim-gitgutter";
|
||||
rev = "5989eb882e8be27edef5c0738580917d0179626b";
|
||||
sha256 = "02sng4vlpl8616125d7l4xjwc1c30lsplzbf8y2z90lk01vhv5zy";
|
||||
rev = "8aac968f1a617cc1c346707242af181e6b1f467e";
|
||||
sha256 = "1vvixwlsnsxhrsz0dqg2i0s6a0xdpp60x0592gakjwihzplg4yp5";
|
||||
};
|
||||
};
|
||||
|
||||
@ -3051,12 +3073,12 @@ let
|
||||
|
||||
vim-jsonnet = buildVimPluginFrom2Nix {
|
||||
pname = "vim-jsonnet";
|
||||
version = "2018-10-08";
|
||||
version = "2019-06-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "vim-jsonnet";
|
||||
rev = "824dcfe76568dba38135332fc4729e2b2c4d9b3a";
|
||||
sha256 = "1i79fc7yww5cpv9ck36smxq2yidj323kliyy5hw4fvsx7b4ahwsg";
|
||||
rev = "b4d56c9024763d9fe1c0e9ce12e9f960bac944be";
|
||||
sha256 = "1dd0ckyvq7ckn28k16jvgfip2g2m0zqyhl76zxj34nkgxy5qdyid";
|
||||
};
|
||||
};
|
||||
|
||||
@ -3414,12 +3436,12 @@ let
|
||||
|
||||
vim-plug = buildVimPluginFrom2Nix {
|
||||
pname = "vim-plug";
|
||||
version = "2019-05-29";
|
||||
version = "2019-06-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "junegunn";
|
||||
repo = "vim-plug";
|
||||
rev = "08e78d8a5ea874bebbd7f39de7bb540d9b539963";
|
||||
sha256 = "1kghkbv13lds09nhai42qygpi6rlw1sfjwmq0kiky7nwyrf2p1i9";
|
||||
rev = "f1ad2d864ab43c56bf86ce01be9971f62bc14f6c";
|
||||
sha256 = "071vr96ckm1bwf6nfziv4fw4spz44d5g65fcx2b61fb36azwxggh";
|
||||
};
|
||||
};
|
||||
|
||||
@ -3436,12 +3458,12 @@ let
|
||||
|
||||
vim-polyglot = buildVimPluginFrom2Nix {
|
||||
pname = "vim-polyglot";
|
||||
version = "2019-06-14";
|
||||
version = "2019-06-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sheerun";
|
||||
repo = "vim-polyglot";
|
||||
rev = "15727e7eb005a0eef76941e09d993754b86cb81d";
|
||||
sha256 = "0qn328ypbqnddw8dz684rz9p18gqqxxw36wpvc5lskz8j1gb251f";
|
||||
rev = "d52700284984ada048ce325404dfa25237271ba1";
|
||||
sha256 = "15ddnf9l9iqqwz8b0k6kpciv2qaqwr4s1k7klbc9qj8r254ys699";
|
||||
};
|
||||
};
|
||||
|
||||
@ -3458,12 +3480,12 @@ let
|
||||
|
||||
vim-projectionist = buildVimPluginFrom2Nix {
|
||||
pname = "vim-projectionist";
|
||||
version = "2019-06-06";
|
||||
version = "2019-06-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-projectionist";
|
||||
rev = "acf7361d0dc9a4a259c466f00fb2c15bcea6a4db";
|
||||
sha256 = "1k0f931i1qgfak0qgk5i5gfq4ld49z0x2siahm1yq3wil7x54zrp";
|
||||
rev = "92ff29c0c0085ac922cad1a24cf0b0bf69751b4d";
|
||||
sha256 = "0dj8806k7dnm0y22a6c3mdv61sa4rz8vi1y6sfawa7y58nh50az4";
|
||||
};
|
||||
};
|
||||
|
||||
@ -3832,12 +3854,12 @@ let
|
||||
|
||||
vim-terraform = buildVimPluginFrom2Nix {
|
||||
pname = "vim-terraform";
|
||||
version = "2019-06-03";
|
||||
version = "2019-06-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashivim";
|
||||
repo = "vim-terraform";
|
||||
rev = "ffdee14ef1babdb45acf0710e0aaf54fcfc65de0";
|
||||
sha256 = "1l5ywl3rkhxvzhdks9f4pllfhlm8pws6rdb6j3sdhf6jfh2w8lcy";
|
||||
rev = "996917464cd6b6fd7f11905ac4d77314fcac5593";
|
||||
sha256 = "1bqqizqsn1nzqg02vis9v0rndkw24n3dkvrd799s04818rncm84m";
|
||||
};
|
||||
};
|
||||
|
||||
@ -3942,12 +3964,12 @@ let
|
||||
|
||||
vim-visual-multi = buildVimPluginFrom2Nix {
|
||||
pname = "vim-visual-multi";
|
||||
version = "2019-06-13";
|
||||
version = "2019-06-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mg979";
|
||||
repo = "vim-visual-multi";
|
||||
rev = "c62107b163bc4f0bf718f32a019f19a548c8d332";
|
||||
sha256 = "0455mdill779lqnjvy63pz8v7c8fz9clikylhy4xmcjw136j8325";
|
||||
rev = "8b1db5d83f1bc04f9e08fd5c57d84323e9007435";
|
||||
sha256 = "0g6b9grd7j1p9rhbb56lvwvv90j9l0cqfsslxyrn9fwxwgkbiis0";
|
||||
};
|
||||
};
|
||||
|
||||
@ -4096,12 +4118,12 @@ let
|
||||
|
||||
vimtex = buildVimPluginFrom2Nix {
|
||||
pname = "vimtex";
|
||||
version = "2019-06-14";
|
||||
version = "2019-06-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "8c7cd088f1783cb8eed02955c031e9e4448a5fab";
|
||||
sha256 = "0y6a6csgi05ip3hna5vpqs92ax8msj0027zhgzq5lba83mysfcck";
|
||||
rev = "c7cbc9d662c0520e769faddb2d952f4992c83049";
|
||||
sha256 = "05kb1wlkbajqfw93524f86b5v2437zg20vxa4f5gjdc70la0gw22";
|
||||
};
|
||||
};
|
||||
|
||||
@ -4228,12 +4250,12 @@ let
|
||||
|
||||
yats-vim = buildVimPluginFrom2Nix {
|
||||
pname = "yats-vim";
|
||||
version = "2019-06-07";
|
||||
version = "2019-06-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "HerringtonDarkholme";
|
||||
repo = "yats.vim";
|
||||
rev = "6f81b702ccd0259cf3a17647ece639900e7edece";
|
||||
sha256 = "1zyk74i0i8c4cz9hg08ka05f7gz5rr0karpqs2hr9hp8a0gb1mmy";
|
||||
rev = "c0995dfebaebf4abaaae7d6c71b912bec2de9596";
|
||||
sha256 = "0q0hxscwqwn2xwfvah9hlbzb416gzi7pzsl7rniw7qsy3pp5m3sn";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
};
|
||||
|
||||
@ -18,6 +18,7 @@ bbchung/clighter8
|
||||
benmills/vimux
|
||||
bhurlow/vim-parinfer
|
||||
bitc/vim-hdevtools
|
||||
bkad/camelcasemotion
|
||||
bling/vim-bufferline
|
||||
bronson/vim-trailing-whitespace
|
||||
brooth/far.vim
|
||||
@ -376,6 +377,7 @@ vmchale/dhall-vim
|
||||
w0rp/ale
|
||||
wakatime/vim-wakatime
|
||||
wellle/targets.vim
|
||||
wellle/tmux-complete.vim
|
||||
will133/vim-dirdiff
|
||||
wincent/command-t
|
||||
wincent/ferret
|
||||
|
||||
24
pkgs/os-specific/darwin/noah/default.nix
Normal file
24
pkgs/os-specific/darwin/noah/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, Hypervisor }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "noah";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-noah";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0bivfsgb56kndz61lzjgdcnqlhjikqw89ma0h6f6radyvfzy0vis";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ Hypervisor ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Bash on Ubuntu on macOS";
|
||||
homepage = "https://github.com/linux-noah/noah";
|
||||
license = [ licenses.mit licenses.gpl2 ];
|
||||
maintainers = [ maintainers.marsam ];
|
||||
platforms = platforms.darwin;
|
||||
};
|
||||
}
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.128";
|
||||
version = "4.14.129";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "04r93x9lmx70p2dld0rryjkx6sk3m4krzzmj2h1n370z9xsjqg79";
|
||||
sha256 = "1r1njg7vwzssjbn5365zklfcdax2fpz2jkcff977i8df0cmlhj3m";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.53";
|
||||
version = "4.19.55";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "00pbppnn57x7c86cnpv49iwyn2asxpkd9gkspp1p1b5ggq5p6iz6";
|
||||
sha256 = "0ixrc1ryj0xj0pd1cf37gbs08pwjxbw4w0zpm915k34rlz5z01n9";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.4.182";
|
||||
version = "4.4.183";
|
||||
extraMeta.branch = "4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "09w5v06c2ghai2pyz04kbhgfnqr22v4dkm9npb5kg6ndc67xh2f4";
|
||||
sha256 = "10ic3ldn3p95y0qrl91j5kjqjp18k30xvpgw7mmc1g7lgi2r8j2h";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.182";
|
||||
version = "4.9.183";
|
||||
extraMeta.branch = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "15cnk5bmd7kd4ggjzrbs9fpc21wliqdrnfnpg623cf0639l14vmi";
|
||||
sha256 = "1wv753a9z99nvvw881j6fxd6imk88xm3aq626gly5x6v3jcv0mzx";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.1.12";
|
||||
version = "5.1.14";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1avrznzilbvsai8myjhrv8pvjxq4w9dibzgdxbpsr14a56fq2nbi";
|
||||
sha256 = "0bhiqgfm0wcs0r9al800syrjnxp54bk2n2472ccpwp2nn6mv6dkl";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.2-rc5";
|
||||
modDirVersion = "5.2.0-rc5";
|
||||
version = "5.2-rc6";
|
||||
modDirVersion = "5.2.0-rc6";
|
||||
extraMeta.branch = "5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
|
||||
sha256 = "0av5kfwa0s2vip7bzrzgslyaww1z22zwyvl7jcfjfsaqfxdyyya0";
|
||||
sha256 = "15lwy9596v5sw8c6mhpl9ilfcmm39snvvyajg08ycsg61i2s58v0";
|
||||
};
|
||||
|
||||
# Should the testing kernels ever be built on Hydra?
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "microcode-intel";
|
||||
version = "20190514";
|
||||
version = "20190618";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "Intel-Linux-Processor-Microcode-Data-Files";
|
||||
rev = "microcode-${version}";
|
||||
sha256 = "1xdxkmsnic191g7kljmrdcvg8vlwiwcrcxy9fnhpqsbsp6mjylv7";
|
||||
sha256 = "0fdhrpxvsq0rm5mzj82gvmfb3lm7mhc9hwvimv7dl1jaidbp6lvs";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ iucode-tool libarchive ];
|
||||
|
||||
@ -4,11 +4,11 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "neo4j-${version}";
|
||||
version = "3.5.5";
|
||||
version = "3.5.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
|
||||
sha256 = "1dphg1xyh8h7dx74nrcc9aspiylnskqnmysim9k39v8myf7a77mq";
|
||||
sha256 = "0ajkz13qsjxjflh2dlyq8w1fiacv5gakf6n98xcvj9yfcm2j4dpm";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper jre8 which gawk ];
|
||||
|
||||
35
pkgs/tools/audio/video2midi/default.nix
Normal file
35
pkgs/tools/audio/video2midi/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ stdenv, fetchFromGitHub, python2Packages, opencv3 }:
|
||||
|
||||
let
|
||||
opencv3_ = python2Packages.toPythonModule (opencv3.override {
|
||||
enablePython = true;
|
||||
pythonPackages = python2Packages;
|
||||
enableFfmpeg = true;
|
||||
});
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "video2midi";
|
||||
version = "0.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svsdval";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "00ms9iqam3ml6fxf8djki3gyifn8sfzfkkfrdgrvs0sq47wrkc39";
|
||||
};
|
||||
|
||||
pythonPath = with python2Packages; [ opencv3_ midiutil pygame pyopengl ];
|
||||
nativeBuildInputs = with python2Packages; [ python wrapPython ];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 v2m.py $out/bin/v2m.py
|
||||
wrapPythonPrograms
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Youtube synthesia video to midi conversion tool";
|
||||
homepage = src.meta.homepage;
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.gnidorah ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -4,11 +4,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pstoedit-3.73";
|
||||
name = "pstoedit-3.74";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/pstoedit/${name}.tar.gz";
|
||||
sha256 = "147jkgvm9n6mbkl6ndqnm9x74x5y9agbxkfwj0jrw6yxyhxx2cdd";
|
||||
sha256 = "034rcrsi69vyh01rcqh7jy3bw4la4m6jl4niav4c6wrs9bx44cim";
|
||||
};
|
||||
|
||||
#
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "calamares";
|
||||
version = "3.2.7";
|
||||
version = "3.2.8";
|
||||
|
||||
# release including submodule
|
||||
src = fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz";
|
||||
sha256 = "0dnxas0nca10vbqgspy27gn81izrpl5nqy66zxbkh4pfxmi7zqdk";
|
||||
sha256 = "1ymyl12fzxc5jjfbw4pfmgzp036w0dai76f7anilw2bnwfzq5g62";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "units-${version}";
|
||||
version = "2.18";
|
||||
version = "2.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/units/${name}.tar.gz";
|
||||
sha256 = "0y26kj349i048y4z3xrk90bvciw2j6ds3rka7r7yn3183hirr5b4";
|
||||
sha256 = "0mk562g7dnidjgfgvkxxpvlba66fh1ykmfd9ylzvcln1vxmi6qj2";
|
||||
};
|
||||
|
||||
buildInputs = [ readline ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, jre, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
pname = "openapi-generator-cli";
|
||||
|
||||
jarfilename = "${pname}-${version}.jar";
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}";
|
||||
sha256 = "0011cks5qizq1rl8iwm683gmb9dlx134p8az32vqm8sbivggv9c1";
|
||||
sha256 = "1fglvn6ricvb0csbrjkjfp902y6drjf6cby5fihmr5v9m7pjym1y";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
@ -4,23 +4,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-edit";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "killercup";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1z51zvv3sim5mcmr57akzzlkr5phb5f2a9zawff3s7a6lnz9rjzz";
|
||||
sha256 = "05b64bm9441crw74xlywjg2y3psljk2kf9xsrixaqwbnnahi0mm5";
|
||||
};
|
||||
|
||||
cargoSha256 = "1xy5xcfzfqrgvk5g97qab4ddd3i76nqn8vr0lsfpbbqfc2sm737a";
|
||||
cargoSha256 = "1hjjw3i35vqr6nxsv2m3izq4x8c2a6wvl5c2kjlpg6shy9j2mjaa";
|
||||
|
||||
nativeBuildInputs = lib.optional (!stdenv.isDarwin) pkgconfig;
|
||||
buildInputs = lib.optional (!stdenv.isDarwin) openssl;
|
||||
propagatedBuildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
|
||||
|
||||
patches = [ ./disable-network-based-test.patch ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A utility for managing cargo dependencies from the command line";
|
||||
homepage = https://github.com/killercup/cargo-edit;
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- cargo-edit.org/tests/cargo-upgrade.rs 2018-09-11 20:59:04.609532299 +0100
|
||||
+++ cargo-edit/tests/cargo-upgrade.rs 2018-09-11 20:59:50.829435331 +0100
|
||||
@@ -302,6 +302,7 @@
|
||||
}
|
||||
|
||||
#[test]
|
||||
+#[ignore] // requires network
|
||||
fn upgrade_prints_messages() {
|
||||
let (_tmpdir, manifest) = clone_out_test("tests/fixtures/upgrade/Cargo.toml.source");
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "duo-unix-${version}";
|
||||
version = "1.11.1";
|
||||
version = "1.11.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz";
|
||||
sha256 = "1krpk6ngl9vmvax8qax2iqcjdkvgdq5bxs079qy6c33ql40ra96i";
|
||||
sha256 = "11467kk8blg777vss0hsgz6k8f5m43p50zqs7yhx2sgbh9ygnn6y";
|
||||
};
|
||||
|
||||
buildInputs = [ pam openssl zlib ];
|
||||
|
||||
@ -151,6 +151,8 @@ in
|
||||
|
||||
cmark = callPackage ../development/libraries/cmark { };
|
||||
|
||||
conftest = callPackage ../development/tools/conftest {};
|
||||
|
||||
corgi = callPackage ../development/tools/corgi { };
|
||||
|
||||
dhallToNix = callPackage ../build-support/dhall-to-nix.nix {
|
||||
@ -6462,6 +6464,8 @@ in
|
||||
|
||||
vfdecrypt = callPackage ../tools/misc/vfdecrypt { };
|
||||
|
||||
video2midi = callPackage ../tools/audio/video2midi { };
|
||||
|
||||
vifm = callPackage ../applications/misc/vifm { };
|
||||
|
||||
viking = callPackage ../applications/misc/viking {
|
||||
@ -8238,7 +8242,7 @@ in
|
||||
beam = callPackage ./beam-packages.nix { };
|
||||
|
||||
inherit (beam.interpreters)
|
||||
erlang erlangR18 erlangR19 erlangR20 erlangR21
|
||||
erlang erlangR18 erlangR19 erlangR20 erlangR21 erlangR22
|
||||
erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
|
||||
elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4
|
||||
lfe lfe_1_2;
|
||||
@ -8560,6 +8564,7 @@ in
|
||||
svg2tikz = python27Packages.svg2tikz;
|
||||
|
||||
pew = callPackage ../development/tools/pew {};
|
||||
poetry = with python3Packages; toPythonApplication poetry;
|
||||
pipenv = python3Packages.callPackage ../development/tools/pipenv {};
|
||||
|
||||
pipewire = callPackage ../development/libraries/pipewire {};
|
||||
@ -15297,6 +15302,7 @@ in
|
||||
# when adding a new linux version
|
||||
kernelPatches.cpu-cgroup-v2."4.11"
|
||||
kernelPatches.modinst_arg_list_too_long
|
||||
kernelPatches.export_kernel_fpu_functions
|
||||
];
|
||||
};
|
||||
|
||||
@ -15304,6 +15310,7 @@ in
|
||||
kernelPatches =
|
||||
[ kernelPatches.bridge_stp_helper
|
||||
kernelPatches.modinst_arg_list_too_long
|
||||
kernelPatches.export_kernel_fpu_functions
|
||||
];
|
||||
};
|
||||
|
||||
@ -15696,6 +15703,10 @@ in
|
||||
|
||||
nftables = callPackage ../os-specific/linux/nftables { };
|
||||
|
||||
noah = callPackage ../os-specific/darwin/noah {
|
||||
inherit (darwin.apple_sdk.frameworks) Hypervisor;
|
||||
};
|
||||
|
||||
numactl = callPackage ../os-specific/linux/numactl { };
|
||||
|
||||
numad = callPackage ../os-specific/linux/numad { };
|
||||
@ -21092,7 +21103,9 @@ in
|
||||
inherit (gnome2) libgnomeprint libgnomeprintui libgnomecanvas;
|
||||
};
|
||||
|
||||
xournalpp = callPackage ../applications/graphics/xournalpp { };
|
||||
xournalpp = callPackage ../applications/graphics/xournalpp {
|
||||
lua = lua5_3;
|
||||
};
|
||||
|
||||
apvlv = callPackage ../applications/misc/apvlv { };
|
||||
|
||||
@ -24118,6 +24131,8 @@ in
|
||||
|
||||
iterm2 = callPackage ../applications/misc/iterm2 {};
|
||||
|
||||
sccache = callPackage ../development/tools/misc/sccache { };
|
||||
|
||||
sequeler = callPackage ../applications/misc/sequeler { };
|
||||
|
||||
sequelpro = callPackage ../applications/misc/sequelpro {};
|
||||
|
||||
@ -50,6 +50,15 @@ rec {
|
||||
javacSupport = true; odbcSupport = true;
|
||||
};
|
||||
erlangR21_nox = erlangR21.override { wxSupport = false; };
|
||||
erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix {
|
||||
wxGTK = wxGTK30;
|
||||
};
|
||||
erlangR22_odbc = erlangR22.override { odbcSupport = true; };
|
||||
erlangR22_javac = erlangR22.override { javacSupport = true; };
|
||||
erlangR22_odbc_javac = erlangR22.override {
|
||||
javacSupport = true; odbcSupport = true;
|
||||
};
|
||||
erlangR22_nox = erlangR22.override { wxSupport = false; };
|
||||
|
||||
# Basho fork, using custom builder.
|
||||
erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix {
|
||||
@ -79,6 +88,7 @@ rec {
|
||||
erlangR19 = packagesWith interpreters.erlangR19;
|
||||
erlangR20 = packagesWith interpreters.erlangR20;
|
||||
erlangR21 = packagesWith interpreters.erlangR21;
|
||||
erlangR22 = packagesWith interpreters.erlangR22;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@ -2244,6 +2244,8 @@ in {
|
||||
|
||||
python-mapnik = callPackage ../development/python-modules/python-mapnik { };
|
||||
|
||||
midiutil = callPackage ../development/python-modules/midiutil {};
|
||||
|
||||
misaka = callPackage ../development/python-modules/misaka {};
|
||||
|
||||
mt-940 = callPackage ../development/python-modules/mt-940 { };
|
||||
@ -3832,7 +3834,9 @@ in {
|
||||
|
||||
pysftp = callPackage ../development/python-modules/pysftp { };
|
||||
|
||||
pysoundfile = callPackage ../development/python-modules/pysoundfile { };
|
||||
soundfile = callPackage ../development/python-modules/soundfile { };
|
||||
|
||||
pysoundfile = self.soundfile; # Alias added 23-06-2019
|
||||
|
||||
python3pika = callPackage ../development/python-modules/python3pika { };
|
||||
|
||||
@ -4401,9 +4405,11 @@ in {
|
||||
|
||||
scikitimage = callPackage ../development/python-modules/scikit-image { };
|
||||
|
||||
scikitlearn = callPackage ../development/python-modules/scikitlearn {
|
||||
inherit (pkgs) gfortran glibcLocales;
|
||||
};
|
||||
scikitlearn = let
|
||||
args = { inherit (pkgs) gfortran glibcLocales; };
|
||||
in
|
||||
if isPy3k then callPackage ../development/python-modules/scikitlearn args
|
||||
else callPackage ../development/python-modules/scikitlearn/0.20.nix args;
|
||||
|
||||
scikit-bio = callPackage ../development/python-modules/scikit-bio { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user