mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-29 16:24:10 +00:00
Merge master into staging-next
This brings thousands of rebuilds. Hydra nixpkgs: ?compare=1597944
This commit is contained in:
commit
e1206a2129
@ -95,6 +95,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
|
||||
fullName = ''BSD 2-clause "Simplified" License'';
|
||||
};
|
||||
|
||||
bsd2Patent = spdx {
|
||||
spdxId = "BSD-2-Clause-Patent";
|
||||
fullName = ''BSD-2-Clause Plus Patent License'';
|
||||
};
|
||||
|
||||
bsd3 = spdx {
|
||||
spdxId = "BSD-3-Clause";
|
||||
fullName = ''BSD 3-clause "New" or "Revised" License'';
|
||||
|
@ -9013,4 +9013,16 @@
|
||||
github = "cpcloud";
|
||||
githubId = 417981;
|
||||
};
|
||||
davegallant = {
|
||||
name = "Dave Gallant";
|
||||
email = "davegallant@gmail.com";
|
||||
github = "davegallant";
|
||||
githubId = 4519234;
|
||||
};
|
||||
saulecabrera = {
|
||||
name = "Saúl Cabrera";
|
||||
email = "saulecabrera@gmail.com";
|
||||
github = "saulecabrera";
|
||||
githubId = 1423601;
|
||||
};
|
||||
}
|
||||
|
@ -686,6 +686,7 @@
|
||||
./services/networking/ocserv.nix
|
||||
./services/networking/ofono.nix
|
||||
./services/networking/oidentd.nix
|
||||
./services/networking/onedrive.nix
|
||||
./services/networking/openfire.nix
|
||||
./services/networking/openvpn.nix
|
||||
./services/networking/ostinato.nix
|
||||
|
72
nixos/modules/services/networking/onedrive.nix
Normal file
72
nixos/modules/services/networking/onedrive.nix
Normal file
@ -0,0 +1,72 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.services.onedrive;
|
||||
|
||||
onedriveLauncher = pkgs.writeShellScriptBin
|
||||
"onedrive-launcher"
|
||||
''
|
||||
# XDG_CONFIG_HOME is not recognized in the environment here.
|
||||
if [ -f $HOME/.config/onedrive-launcher ]
|
||||
then
|
||||
# Hopefully using underscore boundary helps locate variables
|
||||
for _onedrive_config_dirname_ in $(cat $HOME/.config/onedrive-launcher | grep -v '[ \t]*#' )
|
||||
do
|
||||
systemctl --user start onedrive@$_onedrive_config_dirname_
|
||||
done
|
||||
else
|
||||
systemctl --user start onedrive@onedrive
|
||||
fi
|
||||
''
|
||||
;
|
||||
|
||||
in {
|
||||
### Documentation
|
||||
# meta.doc = ./onedrive.xml;
|
||||
|
||||
### Interface
|
||||
|
||||
options.services.onedrive = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Enable OneDrive service";
|
||||
};
|
||||
|
||||
package = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = pkgs.onedrive;
|
||||
defaultText = "pkgs.onedrive";
|
||||
example = lib.literalExample "pkgs.onedrive";
|
||||
description = ''
|
||||
OneDrive package to use.
|
||||
'';
|
||||
};
|
||||
};
|
||||
### Implementation
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
systemd.user.services."onedrive@" = {
|
||||
description = "Onedrive sync service";
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = ''
|
||||
${cfg.package}/bin/onedrive --monitor --verbose --confdir=%h/.config/%i
|
||||
'';
|
||||
Restart="on-failure";
|
||||
RestartSec=3;
|
||||
RestartPreventExitStatus=3;
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user.services.onedrive-launcher = {
|
||||
wantedBy = [ "default.target" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStart = "${onedriveLauncher}/bin/onedrive-launcher";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
34
nixos/modules/services/networking/onedrive.xml
Normal file
34
nixos/modules/services/networking/onedrive.xml
Normal file
@ -0,0 +1,34 @@
|
||||
<chapter xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:xi="http://www.w3.org/2001/XInclude"
|
||||
version="5.0"
|
||||
xml:id="onedrive">
|
||||
<title>Microsoft OneDrive</title>
|
||||
<para>
|
||||
Microsoft Onedrive is a popular cloud file-hosting service, used by 85% of Fortune 500 companies. NixOS uses a popular OneDrive client for Linux maintained by github user abraunegg. The Linux client is excellent and allows customization of which files or paths to download, not much unlike the default Windows OneDrive client by Microsoft itself. The client allows syncing with multiple onedrive accounts at the same time, of any type- OneDrive personal, OneDrive business, Office365 and Sharepoint libraries, without any additional charge.
|
||||
</para>
|
||||
<para>
|
||||
For more information, guides and documentation, see <link xlink:href="https://abraunegg.github.io/"/>.
|
||||
</para>
|
||||
<para>
|
||||
To enable OneDrive support, add the following to your <filename>configuration.nix</filename>:
|
||||
<programlisting>
|
||||
<xref linkend="opt-services.onedrive.enable"/> = true;
|
||||
</programlisting>
|
||||
This installs the <literal>onedrive</literal> package and a service <literal>onedriveLauncher</literal> which will instantiate a <literal>onedrive</literal> service for all your OneDrive accounts. Follow the steps in documentation of the onedrive client to setup your accounts. To use the service with multiple accounts, create a file named <filename>onedrive-launcher</filename> in <filename>~/.config</filename> and add the filename of the config directory, relative to <filename>~/.config</filename>. For example, if you have two OneDrive accounts with configs in <filename>~/.config/onedrive_bob_work</filename> and <filename>~/.config/onedrive_bob_personal</filename>, add the following lines:
|
||||
<programlisting>
|
||||
onedrive_bob_work
|
||||
# Not in use:
|
||||
# onedrive_bob_office365
|
||||
onedrive_bob_personal
|
||||
</programlisting>
|
||||
No such file needs to be created if you are using only a single OneDrive account with config in the default location <filename>~/.config/onedrive</filename>, in the absence of <filename>~/.config/onedrive-launcher</filename>, only a single service is instantiated, with default config path.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
If you wish to use a custom OneDrive package, say from another channel, add the following line:
|
||||
<programlisting>
|
||||
<xref linkend="opt-services.onedrive.package"/> = pkgs.unstable.onedrive;
|
||||
</programlisting>
|
||||
</para>
|
||||
</chapter>
|
@ -102,6 +102,8 @@ in
|
||||
systemd.services.plymouth-poweroff.wantedBy = [ "poweroff.target" ];
|
||||
systemd.services.plymouth-reboot.wantedBy = [ "reboot.target" ];
|
||||
systemd.services.plymouth-read-write.wantedBy = [ "sysinit.target" ];
|
||||
systemd.services.systemd-ask-password-plymouth.wantedBy = ["multi-user.target"];
|
||||
systemd.paths.systemd-ask-password-plymouth.wantedBy = ["multi-user.target"];
|
||||
|
||||
boot.initrd.extraUtilsCommands = ''
|
||||
copy_bin_and_libs ${pkgs.plymouth}/bin/plymouthd
|
||||
@ -146,6 +148,7 @@ in
|
||||
# We use `mkAfter` to ensure that LUKS password prompt would be shown earlier than the splash screen.
|
||||
boot.initrd.preLVMCommands = mkAfter ''
|
||||
mkdir -p /etc/plymouth
|
||||
mkdir -p /run/plymouth
|
||||
ln -s ${configFile} /etc/plymouth/plymouthd.conf
|
||||
ln -s $extraUtils/share/plymouth/plymouthd.defaults /etc/plymouth/plymouthd.defaults
|
||||
ln -s $extraUtils/share/plymouth/logo.png /etc/plymouth/logo.png
|
||||
|
@ -197,9 +197,7 @@ in
|
||||
Request encryption keys or passwords for all encrypted datasets on import.
|
||||
For root pools the encryption key can be supplied via both an
|
||||
interactive prompt (keylocation=prompt) and from a file
|
||||
(keylocation=file://). Note that for data pools the encryption key can
|
||||
be only loaded from a file and not via interactive prompt since the
|
||||
import is processed in a background systemd service.
|
||||
(keylocation=file://).
|
||||
'';
|
||||
};
|
||||
|
||||
@ -490,7 +488,11 @@ in
|
||||
description = "Import ZFS pool \"${pool}\"";
|
||||
# we need systemd-udev-settle until https://github.com/zfsonlinux/zfs/pull/4943 is merged
|
||||
requires = [ "systemd-udev-settle.service" ];
|
||||
after = [ "systemd-udev-settle.service" "systemd-modules-load.service" ];
|
||||
after = [
|
||||
"systemd-udev-settle.service"
|
||||
"systemd-modules-load.service"
|
||||
"systemd-ask-password-console.service"
|
||||
];
|
||||
wantedBy = (getPoolMounts pool) ++ [ "local-fs.target" ];
|
||||
before = (getPoolMounts pool) ++ [ "local-fs.target" ];
|
||||
unitConfig = {
|
||||
@ -515,7 +517,20 @@ in
|
||||
done
|
||||
poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool.
|
||||
if poolImported "${pool}"; then
|
||||
${optionalString cfgZfs.requestEncryptionCredentials "\"${packages.zfsUser}/sbin/zfs\" load-key -r \"${pool}\""}
|
||||
${optionalString cfgZfs.requestEncryptionCredentials ''
|
||||
${packages.zfsUser}/sbin/zfs list -rHo name,keylocation ${pool} | while IFS=$'\t' read ds kl; do
|
||||
(case "$kl" in
|
||||
none )
|
||||
;;
|
||||
prompt )
|
||||
${config.systemd.package}/bin/systemd-ask-password "Enter key for $ds:" | ${packages.zfsUser}/sbin/zfs load-key "$ds"
|
||||
;;
|
||||
* )
|
||||
${packages.zfsUser}/sbin/zfs load-key "$ds"
|
||||
;;
|
||||
esac) < /dev/null # To protect while read ds kl in case anything reads stdin
|
||||
done
|
||||
''}
|
||||
echo "Successfully imported ${pool}"
|
||||
else
|
||||
exit 1
|
||||
|
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aeolus";
|
||||
version = "0.9.8";
|
||||
version = "0.9.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1zfr3567mwbqsfybkhg03n5dvmhllk88c9ayb10qzz2nh6d7g2qn";
|
||||
sha256 = "04y1j36y7vc93bv299vfiawbww4ym6q7avfx8vw6rmxr817zrch3";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -59,13 +59,13 @@ assert remoteSupport -> curl != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deadbeef";
|
||||
version = "1.8.3";
|
||||
version = "1.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DeaDBeeF-Player";
|
||||
repo = "deadbeef";
|
||||
rev = version;
|
||||
sha256 = "0n0q7zfl56gnadcqqp5rg7sbh1xvfcmp7cvmh2ax07037b346qig";
|
||||
sha256 = "161b0ll8v4cjgwwmk137hzvh0jidlkx56vjkpnr70f0x4jzv2nll";
|
||||
};
|
||||
|
||||
buildInputs = with stdenv.lib; [ jansson ]
|
||||
|
103
pkgs/applications/blockchains/whirlpool-gui/default.nix
Normal file
103
pkgs/applications/blockchains/whirlpool-gui/default.nix
Normal file
@ -0,0 +1,103 @@
|
||||
{ stdenv, fetchFromGitHub, callPackage, makeWrapper, makeDesktopItem
|
||||
, nodejs, yarn, electron_7, jre8, tor }:
|
||||
|
||||
let
|
||||
system = stdenv.hostPlatform.system;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "whirlpool-gui";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Samourai-Wallet";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "ru6WJQRulhnQCPY2E0x9M6xXtFdj/pg2fu4HpQxhImU=";
|
||||
};
|
||||
|
||||
yarnCache = stdenv.mkDerivation {
|
||||
name = "${pname}-${version}-${system}-yarn-cache";
|
||||
inherit src;
|
||||
phases = [ "unpackPhase" "buildPhase" ];
|
||||
nativeBuildInputs = [ yarn ];
|
||||
buildPhase = ''
|
||||
export HOME=$NIX_BUILD_ROOT
|
||||
|
||||
yarn config set yarn-offline-mirror $out
|
||||
yarn --frozen-lockfile --ignore-scripts --ignore-platform \
|
||||
--ignore-engines --no-progress --non-interactive
|
||||
'';
|
||||
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = {
|
||||
x86_64-linux = "6fl4cSwHXWgQcYlqxCae0p1Ppcb9fI5fFrxm7y6wxTo=";
|
||||
}.${system} or (throw "Unsupported platform ${system}");
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper nodejs yarn ];
|
||||
|
||||
configurePhase = ''
|
||||
# Yarn and bundler wants a real home directory to write cache, config, etc to
|
||||
export HOME=$NIX_BUILD_ROOT
|
||||
|
||||
# Make yarn install packages from our offline cache, not the registry
|
||||
yarn config --offline set yarn-offline-mirror ${yarnCache}
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
yarn install --offline --ignore-scripts --frozen-lockfile --no-progress --non-interactive
|
||||
|
||||
patchShebangs node_modules/
|
||||
|
||||
yarn build
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,share,libexec/whirlpool-gui/app}
|
||||
|
||||
# install production dependencies
|
||||
yarn install \
|
||||
--offline --frozen-lockfile --ignore-scripts \
|
||||
--no-progress --non-interactive \
|
||||
--production --no-bin-links \
|
||||
--modules-folder $out/libexec/whirlpool-gui/node_modules
|
||||
|
||||
# copy application
|
||||
cp -r app/{dist,app.html,main.prod.js,main.prod.js.map,img} $out/libexec/whirlpool-gui/app
|
||||
cp -r package.json resources $out/libexec/whirlpool-gui
|
||||
|
||||
# make desktop item
|
||||
ln -s "${desktopItem}/share/applications" "$out/share/applications"
|
||||
|
||||
# wrap electron
|
||||
makeWrapper '${electron_7}/bin/electron' "$out/bin/whirlpool-gui" \
|
||||
--add-flags "$out/libexec/whirlpool-gui" \
|
||||
--prefix PATH : "${jre8}/bin:${tor}/bin"
|
||||
'';
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "whirlpool-gui";
|
||||
exec = "whirlpool-gui";
|
||||
icon = "whirlpool-gui";
|
||||
desktopName = "Whirlpool";
|
||||
genericName = "Whirlpool";
|
||||
comment = meta.description;
|
||||
categories = "Network;";
|
||||
extraEntries = ''
|
||||
StartupWMClass=whrilpool-gui
|
||||
'';
|
||||
};
|
||||
|
||||
passthru.prefetchYarnCache = stdenv.lib.overrideDerivation yarnCache (d: {
|
||||
outputHash = stdenv.lib.fakeSha256;
|
||||
});
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Desktop GUI for Whirlpool by Samourai-Wallet";
|
||||
homepage = https://www.samouraiwallet.com/whirlpool;
|
||||
license = licenses.unlicense;
|
||||
maintainers = [ maintainers.offline ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "13.3.1";
|
||||
version = "13.3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
|
||||
sha256 = "0zvxmqqbgfxad1n9pa4h99l8hys486wziw5yyndxbv1v80p55p0p";
|
||||
sha256 = "16pds6sip90davrlrk17a7ms5nh1bs8js5i0hbci1l8gsfyx22i7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -31,6 +31,7 @@
|
||||
, rttr
|
||||
, kpurpose
|
||||
, kdeclarative
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -69,6 +70,7 @@ mkDerivation {
|
||||
rttr
|
||||
kpurpose
|
||||
kdeclarative
|
||||
wrapGAppsHook
|
||||
];
|
||||
# Both MLT and FFMpeg paths must be set or Kdenlive will complain that it
|
||||
# doesn't find them. See:
|
||||
|
@ -2,26 +2,22 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
version = "1.0.0";
|
||||
version = "1.1.1";
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "i686-linux" then
|
||||
fetchzip {
|
||||
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
|
||||
sha256 = "1d1lxmrmirh3837zib91dmxblb4imdz8gbq56pb7kgbff3zf96ql";
|
||||
stripRoot = false;
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchzip {
|
||||
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
|
||||
sha256 = "0pscm61dc69vmkrzrnxi531d37ig9y48w8q1lvzsg13zvvwaw8hs";
|
||||
stripRoot = false;
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "x86_64-darwin" then
|
||||
fetchurl {
|
||||
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg";
|
||||
sha256 = "1sb5qdssasqm7z7j4xzgkmkgf132zhgm93d7rkx3y5j0rac98y0g";
|
||||
}
|
||||
else throw "Architecture not supported";
|
||||
if stdenv.isLinux then fetchzip {
|
||||
url = {
|
||||
"i686-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
|
||||
"x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
sha256 = {
|
||||
"i686-linux" = "1andl3ripkcg4jhwdkd4b39c9aaxqpx9wzq21pysn6rlyy4hfcb0";
|
||||
"x86_64-linux" = "0qj5v8psqyp0sra0pvzkwjpm28kx3bgg36y37wklb6zl2ngpxm5g";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
stripRoot = false;
|
||||
} else fetchurl {
|
||||
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg";
|
||||
sha256 = "16inwxkrky4xwlr7vara1l8kapdgjg3kfq1l94i5855782hn4ppm";
|
||||
};
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ xar cpio ];
|
||||
|
||||
|
@ -30,11 +30,11 @@ let
|
||||
in
|
||||
mkDerivation rec {
|
||||
pname = "calibre";
|
||||
version = "4.17.0";
|
||||
version = "4.19.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1qgzx2q8a5g102z311ibz4aw1ipn2j1lbndgadig7xvy6zdhknma";
|
||||
sha256 = "1kpj65spwr9m88vshsljpdrw5jy7bbpqgqcrvqb17abh7fnnrb4x";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, openssl }:
|
||||
|
||||
let
|
||||
version = "6.4.6";
|
||||
version = "6.4.8";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "fetchmail";
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
|
||||
sha256 = "04b0sq1xad6gs1bfhkbmhsn1kq6y4gsx9l9ywjvd5d0rc15yrvqn";
|
||||
sha256 = "1g893dr3982vrqzxybmflnqfmd1q6yipd9krvxn0avhlrrp97k96";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gallery_dl";
|
||||
version = "1.14.1";
|
||||
version = "1.14.2";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0w4zmfbsr7xdymrrmdvcc0kqz11ql8j067ghlr84faqlsnx09z74";
|
||||
sha256 = "14a8skaxc4xn2hm8ahp8lzrmwh1f3lbcibvhpprqr3szd6i2p0pf";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase, libusb-compat-0_1 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpsbabel";
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ zlib qtbase which ]
|
||||
buildInputs = [ zlib qtbase which libusb-compat-0_1 ]
|
||||
++ lib.optionals stdenv.isDarwin [ IOKit ];
|
||||
|
||||
/* FIXME: Building the documentation, with "make doc", requires this:
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "heimer";
|
||||
version = "1.17.0";
|
||||
version = "1.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juzzlin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1sxdi1an9x62q9vwv7r2761my4dva6nc63n9861swxjjk18hmmar";
|
||||
sha256 = "16p18svfcp201gd624wzmf0gpdvywybxp8539igin6s70k6rpc97";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -1,15 +1,15 @@
|
||||
{ stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }:
|
||||
let
|
||||
pname = "josm";
|
||||
version = "16538";
|
||||
version = "16731";
|
||||
srcs = {
|
||||
jar = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
|
||||
sha256 = "07hzwcjnfbl3s8l0m6japln0clm6wjm1zd3r1pd47b1dvclnyv28";
|
||||
sha256 = "0r94jcqciggjwjxfz5q3m81sx6cvh94hq5r9mpw44dvpnyfjj6p6";
|
||||
};
|
||||
macosx = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip";
|
||||
sha256 = "1y0ssrwfqnmcvxwjfa3gdc3m9a952n8l3pdx0zmmaqwws4kak2a2";
|
||||
sha256 = "1ilcqy6ssi1jfnbw9nzpd4qlf2dmskfywy2lfm07y4w4gyjsp6w9";
|
||||
};
|
||||
pkg = fetchsvn {
|
||||
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "minder";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phase1geo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "13klasvrndwsmpcxkgy7kvsl2jqmp2cl52vb4i0hk18lr004scgy";
|
||||
sha256 = "1j3jk76rd0sc9sd9zrd24q3636559wd809yfnb9bv5jmvn9s1bkz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ];
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pueue";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nukesor";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "06jxj89ya91grrwxfs7l1ahy46y993kxsc8gpkxajc0j5ihax2al";
|
||||
sha256 = "0x8slqxpnk4pis834g11wzp8fqsxwhdf0xnssz1pkkww4dqzali0";
|
||||
};
|
||||
|
||||
cargoSha256 = "191j3lpd24ycissw0y2hv65i1cjzf24draamq3sxv7hv0sxcjw4d";
|
||||
cargoSha256 = "0r110zlzpzg0j5cq9zg0kk46qigp6bzd0kzmpx3ddvhblhxvq5m5";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rmapi";
|
||||
version = "0.0.11";
|
||||
version = "0.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juruen";
|
||||
repo = "rmapi";
|
||||
rev = "v${version}";
|
||||
sha256 = "0zks1pcj2s2pqkmw0hhm41vgdhfgj2r6dmvpsagbmf64578ww349";
|
||||
sha256 = "049m0p4wbsl822iym8xmc938d4k90iw7wjdzcxfyy8d27hv9mp45";
|
||||
};
|
||||
|
||||
vendorSha256 = "077s13pcql5w2m6wzls1q06r7p501kazbwzxgfh6akwza15kb4is";
|
||||
|
@ -19,13 +19,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ulauncher";
|
||||
version = "5.7.3";
|
||||
version = "5.8.0";
|
||||
|
||||
disabled = python3Packages.isPy27;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz";
|
||||
sha256 = "0wq2zsq3496fjfg89q01dsm7sb7kv92sycvqm6ad8z1z2kpisrbh";
|
||||
sha256 = "1czxzcxix9iwv1sir1q64j5aavc7lzjjwqpisgdc1kidkwnk05zp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
|
@ -13,14 +13,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "castor";
|
||||
version = "0.8.14";
|
||||
version = "0.8.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.sr.ht/~julienxx/castor/archive/${version}.tar.gz";
|
||||
sha256 = "1ykpmbimhfy3ys2hvv0mn8xiwxzdl43gpny1nc58i0gzv07ar8sc";
|
||||
sha256 = "1i6550akxg78c9bh9111c4458ry1nmp3xh7ik7s2zqrp7lmxaf46";
|
||||
};
|
||||
|
||||
cargoSha256 = "04w49wka1vkb295lk6fzd6c5rwhzrqkp26hd5d94rx7bhcjmmb9w";
|
||||
cargoSha256 = "1y047cm46l5hph3n48h60xvyh2hr0yagzswp375kiil96ndk206i";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helmsman";
|
||||
version = "3.4.3";
|
||||
version = "3.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Praqma";
|
||||
repo = "helmsman";
|
||||
rev = "v${version}";
|
||||
sha256 = "0jbinnzdw32l7zh02k81gnw9rnqi8f5k5sp2qv8p9l9kgziaycvn";
|
||||
sha256 = "01vjghak2szif0p82kall5jw7mbfh4fg7fcjkblmic7l0vlqhfac";
|
||||
};
|
||||
|
||||
vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl";
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hydroxide";
|
||||
version = "0.2.14";
|
||||
version = "0.2.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emersion";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0d8wjyzmw89yhrszz487f7i19rcz7xlx4w2wd4c69k5nsdrs6dys";
|
||||
sha256 = "0r91cq39n89hfy8sbdy5vjzqfrsfd7cdhd41gwszpayq65qhbsyp";
|
||||
};
|
||||
|
||||
vendorSha256 = "0d8yfmsl8rycbq8gjnvc657j14644lq0zmr9l88ik360szw6v6gc";
|
||||
vendorSha256 = "1r5qg5cx48yw1l5nil28y4a82fc7g52jmy9pckaxygppmmn539pc";
|
||||
|
||||
subPackages = [ "cmd/hydroxide" ];
|
||||
|
||||
|
@ -43,18 +43,18 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mattermost-desktop";
|
||||
version = "4.3.1";
|
||||
version = "4.5.0";
|
||||
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz";
|
||||
sha256 = "076nv5h6xscbw1987az00x493qhqgrli87gnn57zbvz0acgvlhfv";
|
||||
sha256 = "1p44vxs7i9f15h4xjyr99g8x73qygv909a32lfkqip1fh8lk7sf4";
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz";
|
||||
sha256 = "19ps9g8j6kp4haj6r3yfy4ma2wm6isq5fa8zlcz6g042ajkqq0ij";
|
||||
sha256 = "03pn853z2famqxcsrwayqb94pzghlpfb0qs2nfi8mc5zzsgcic7z";
|
||||
}
|
||||
else
|
||||
throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}";
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "pantalaimon";
|
||||
version = "0.6.3";
|
||||
version = "0.6.5";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -19,7 +19,7 @@ buildPythonApplication rec {
|
||||
owner = "matrix-org";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1h1z701sj1qgcqlsk3pnzifnbcg9fshl7v6271h9x54hm3d6hg8a";
|
||||
sha256 = "1pjrq71fkpvsc79nwhxhwjkqvqhj5wsnnwvsgslghaajdaw3n6wd";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "teams";
|
||||
version = "1.3.00.5153";
|
||||
version = "1.3.00.16851";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb";
|
||||
sha256 = "13c7fmij0gcg6mrjjj2mhs21q7fzdssscwhihzyrmbmj64cd0a69";
|
||||
sha256 = "1mp4xq224nwv2ckb5zd7iv3yvkg3gv6mk9dvx3f60jgain7qr0r3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ];
|
||||
@ -56,9 +56,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Includes runtimeDependencies in the RPATH of the included Node modules
|
||||
# so that dynamic loading works. We cannot use directly runtimeDependencies
|
||||
# here, since the libraries from runtimeDependencies are not propagated
|
||||
# here, since the libraries from runtimeDependencies are not propagated
|
||||
# to the dynamically loadable node modules because of a condition in
|
||||
# autoPatchElfHook since *.node modules have Type: DYN (Shared object file)
|
||||
# autoPatchElfHook since *.node modules have Type: DYN (Shared object file)
|
||||
# instead of EXEC or INTERP it expects.
|
||||
# Fixes: https://github.com/NixOS/nixpkgs/issues/85449
|
||||
postFixup = ''
|
||||
|
@ -1,28 +1,49 @@
|
||||
{ stdenv, fetchurl, gettext, gtk3, pythonPackages
|
||||
, gdk-pixbuf, libnotify, gst_all_1
|
||||
, libgnome-keyring3
|
||||
, wrapGAppsHook, gnome3
|
||||
# otherwise passwords are stored unencrypted
|
||||
, withGnomeKeyring ? true
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, gettext
|
||||
, gtk3
|
||||
, pythonPackages
|
||||
, gdk-pixbuf
|
||||
, libnotify
|
||||
, gst_all_1
|
||||
, libsecret
|
||||
, wrapGAppsHook
|
||||
, gsettings-desktop-schemas
|
||||
, glib
|
||||
, gobject-introspection
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (pythonPackages) python;
|
||||
in pythonPackages.buildPythonApplication rec {
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "mailnag";
|
||||
version = "1.3.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pulb/mailnag/archive/v${version}.tar.gz";
|
||||
sha256 = "0cp5pad6jzd5c14pddbi9ap5bi78wjhk1x2p0gbblmvmcasw309s";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pulb";
|
||||
repo = "mailnag";
|
||||
rev = "v${version}";
|
||||
sha256 = "0q97v9i96br22z3h6r2mz79i68ib8m8x42yxky78szfrf8j60i30";
|
||||
};
|
||||
preFixup = ''
|
||||
substituteInPlace $out/${pythonPackages.python.sitePackages}/Mailnag/common/dist_cfg.py \
|
||||
--replace "/usr/" $out/
|
||||
for desktop_file in $out/share/applications/*.desktop; do
|
||||
substituteInPlace "$desktop_file" \
|
||||
--replace "/usr/bin" $out/bin
|
||||
done
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
gtk3 gdk-pixbuf libnotify gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
|
||||
gtk3
|
||||
gdk-pixbuf
|
||||
glib
|
||||
libnotify
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-bad
|
||||
gnome3.adwaita-icon-theme
|
||||
] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3;
|
||||
gobject-introspection
|
||||
libsecret
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
@ -30,20 +51,17 @@ in pythonPackages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
pygobject3 dbus-python pyxdg
|
||||
gsettings-desktop-schemas
|
||||
pygobject3
|
||||
dbus-python
|
||||
pyxdg
|
||||
];
|
||||
|
||||
buildPhase = "";
|
||||
|
||||
installPhase = "${python}/bin/python setup.py install --prefix=$out";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An extensible mail notification daemon";
|
||||
homepage = "https://github.com/pulb/mailnag";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
};
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtkeychain, sqlite }:
|
||||
{ lib, stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtkeychain, sqlite, libsecret }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "owncloud-client";
|
||||
@ -12,6 +12,10 @@ mkDerivation rec {
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
buildInputs = [ qtbase qtkeychain sqlite ];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}"
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-UCMAKE_INSTALL_LIBDIR"
|
||||
"-DNO_SHIBBOLETH=1"
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "atlassian-cli";
|
||||
version = "9.2.0";
|
||||
version = "9.3.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip";
|
||||
sha256 = "0rdnbx3zfz3lpgka7bb8jzapkr81l2yvgsbmn8hrhva5k61xwx3d";
|
||||
sha256 = "1gsyxkkx04vhp8ii0xbln5h8wa8x3dj6xhh2fyjs4z0bil4hlf06";
|
||||
extraPostFetch = "chmod go-w $out";
|
||||
};
|
||||
|
||||
|
56
pkgs/applications/office/espanso/default.nix
Normal file
56
pkgs/applications/office/espanso/default.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkgconfig
|
||||
, extra-cmake-modules
|
||||
, libX11
|
||||
, libXi
|
||||
, libXtst
|
||||
, libnotify
|
||||
, openssl
|
||||
, xclip
|
||||
, xdotool
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "espanso";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "federico-terzi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1x5p7hniapggqd18rx26mjvdf33z7rm7zz5vsqm2siv3mcl19033";
|
||||
};
|
||||
|
||||
cargoSha256 = "0liwwdncymjql5dw7rwhhimcr7qdbyvfgmsd0bawvi0ym7m1v408";
|
||||
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
pkgconfig
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXtst
|
||||
libXi
|
||||
libnotify
|
||||
openssl
|
||||
xdotool
|
||||
];
|
||||
|
||||
# Some tests require networking
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Cross-platform Text Expander written in Rust";
|
||||
homepage = "https://espanso.org";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ kimat ];
|
||||
platforms = platforms.all;
|
||||
|
||||
longDescription = ''
|
||||
Espanso detects when you type a keyword and replaces it while you're typing.
|
||||
'';
|
||||
};
|
||||
}
|
@ -13,7 +13,7 @@
|
||||
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
|
||||
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
|
||||
, gnome3, glib, ncurses, epoxy, gpgme
|
||||
, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ru" "sl" "zh-CN" ]
|
||||
, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ]
|
||||
, withHelp ? true
|
||||
, kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null
|
||||
, ki18n ? null, kconfig ? null, kcoreaddons ? null, kio ? null, kwindowsystem ? null
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "picard-tools";
|
||||
version = "2.23.0";
|
||||
version = "2.23.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
|
||||
sha256 = "0yhgfz5jjw55ipgdb32wjdcb01xx2g9ikgvwinnfwswx50iscf5a";
|
||||
sha256 = "1g4539x2081jgrbn207nsimpq9q5izd4z6cx7s8lr8p8ab8spbmk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "workcraft";
|
||||
version = "3.2.6";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz";
|
||||
sha256 = "1sfbxmk71gp7paw4l5azqr0lsgsyp4308gx2jz8w4k3nasfshz25";
|
||||
sha256 = "072i7kan2c9f4s9jxwqr4ccsi9979c12xhwr385sbq06rwyrna85";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gmsh";
|
||||
version = "4.5.6";
|
||||
version = "4.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
|
||||
sha256 = "0gs65bgr1ph5lz7r6manqj8cra30s7c94pxilkd2z0p5vq6fpsj6";
|
||||
sha256 = "075dyblmlfdlhgbb1dwk6jzlqx93q90n6zwpr3mpii5n1zjmab0g";
|
||||
};
|
||||
|
||||
buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "snakemake";
|
||||
version = "5.17.0";
|
||||
version = "5.19.3";
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
appdirs
|
||||
@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0y652i3saqq2z61yvk0i6q3lnq2xfrygcxms5gygspj71q2n4f7k";
|
||||
sha256 = "b83f3ef73e25dafcb39b3565030e33fa2f7e80ed70256c535dc7e58ea762305d";
|
||||
};
|
||||
|
||||
doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-extras";
|
||||
version = "5.1.0";
|
||||
version = "6.0.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/tj/git-extras/archive/${version}.tar.gz";
|
||||
sha256 = "0ja8ds9gpibrnwcf8n6cpbggwkbks0ik3z9vfx5h1yf3ln1nycky";
|
||||
sha256 = "0mxb3c5lb5n7c76bp10bw7bid564vjxi5f7cvzaj2ss93v5rr11g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unixtools.column which ];
|
||||
|
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "git-machete";
|
||||
version = "2.14.0";
|
||||
version = "2.15.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "01ch4d0r3bi9nl5nknp3dyizc2rl9w46gm1ydnvqbrzhgw65lpp0";
|
||||
sha256 = "0qv08a6xsdmcm8l69m4103vn4crb0ilzx94334xjbdl0sykm55q0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pbr ];
|
||||
|
@ -5,10 +5,10 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "clipgrab";
|
||||
version = "3.8.12";
|
||||
version = "3.8.13";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "1nnph6sn4mpdj20hngwr57ripmdp60w3vrn89s8ssy7cjv500ngd";
|
||||
sha256 = "0ryaha33m41y0xjrspa838qqr4iy2c8vbvhbb334qimpqn1hj3q5";
|
||||
# The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
|
||||
url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
|
||||
};
|
||||
|
@ -34,13 +34,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crun";
|
||||
version = "0.13";
|
||||
version = "0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0c5acf916yv2zv3xjvxk1sa4h3n2wljc5hw61php7q37pbjc1ppn";
|
||||
sha256 = "14hmdarmhkfp5qgd8ifn7dn895j54ibaficci82q40haqh252l4n";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -1,55 +1,28 @@
|
||||
{ stdenv, fetchurl, mkfontscale }:
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "1.5.1";
|
||||
releaseUrl =
|
||||
"https://github.com/slavfox/Cozette/releases/download/v.${version}";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "Cozette";
|
||||
inherit version;
|
||||
version = "1.8.3";
|
||||
in
|
||||
fetchzip rec {
|
||||
name = "Cozette-${version}";
|
||||
|
||||
srcs = map fetchurl [
|
||||
{
|
||||
url = "${releaseUrl}/cozette.otb";
|
||||
sha256 = "05k45n7jar11gnng2awpmc7zk9jdlzd6wz87xx49cp75jm4z9xm8";
|
||||
}
|
||||
{
|
||||
url = "${releaseUrl}/CozetteVector.otf";
|
||||
sha256 = "1sqhnjpizn1wi26lc7z2zml7yr7zkcpa72mh1drvd74rlcs1ip30";
|
||||
}
|
||||
{
|
||||
url = "${releaseUrl}/CozetteVector.ttf";
|
||||
sha256 = "1q4ml8shv9lmyc6bwhffwvbvl92s73j7xkb0rkqvci4f0zbz7mcy";
|
||||
}
|
||||
];
|
||||
url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip";
|
||||
|
||||
nativeBuildInputs = [ mkfontscale ];
|
||||
sha256 = "1nc4zk6n7cbv9vwlhpm3ady5lc4d4ic1klyywwfg27w8j0jv57hx";
|
||||
|
||||
sourceRoot = "./";
|
||||
|
||||
unpackCmd = ''
|
||||
otName=$(stripHash "$curSrc")
|
||||
cp $curSrc ./$otName
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
|
||||
unzip -j $downloadedFile \*.bdf -d $out/share/fonts/misc
|
||||
unzip -j $downloadedFile \*.otb -d $out/share/fonts/misc
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
install -D -m 644 *.otf -t "$out/share/fonts/opentype"
|
||||
install -D -m 644 *.ttf -t "$out/share/fonts/truetype"
|
||||
install -D -m 644 *.otb -t "$out/share/fonts/misc"
|
||||
|
||||
mkfontdir "$out/share/fonts/misc"
|
||||
mkfontscale "$out/share/fonts/truetype"
|
||||
mkfontscale "$out/share/fonts/opentype"
|
||||
'';
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "A bitmap programming font optimized for coziness.";
|
||||
homepage = "https://github.com/slavfox/cozette";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ brettlyons ];
|
||||
maintainers = with maintainers; [ brettlyons marsam ];
|
||||
};
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
pname = "spleen";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
in fetchurl {
|
||||
name = "${pname}-${version}";
|
||||
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
|
||||
@ -19,7 +19,7 @@ in fetchurl {
|
||||
# create fonts.dir so NixOS xorg module adds to fp
|
||||
${mkfontscale}/bin/mkfontdir "$d"
|
||||
'';
|
||||
sha256 = "17dn6spfr8wv63sy009djb4q12q635m13wsyirzn074qabhr9ggg";
|
||||
sha256 = "0vaawnav4k2gpwsgxn5rmkd8wyxnwsrbd0ksp749sb7rwfd3nphc";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Monospaced bitmap fonts";
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ fetchurl }:
|
||||
|
||||
fetchurl {
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/711b59b900ee0b267ebb86e41dbc83ad7fb69629.tar.gz";
|
||||
sha256 = "0vfg5pilhqi59826iciz15bmylhfdlxmmkps7samzbilsf21j0sy";
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/ccbc2765586cc6f71894919f1f096714ca6ae453.tar.gz";
|
||||
sha256 = "001crq0myhn0bvyrbl10i8hski6z2a0hg9ij4plbjgvl5cldkzji";
|
||||
}
|
||||
|
@ -4,13 +4,13 @@
|
||||
|
||||
let
|
||||
pname = "gnome-calendar";
|
||||
version = "3.36.1";
|
||||
version = "3.36.2";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0ql3f509bj17riqs0jfpp434s97dzjgkjcd978i4m4y80nq2131v";
|
||||
sha256 = "07sc1kn65dzxsxpv0vl5dj1a5awljjsfl9jldrg0hnjmq12m7c6h";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
@ -27,11 +27,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "seahorse";
|
||||
version = "3.36";
|
||||
version = "3.36.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1nqn4a6dr4l1fpzj3mv4swhpnvhjcqlwsyhwm59sdzqgdfx4hbwr";
|
||||
sha256 = "16wmxxppgcgfj8zkagcny5af1c81x32ysm9d6j9f2k7bmik21ss5";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
@ -35,11 +35,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epiphany";
|
||||
version = "3.36.2";
|
||||
version = "3.36.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0ppvzfv98031y884cgy5agr90a0q3m37x2kybsd804g21ym7drn2";
|
||||
sha256 = "0vz1j6yrjv0nmf5lk8prkkm10fbcmd35khy9zsd7d4a86wk5c6v2";
|
||||
};
|
||||
|
||||
# Tests need an X display
|
||||
|
@ -43,13 +43,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evince";
|
||||
version = "3.36.5";
|
||||
version = "3.36.6";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0z79jl0j9xq9wgwkfr0d1w1qrdy4447y8shs407n5srr0vixc3bg";
|
||||
sha256 = "1c4ddlx12jm2cq0h0kfqwqncq3d8grvqhvpb29z86z7wqqhrpklm";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-contacts";
|
||||
version = "3.36.1";
|
||||
version = "3.36.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0qb2kgyk6f6wr129a0gzhvpy5wdjpwjbksxyfs6zxv183jl9s73z";
|
||||
sha256 = "048l07biy8xrfidfyzrjd5lrnfzqhb767ih2gl7w6c4mmhj4g2dy";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ evolution-data-server ];
|
||||
|
@ -68,11 +68,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-control-center";
|
||||
version = "3.36.3";
|
||||
version = "3.36.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0739qcwfwrimfrpf3gaakkf7ipwy3virs096kkhkxjmy1nbls5xw";
|
||||
sha256 = "0m7pxjgymc7aqqz0vcmlq91nxnwzd1v7v1gdhrfam49krxmk80mc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -24,11 +24,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simple-scan";
|
||||
version = "3.36.2.1";
|
||||
version = "3.36.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0aq1pf0wk536b91as54684xgmhl7lps0k2xcwha5wh6h1isyb35v";
|
||||
sha256 = "0gsz7jqk0fdj0mama3cnss9i1adw18cpdnlcjcjh4r5qijmvx0vh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iagno";
|
||||
version = "3.36.3";
|
||||
version = "3.36.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0cid9fag8irlq0cywyqaj402vb60l8f66ld1zj7a023rg0khqnbb";
|
||||
sha256 = "1fh2cvyqbz8saf2wij0bz2r9bja2k4gy6fqvbvig4gv0lx66gl29";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -13,7 +13,7 @@ buildGoModule rec {
|
||||
|
||||
vendorSha256 = "0nsm4gsbbn8myz4yfi6m7qc3iizhdambsr18iks0clkdn3mi2jn1";
|
||||
|
||||
subPackages = [ "cmd/jsonnet" ];
|
||||
subPackages = [ "cmd/jsonnet" "cmd/jsonnetfmt" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An implementation of Jsonnet in pure Go";
|
||||
@ -21,4 +21,4 @@ buildGoModule rec {
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ nshalman ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
major_version = "4";
|
||||
minor_version = "11";
|
||||
patch_version = "0+alpha3";
|
||||
sha256 = "0c2g8ncq15nx9pdl14hnsc9342j80s7i1bsyiw98cvgic5miyw9b";
|
||||
patch_version = "0+beta1";
|
||||
sha256 = "1xhkwprbnd3wp6bi3k74f42l1mff1ngn7gl4rgad9dk4ly0yzfdr";
|
||||
}
|
||||
|
@ -62,10 +62,6 @@ self: super: {
|
||||
mysql-simple = dontCheck super.mysql-simple;
|
||||
mysql-haskell = dontCheck super.mysql-haskell;
|
||||
|
||||
# Tests failing, fixed once 0.8.0 is in stackage
|
||||
# https://gitlab.com/twittner/zeromq-haskell/issues/63
|
||||
zeromq4-haskell = dontCheck super.zeromq4-haskell;
|
||||
|
||||
# The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
|
||||
# https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
|
||||
git-annex = (overrideSrc super.git-annex {
|
||||
@ -73,7 +69,7 @@ self: super: {
|
||||
name = "git-annex-${super.git-annex.version}-src";
|
||||
url = "git://git-annex.branchable.com/";
|
||||
rev = "refs/tags/" + super.git-annex.version;
|
||||
sha256 = "0adw72lw3ygls87w6i7hirf26gz991dkm992jb5f0h5nvy6d44pl";
|
||||
sha256 = "1b5lb1h7pqfhmp54zzwha17ms20xvxai1dl7s6787m9asli4q406";
|
||||
};
|
||||
}).override {
|
||||
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
|
||||
@ -121,7 +117,6 @@ self: super: {
|
||||
});
|
||||
|
||||
# The Haddock phase fails for one reason or another.
|
||||
bytestring-progress = dontHaddock super.bytestring-progress;
|
||||
deepseq-magic = dontHaddock super.deepseq-magic;
|
||||
feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1
|
||||
hoodle-core = dontHaddock super.hoodle-core;
|
||||
@ -175,9 +170,6 @@ self: super: {
|
||||
# Test suite depends on source code being available
|
||||
simple-affine-space = dontCheck super.simple-affine-space;
|
||||
|
||||
# https://github.com/kazu-yamamoto/simple-sendfile/issues/17
|
||||
simple-sendfile = dontCheck super.simple-sendfile;
|
||||
|
||||
# Fails no apparent reason. Upstream has been notified by e-mail.
|
||||
assertions = dontCheck super.assertions;
|
||||
|
||||
@ -185,9 +177,7 @@ self: super: {
|
||||
cmaes = dontCheck super.cmaes; # http://hydra.cryp.to/build/498725/log/raw
|
||||
dbmigrations = dontCheck super.dbmigrations;
|
||||
filestore = dontCheck super.filestore;
|
||||
getopt-generics = dontCheck super.getopt-generics;
|
||||
graceful = dontCheck super.graceful;
|
||||
Hclip = dontCheck super.Hclip;
|
||||
HList = dontCheck super.HList;
|
||||
ide-backend = dontCheck super.ide-backend;
|
||||
marquise = dontCheck super.marquise; # https://github.com/anchor/marquise/issues/69
|
||||
@ -244,7 +234,6 @@ self: super: {
|
||||
bloodhound = dontCheck super.bloodhound;
|
||||
buildwrapper = dontCheck super.buildwrapper;
|
||||
burst-detection = dontCheck super.burst-detection; # http://hydra.cryp.to/build/496948/log/raw
|
||||
cabal-bounds = dontCheck super.cabal-bounds; # http://hydra.cryp.to/build/496935/nixlog/1/raw
|
||||
cabal-meta = dontCheck super.cabal-meta; # http://hydra.cryp.to/build/497892/log/raw
|
||||
camfort = dontCheck super.camfort;
|
||||
cjk = dontCheck super.cjk;
|
||||
@ -315,7 +304,6 @@ self: super: {
|
||||
language-slice = dontCheck super.language-slice;
|
||||
ldap-client = dontCheck super.ldap-client;
|
||||
lensref = dontCheck super.lensref;
|
||||
lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25
|
||||
lvmrun = disableHardening (dontCheck super.lvmrun) ["format"];
|
||||
matplotlib = dontCheck super.matplotlib;
|
||||
memcache = dontCheck super.memcache;
|
||||
@ -445,7 +433,7 @@ self: super: {
|
||||
# https://github.com/junjihashimoto/test-sandbox-compose/issues/2
|
||||
test-sandbox-compose = dontCheck super.test-sandbox-compose;
|
||||
|
||||
# https://github.com/tych0/xcffib/issues/37
|
||||
# Waiting on language-python 0.5.8 https://github.com/bjpop/language-python/issues/60
|
||||
xcffib = dontCheck super.xcffib;
|
||||
|
||||
# https://github.com/afcowie/locators/issues/1
|
||||
@ -486,21 +474,12 @@ self: super: {
|
||||
then self.buildHaskellPackages.tasty-discover
|
||||
else dontCheck super.tasty-discover);
|
||||
|
||||
# generic-deriving bound is too tight
|
||||
# aeson 1.4.6.0 needs Diff 0.4.0 to do tests but nixpkgs is still at 0.3.4
|
||||
# https://github.com/bos/aeson/issues/740
|
||||
aeson = dontCheck (doJailbreak super.aeson);
|
||||
|
||||
# containers >=0.4 && <0.6 is too tight
|
||||
# https://github.com/RaphaelJ/friday/issues/34
|
||||
# Waiting on https://github.com/RaphaelJ/friday/pull/36
|
||||
friday = doJailbreak super.friday;
|
||||
|
||||
# Won't compile with recent versions of QuickCheck.
|
||||
inilist = dontCheck super.inilist;
|
||||
|
||||
# Doesn't accept recent versions of 'base' or QuickCheck.
|
||||
MissingH = dontCheck (doJailbreak super.MissingH);
|
||||
|
||||
# https://github.com/yaccz/saturnin/issues/3
|
||||
Saturnin = dontCheck super.Saturnin;
|
||||
|
||||
@ -513,12 +492,6 @@ self: super: {
|
||||
# https://github.com/alphaHeavy/lzma-enumerator/issues/3
|
||||
lzma-enumerator = dontCheck super.lzma-enumerator;
|
||||
|
||||
# https://github.com/haskell-hvr/lzma/issues/14
|
||||
lzma = dontCheck super.lzma;
|
||||
|
||||
# https://github.com/BNFC/bnfc/issues/140
|
||||
BNFC = dontCheck super.BNFC;
|
||||
|
||||
# FPCO's fork of Cabal won't succeed its test suite.
|
||||
Cabal-ide-backend = dontCheck super.Cabal-ide-backend;
|
||||
|
||||
@ -533,21 +506,12 @@ self: super: {
|
||||
inline-c-win32 = dontDistribute super.inline-c-win32;
|
||||
Southpaw = dontDistribute super.Southpaw;
|
||||
|
||||
# https://github.com/yesodweb/serversession/issues/1
|
||||
serversession = dontCheck super.serversession;
|
||||
|
||||
# Hydra no longer allows building texlive packages.
|
||||
lhs2tex = dontDistribute super.lhs2tex;
|
||||
|
||||
# https://ghc.haskell.org/trac/ghc/ticket/9825
|
||||
vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; });
|
||||
|
||||
# https://github.com/hspec/mockery/issues/6
|
||||
mockery = overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; });
|
||||
|
||||
# https://github.com/alphaHeavy/lzma-conduit/issues/5
|
||||
lzma-conduit = dontCheck super.lzma-conduit;
|
||||
|
||||
# https://github.com/kazu-yamamoto/logger/issues/42
|
||||
logger = dontCheck super.logger;
|
||||
|
||||
@ -578,9 +542,6 @@ self: super: {
|
||||
sha256 = "13g462qmj8c7if797gnyvf8h0cddmm3xy0pjldw48w8f8sr4qsj0";
|
||||
});
|
||||
|
||||
# https://github.com/athanclark/sets/issues/2
|
||||
sets = dontCheck super.sets;
|
||||
|
||||
# Install icons, metadata and cli program.
|
||||
bustle = overrideCabal super.bustle (drv: {
|
||||
buildDepends = [ pkgs.libpcap ];
|
||||
@ -664,9 +625,6 @@ self: super: {
|
||||
# https://github.com/pxqr/base32-bytestring/issues/4
|
||||
base32-bytestring = dontCheck super.base32-bytestring;
|
||||
|
||||
# https://github.com/goldfirere/singletons/issues/122
|
||||
singletons = dontCheck super.singletons;
|
||||
|
||||
# Djinn's last release was 2014, incompatible with Semigroup-Monoid Proposal
|
||||
# https://github.com/augustss/djinn/pull/8
|
||||
djinn = appendPatch super.djinn (pkgs.fetchpatch {
|
||||
@ -677,9 +635,6 @@ self: super: {
|
||||
# We cannot build this package w/o the C library from <http://www.phash.org/>.
|
||||
phash = markBroken super.phash;
|
||||
|
||||
# We get lots of strange compiler errors during the test suite run.
|
||||
jsaddle = dontCheck super.jsaddle;
|
||||
|
||||
# https://github.com/Philonous/hs-stun/pull/1
|
||||
# Remove if a version > 0.1.0.1 ever gets released.
|
||||
stunclient = overrideCabal super.stunclient (drv: {
|
||||
@ -691,9 +646,6 @@ self: super: {
|
||||
# The standard libraries are compiled separately.
|
||||
idris = generateOptparseApplicativeCompletion "idris" (dontCheck super.idris);
|
||||
|
||||
# https://github.com/bos/math-functions/issues/25
|
||||
math-functions = dontCheck super.math-functions;
|
||||
|
||||
# build servant docs from the repository
|
||||
servant =
|
||||
let
|
||||
@ -731,10 +683,6 @@ self: super: {
|
||||
# https://github.com/bmillwood/applicative-quoters/issues/6
|
||||
applicative-quoters = doJailbreak super.applicative-quoters;
|
||||
|
||||
# https://github.com/roelvandijk/terminal-progress-bar/issues/13
|
||||
# Still needed because of HUnit < 1.6
|
||||
terminal-progress-bar = doJailbreak super.terminal-progress-bar;
|
||||
|
||||
# https://hydra.nixos.org/build/42769611/nixlog/1/raw
|
||||
# note: the library is unmaintained, no upstream issue
|
||||
dataenc = doJailbreak super.dataenc;
|
||||
@ -757,39 +705,17 @@ self: super: {
|
||||
# No upstream issue tracker
|
||||
hspec-expectations-pretty-diff = dontCheck super.hspec-expectations-pretty-diff;
|
||||
|
||||
# https://github.com/basvandijk/lifted-base/issues/34
|
||||
# Still needed as HUnit < 1.5
|
||||
lifted-base = doJailbreak super.lifted-base;
|
||||
|
||||
# Don't depend on chell-quickcheck, which doesn't compile due to restricting
|
||||
# QuickCheck to versions ">=2.3 && <2.9".
|
||||
system-filepath = dontCheck super.system-filepath;
|
||||
|
||||
# https://github.com/basvandijk/case-insensitive/issues/24
|
||||
# Still needed as HUnit < 1.6
|
||||
case-insensitive = doJailbreak super.case-insensitive;
|
||||
|
||||
# https://github.com/hvr/uuid/issues/28
|
||||
uuid-types = doJailbreak super.uuid-types;
|
||||
uuid = doJailbreak super.uuid;
|
||||
|
||||
# https://github.com/ekmett/lens/issues/713
|
||||
lens = disableCabalFlag super.lens "test-doctests";
|
||||
|
||||
# https://github.com/haskell/fgl/issues/60
|
||||
# Needed for QuickCheck < 2.10
|
||||
fgl = dontCheck super.fgl;
|
||||
fgl-arbitrary = doJailbreak super.fgl-arbitrary;
|
||||
|
||||
# The tests spuriously fail
|
||||
libmpd = dontCheck super.libmpd;
|
||||
|
||||
# https://github.com/dan-t/cabal-lenses/issues/6
|
||||
cabal-lenses = doJailbreak super.cabal-lenses;
|
||||
|
||||
# https://github.com/fizruk/http-api-data/issues/49
|
||||
http-api-data = dontCheck super.http-api-data;
|
||||
|
||||
# https://github.com/diagrams/diagrams-lib/issues/288
|
||||
diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; });
|
||||
|
||||
@ -819,9 +745,6 @@ self: super: {
|
||||
digestive-functors-blaze = doJailbreak super.digestive-functors-blaze;
|
||||
digestive-functors = doJailbreak super.digestive-functors;
|
||||
|
||||
# missing dependencies: doctest ==0.12.*
|
||||
html-entities = doJailbreak super.html-entities;
|
||||
|
||||
# https://github.com/takano-akio/filelock/issues/5
|
||||
filelock = dontCheck super.filelock;
|
||||
|
||||
@ -841,8 +764,7 @@ self: super: {
|
||||
grakn = dontCheck (doJailbreak super.grakn);
|
||||
|
||||
# test suite requires git and does a bunch of git operations
|
||||
# doJailbreak because of hardcoded time, seems to be fixed upstream
|
||||
restless-git = dontCheck (doJailbreak super.restless-git);
|
||||
restless-git = dontCheck super.restless-git;
|
||||
|
||||
# Depends on broken fluid.
|
||||
fluid-idl-http-client = markBroken super.fluid-idl-http-client;
|
||||
@ -859,20 +781,18 @@ self: super: {
|
||||
|
||||
# Needs QuickCheck <2.10, which we don't have.
|
||||
edit-distance = doJailbreak super.edit-distance;
|
||||
blaze-markup = doJailbreak super.blaze-markup;
|
||||
blaze-html = doJailbreak super.blaze-html;
|
||||
attoparsec = dontCheck super.attoparsec; # 1 out of 67 tests fails
|
||||
int-cast = doJailbreak super.int-cast;
|
||||
nix-derivation = doJailbreak super.nix-derivation;
|
||||
|
||||
# Needs QuickCheck <2.10, HUnit <1.6 and base <4.10
|
||||
pointfree = doJailbreak super.pointfree;
|
||||
|
||||
# Depends on tasty < 1.x, which we don't have.
|
||||
cryptohash-sha256 = doJailbreak super.cryptohash-sha256;
|
||||
|
||||
# Needs tasty-quickcheck ==0.8.*, which we don't have.
|
||||
cryptohash-sha256 = dontCheck super.cryptohash-sha256;
|
||||
cryptohash-sha1 = doJailbreak super.cryptohash-sha1;
|
||||
cryptohash-md5 = doJailbreak super.cryptohash-md5;
|
||||
text-short = doJailbreak super.text-short;
|
||||
gitHUD = dontCheck super.gitHUD;
|
||||
githud = dontCheck super.githud;
|
||||
|
||||
@ -880,7 +800,6 @@ self: super: {
|
||||
config-ini = dontCheck super.config-ini;
|
||||
|
||||
# doctest >=0.9 && <0.12
|
||||
genvalidity-property = doJailbreak super.genvalidity-property;
|
||||
path = dontCheck super.path;
|
||||
|
||||
# Test suite fails due to trying to create directories
|
||||
@ -911,12 +830,6 @@ self: super: {
|
||||
in doJailbreak (f super.servant-docs); # jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage.
|
||||
swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2;
|
||||
|
||||
# requires a release including https://github.com/haskell-servant/servant-swagger/commit/249530d9f85fe76dfb18b100542f75a27e6a3079
|
||||
servant-swagger = dontCheck super.servant-swagger;
|
||||
|
||||
# Tries to read a file it is not allowed to in the test suite
|
||||
load-env = dontCheck super.load-env;
|
||||
|
||||
# Copy hledger man pages from data directory into the proper place. This code
|
||||
# should be moved into the cabal2nix generator.
|
||||
hledger = overrideCabal super.hledger (drv: {
|
||||
@ -959,18 +872,8 @@ self: super: {
|
||||
'';
|
||||
});
|
||||
|
||||
# https://github.com/haskell-rewriting/term-rewriting/pull/15
|
||||
# remove on next hackage update
|
||||
term-rewriting = doJailbreak super.term-rewriting;
|
||||
|
||||
# https://github.com/GaloisInc/pure-zlib/pull/11
|
||||
pure-zlib = doJailbreak super.pure-zlib;
|
||||
|
||||
# https://github.com/strake/lenz-template.hs/pull/2
|
||||
lenz-template = doJailbreak super.lenz-template;
|
||||
|
||||
# https://github.com/haskell-hvr/resolv/pull/6
|
||||
resolv = dontCheck super.resolv;
|
||||
resolv_0_1_1_2 = dontCheck super.resolv_0_1_1_2;
|
||||
|
||||
# spdx 0.2.2.0 needs older tasty
|
||||
@ -989,29 +892,18 @@ self: super: {
|
||||
# Compiles some C++ source which requires these headers
|
||||
VulkanMemoryAllocator = addExtraLibrary super.VulkanMemoryAllocator pkgs.vulkan-headers;
|
||||
|
||||
# # Builds only with the latest version of indexed-list-literals.
|
||||
# vector-sized_1_0_3_0 = super.vector-sized_1_0_3_0.override {
|
||||
# indexed-list-literals = self.indexed-list-literals_0_2_1_1;
|
||||
# };
|
||||
|
||||
# https://github.com/dmwit/encoding/pull/3
|
||||
encoding = doJailbreak (appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch);
|
||||
|
||||
# Work around overspecified constraint on github ==0.18.
|
||||
github-backup = doJailbreak super.github-backup;
|
||||
|
||||
# Test suite depends on old QuickCheck 2.10.x.
|
||||
cassava = dontCheck super.cassava;
|
||||
|
||||
# Test suite depends on cabal-install
|
||||
doctest = dontCheck super.doctest;
|
||||
|
||||
# https://github.com/haskell-servant/servant-auth/issues/113
|
||||
servant-auth-client = dontCheck super.servant-auth-client;
|
||||
|
||||
# Test has either build errors or fails anyway, depending on the compiler.
|
||||
vector-algorithms = dontCheck super.vector-algorithms;
|
||||
|
||||
# 2020-06-04: HACK: dontCheck - The test suite attempts to use the network.
|
||||
# Should be solved when: https://github.com/dhall-lang/dhall-haskell/issues/1837
|
||||
dhall = (generateOptparseApplicativeCompletion "dhall" (dontCheck super.dhall)).override { repline = self.repline_0_3_0_0; };
|
||||
@ -1050,9 +942,6 @@ self: super: {
|
||||
sha256 = "056rk58v9h114mjx62f41x971xn9p3nhsazcf9zrcyxh1ymrdm8j";
|
||||
});
|
||||
|
||||
# needed because of testing-feat >=0.4.0.2 && <1.1
|
||||
language-ecmascript = doJailbreak super.language-ecmascript;
|
||||
|
||||
# sexpr is old, broken and has no issue-tracker. Let's fix it the best we can.
|
||||
sexpr =
|
||||
appendPatch (overrideCabal super.sexpr (drv: {
|
||||
@ -1063,9 +952,6 @@ self: super: {
|
||||
# https://github.com/haskell/hoopl/issues/50
|
||||
hoopl = dontCheck super.hoopl;
|
||||
|
||||
# https://github.com/snapframework/xmlhtml/pull/37
|
||||
xmlhtml = doJailbreak super.xmlhtml;
|
||||
|
||||
purescript =
|
||||
let
|
||||
purescriptWithOverrides = super.purescript.override {
|
||||
@ -1101,12 +987,8 @@ self: super: {
|
||||
# });
|
||||
libnix = dontCheck super.libnix;
|
||||
|
||||
# 2020-06-23: NOTE: > 0.33 => rm 464.patch: https://github.com/jaor/xmobar/issues/466
|
||||
# dontCheck: The test suite tries to mess with ALSA, which doesn't work in the build sandbox.
|
||||
xmobar = appendPatch (dontCheck super.xmobar) (pkgs.fetchpatch {
|
||||
url = "https://github.com/jaor/xmobar/pull/464.patch";
|
||||
sha256 = "0y1dd878yzy1cx0cjj0ijd3dmywr7jdmk68vxdjimxzblrdw1al6";
|
||||
});
|
||||
xmobar = dontCheck super.xmobar;
|
||||
|
||||
# https://github.com/mgajda/json-autotype/issues/25
|
||||
json-autotype = dontCheck super.json-autotype;
|
||||
@ -1124,14 +1006,6 @@ self: super: {
|
||||
})];
|
||||
});
|
||||
|
||||
# Remove unecessary constraint:
|
||||
# https://github.com/haskell-infra/hackage-trustees/issues/258
|
||||
data-accessor-template = overrideCabal super.data-accessor-template (drv: {
|
||||
postPatch = ''
|
||||
sed -i 's#template-haskell >=2.11 && <2.15#template-haskell#' data-accessor-template.cabal
|
||||
'';
|
||||
});
|
||||
|
||||
# 2020-06-05: HACK: In Nixpkgs currently this is
|
||||
# old pandoc version 2.7.4 to current 2.9.2.1,
|
||||
# test suite failures: https://github.com/jgm/pandoc/issues/5582
|
||||
@ -1169,9 +1043,6 @@ self: super: {
|
||||
# Test suite won't link for no apparent reason.
|
||||
constraints-deriving = dontCheck super.constraints-deriving;
|
||||
|
||||
# QuickCheck >=2.3 && <2.13, hspec >=2.1 && <2.7
|
||||
graphviz = dontCheck super.graphviz;
|
||||
|
||||
# https://github.com/elliottt/hsopenid/issues/15
|
||||
openid = markBroken super.openid;
|
||||
|
||||
@ -1184,10 +1055,6 @@ self: super: {
|
||||
'';
|
||||
});
|
||||
|
||||
# The doctests in universum-1.5.0 are broken. The doctests in versions of universum after
|
||||
# 1.5.0 should be fixed, so this should be able to be removed.
|
||||
universum = dontCheck super.universum;
|
||||
|
||||
# https://github.com/erikd/hjsmin/issues/32
|
||||
hjsmin = dontCheck super.hjsmin;
|
||||
|
||||
@ -1206,9 +1073,6 @@ self: super: {
|
||||
# upstream issue: https://github.com/vmchale/atspkg/issues/12
|
||||
language-ats = dontCheck super.language-ats;
|
||||
|
||||
# https://github.com/Happstack/web-routes-th/pull/3
|
||||
web-routes-th = doJailbreak super.web-routes-th;
|
||||
|
||||
# Remove for hail > 0.2.0.0
|
||||
hail = overrideCabal super.hail (drv: {
|
||||
patches = [
|
||||
@ -1230,9 +1094,6 @@ self: super: {
|
||||
# https://github.com/kazu-yamamoto/dns/issues/150
|
||||
dns = dontCheck super.dns;
|
||||
|
||||
# Support recent versions of fast-logger.
|
||||
spacecookie = doJailbreak super.spacecookie;
|
||||
|
||||
# apply patches from https://github.com/snapframework/snap-server/pull/126
|
||||
# manually until they are accepted upstream
|
||||
snap-server = overrideCabal super.snap-server (drv: {
|
||||
@ -1254,9 +1115,6 @@ self: super: {
|
||||
# https://github.com/haskell-servant/servant-ekg/issues/15
|
||||
servant-ekg = doJailbreak super.servant-ekg;
|
||||
|
||||
# krank-0.1.0 does not accept PyF-0.9.0.0.
|
||||
krank = doJailbreak super.krank;
|
||||
|
||||
# the test suite has an overly tight restriction on doctest
|
||||
# See https://github.com/ekmett/perhaps/pull/5
|
||||
perhaps = doJailbreak super.perhaps;
|
||||
@ -1280,9 +1138,6 @@ self: super: {
|
||||
'';
|
||||
});
|
||||
|
||||
# Unnecessary upper bound on vector <0.12.1
|
||||
bitwise-enum = doJailbreak super.bitwise-enum;
|
||||
|
||||
# This breaks because of version bounds, but compiles and runs fine.
|
||||
# Last commit is 5 years ago, so we likely won't get upstream fixed soon.
|
||||
# https://bitbucket.org/rvlm/hakyll-contrib-hyphenation/src/master/
|
||||
@ -1309,9 +1164,6 @@ self: super: {
|
||||
# gitit is unbroken in the latest release
|
||||
gitit = markUnbroken super.gitit;
|
||||
|
||||
# haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2.
|
||||
haskell-ci = doJailbreak super.haskell-ci;
|
||||
|
||||
# Test suite requires database
|
||||
persistent-mysql = dontCheck super.persistent-mysql;
|
||||
persistent-postgresql = dontCheck super.persistent-postgresql;
|
||||
@ -1481,7 +1333,56 @@ self: super: {
|
||||
# See: https://github.com/robstewart57/rdf4h/issues/39
|
||||
rdf4h = dontCheck super.rdf4h;
|
||||
|
||||
# hasn't bumped upper bounds
|
||||
# test fails: "floskell-test: styles/base.md: openBinaryFile: does not exist (No such file or directory)"
|
||||
# https://github.com/ennocramer/floskell/issues/48
|
||||
floskell = dontCheck (doJailbreak super.floskell);
|
||||
|
||||
# hasn't bumped upper bounds
|
||||
# test fails because of a "Warning: Unused LANGUAGE pragma"
|
||||
# https://github.com/ennocramer/monad-dijkstra/issues/4
|
||||
monad-dijkstra = dontCheck (doJailbreak super.monad-dijkstra);
|
||||
|
||||
# haskell-language-server uses its own fork of ghcide
|
||||
# Test disabled: it seems to freeze (is it just that it takes a long time ?)
|
||||
hls-ghcide =
|
||||
dontCheck (
|
||||
overrideCabal super.hls-ghcide
|
||||
(old: {
|
||||
# The integration test run by lsp-test requires the executable to be in the PATH
|
||||
preCheck = ''
|
||||
export PATH=$PATH:dist/build/ghcide
|
||||
'';
|
||||
})
|
||||
);
|
||||
|
||||
haskell-language-server = (overrideCabal super.haskell-language-server
|
||||
(old: {
|
||||
# The integration test run by lsp-test requires the executable to be in the PATH
|
||||
preCheck = ''
|
||||
export PATH=$PATH:dist/build/haskell-language-server
|
||||
'';
|
||||
|
||||
# test needs the git tool
|
||||
testToolDepends = old.testToolDepends
|
||||
++ [ pkgs.git ];
|
||||
})).override {
|
||||
# use a fork of ghcide
|
||||
ghcide = self.hls-ghcide;
|
||||
# use specific version
|
||||
ormolu = super.ormolu_0_0_5_0;
|
||||
};
|
||||
|
||||
# https://github.com/kowainik/policeman/issues/57
|
||||
policeman = doJailbreak super.policeman;
|
||||
|
||||
# 2020-06-29: These three packages have bumped their dependencies for haskell-gi and haskell-gi-base beyond stack-lts.
|
||||
# Choosing a jailbreak, because a version override would rebuild most of the glibverse and the packages still build with the older version.
|
||||
gi-javascriptcore =
|
||||
# Remove these jailbreaks, when assert fails.
|
||||
assert (pkgs.lib.versionOlder super.haskell-gi-base.version "0.24");
|
||||
doJailbreak super.gi-javascriptcore;
|
||||
gi-soup = doJailbreak super.gi-soup;
|
||||
gi-webkit2 = doJailbreak super.gi-webkit2;
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
@ -61,28 +61,10 @@ self: super: {
|
||||
haddock-library = self.haddock-library_1_9_0;
|
||||
|
||||
# Jailbreak to fix the build.
|
||||
async = doJailbreak super.async;
|
||||
base-noprelude = doJailbreak super.base-noprelude;
|
||||
ChasingBottoms = doJailbreak super.ChasingBottoms;
|
||||
ed25519 = doJailbreak super.ed25519;
|
||||
email-validate = doJailbreak super.email-validate; # https://github.com/Porges/email-validate-hs/issues/51
|
||||
feed = doJailbreak super.feed; # https://github.com/bergmark/feed/issues/48
|
||||
hashable = doJailbreak super.hashable;
|
||||
pandoc = doJailbreak super.pandoc;
|
||||
parallel = doJailbreak super.parallel;
|
||||
regex-base = doJailbreak super.regex-base;
|
||||
regex-compat = doJailbreak super.regex-compat;
|
||||
regex-pcre-builtin = doJailbreak super.regex-pcre-builtin;
|
||||
regex-posix = doJailbreak super.regex-posix;
|
||||
regex-tdfa = doJailbreak super.regex-tdfa;
|
||||
split = doJailbreak super.split;
|
||||
system-fileio = doJailbreak super.system-fileio;
|
||||
tar = doJailbreak super.tar;
|
||||
tasty-expected-failure = doJailbreak super.tasty-expected-failure;
|
||||
tasty-rerun = doJailbreak super.tasty-rerun; # https://github.com/ocharles/tasty-rerun/issues/18
|
||||
unliftio-core = doJailbreak super.unliftio-core;
|
||||
vector = doJailbreak super.vector;
|
||||
zlib = doJailbreak super.zlib;
|
||||
|
||||
# Use the latest version to fix the build.
|
||||
lens = self.lens_4_19_2;
|
||||
@ -99,13 +81,8 @@ self: super: {
|
||||
ghc-lib-parser-ex = super.ghc-lib-parser-ex.override { ghc-lib-parser = null; };
|
||||
|
||||
# Jailbreak to fix the build.
|
||||
aeson-diff = doJailbreak super.aeson-diff;
|
||||
brick = doJailbreak super.brick;
|
||||
cabal-plan = doJailbreak super.cabal-plan;
|
||||
cborg = doJailbreak super.cborg;
|
||||
cborg-json = doJailbreak super.cborg-json;
|
||||
exact-pi = doJailbreak super.exact-pi;
|
||||
relude = dontCheck (doJailbreak super.relude);
|
||||
serialise = doJailbreak super.serialise;
|
||||
setlocale = doJailbreak super.setlocale;
|
||||
shellmet = doJailbreak super.shellmet;
|
||||
|
@ -54,7 +54,6 @@ self: super: {
|
||||
async = doJailbreak super.async;
|
||||
ChasingBottoms = doJailbreak super.ChasingBottoms;
|
||||
chell = doJailbreak super.chell;
|
||||
cryptohash-sha256 = doJailbreak super.cryptohash-sha256;
|
||||
Diff = dontCheck super.Diff;
|
||||
doctest = doJailbreak super.doctest;
|
||||
hashable = doJailbreak super.hashable;
|
||||
|
@ -67,14 +67,12 @@ core-packages:
|
||||
# comment saying "# LTS Haskell x.y". Any changes after that commend will be
|
||||
# lost the next time `update-stackage.sh` runs.
|
||||
default-package-overrides:
|
||||
# Newer versions have test suite failures.
|
||||
- git-annex < 8.20200522
|
||||
# This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag
|
||||
- MissingH ==1.4.2.0
|
||||
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and
|
||||
# not yet available in Nixpkgs
|
||||
- gi-gdkx11 < 4
|
||||
# LTS Haskell 16.2
|
||||
# LTS Haskell 16.3
|
||||
- abstract-deque ==0.3
|
||||
- abstract-par ==0.3.3
|
||||
- AC-Angle ==1.0
|
||||
@ -281,7 +279,7 @@ default-package-overrides:
|
||||
- base32-lens ==0.1.0.0
|
||||
- base32string ==0.9.1
|
||||
- base58string ==0.10.0
|
||||
- base64 ==0.4.2
|
||||
- base64 ==0.4.2.1
|
||||
- base64-bytestring ==1.0.0.3
|
||||
- base64-bytestring-type ==1.0.1
|
||||
- base64-lens ==0.3.0
|
||||
@ -387,7 +385,7 @@ default-package-overrides:
|
||||
- cabal-appimage ==0.3.0.0
|
||||
- cabal-debian ==5.0.2
|
||||
- cabal-doctest ==1.0.8
|
||||
- cabal-rpm ==2.0.5.1
|
||||
- cabal-rpm ==2.0.6
|
||||
- cache ==0.1.3.0
|
||||
- cacophony ==0.10.1
|
||||
- calendar-recycling ==0.0.0.1
|
||||
@ -423,7 +421,7 @@ default-package-overrides:
|
||||
- Chart ==1.9.3
|
||||
- Chart-diagrams ==1.9.3
|
||||
- chaselev-deque ==0.5.0.5
|
||||
- ChasingBottoms ==1.3.1.8
|
||||
- ChasingBottoms ==1.3.1.9
|
||||
- cheapskate ==0.1.1.2
|
||||
- cheapskate-highlight ==0.1.0.0
|
||||
- cheapskate-lucid ==0.1.0.0
|
||||
@ -449,7 +447,7 @@ default-package-overrides:
|
||||
- classy-prelude-yesod ==1.5.0
|
||||
- clay ==0.13.3
|
||||
- clientsession ==0.9.1.2
|
||||
- climb ==0.3.1
|
||||
- climb ==0.3.3
|
||||
- Clipboard ==2.3.2.0
|
||||
- clock ==0.8
|
||||
- clock-extras ==0.1.0.2
|
||||
@ -612,7 +610,7 @@ default-package-overrides:
|
||||
- dataurl ==0.1.0.0
|
||||
- DAV ==1.3.4
|
||||
- DBFunctor ==0.1.1.1
|
||||
- dbus ==1.2.15.1
|
||||
- dbus ==1.2.16
|
||||
- dbus-hslogger ==0.1.0.1
|
||||
- debian ==4.0.2
|
||||
- debian-build ==0.10.2.0
|
||||
@ -623,7 +621,7 @@ default-package-overrides:
|
||||
- deepseq-generics ==0.2.0.0
|
||||
- deepseq-instances ==0.1.0.1
|
||||
- deferred-folds ==0.9.10.1
|
||||
- dejafu ==2.3.0.0
|
||||
- dejafu ==2.3.0.1
|
||||
- dense-linear-algebra ==0.1.0.0
|
||||
- depq ==0.4.1.0
|
||||
- deque ==0.4.3
|
||||
@ -679,7 +677,7 @@ default-package-overrides:
|
||||
- double-conversion ==2.0.2.0
|
||||
- download ==0.3.2.7
|
||||
- drinkery ==0.4
|
||||
- dsp ==0.2.5
|
||||
- dsp ==0.2.5.1
|
||||
- dual ==0.1.1.1
|
||||
- dual-tree ==0.2.2.1
|
||||
- dublincore-xml-conduit ==0.1.0.2
|
||||
@ -735,7 +733,7 @@ default-package-overrides:
|
||||
- errors ==2.3.0
|
||||
- errors-ext ==0.4.2
|
||||
- ersatz ==0.4.8
|
||||
- esqueleto ==3.3.3.0
|
||||
- esqueleto ==3.3.3.2
|
||||
- essence-of-live-coding ==0.1.0.3
|
||||
- essence-of-live-coding-gloss ==0.1.0.3
|
||||
- essence-of-live-coding-pulse ==0.1.0.3
|
||||
@ -817,7 +815,7 @@ default-package-overrides:
|
||||
- focuslist ==0.1.0.2
|
||||
- foldable1 ==0.1.0.0
|
||||
- fold-debounce ==0.2.0.9
|
||||
- fold-debounce-conduit ==0.2.0.4
|
||||
- fold-debounce-conduit ==0.2.0.5
|
||||
- foldl ==1.4.6
|
||||
- folds ==0.7.5
|
||||
- follow-file ==0.0.3
|
||||
@ -916,7 +914,7 @@ default-package-overrides:
|
||||
- ghc-typelits-extra ==0.4
|
||||
- ghc-typelits-knownnat ==0.7.2
|
||||
- ghc-typelits-natnormalise ==0.7.2
|
||||
- ghc-typelits-presburger ==0.3.0.0
|
||||
- ghc-typelits-presburger ==0.3.0.1
|
||||
- ghost-buster ==0.1.1.0
|
||||
- gi-atk ==2.0.21
|
||||
- gi-cairo ==1.0.23
|
||||
@ -962,9 +960,9 @@ default-package-overrides:
|
||||
- graphviz ==2999.20.0.4
|
||||
- graph-wrapper ==0.2.6.0
|
||||
- gravatar ==0.8.0
|
||||
- greskell ==1.1.0.2
|
||||
- greskell-core ==0.1.3.4
|
||||
- greskell-websocket ==0.1.2.3
|
||||
- greskell ==1.1.0.3
|
||||
- greskell-core ==0.1.3.5
|
||||
- greskell-websocket ==0.1.2.4
|
||||
- groom ==0.1.2.1
|
||||
- group-by-date ==0.1.0.3
|
||||
- groups ==0.4.1.0
|
||||
@ -1025,7 +1023,7 @@ default-package-overrides:
|
||||
- hebrew-time ==0.1.2
|
||||
- hedgehog ==1.0.2
|
||||
- hedgehog-corpus ==0.2.0
|
||||
- hedgehog-fakedata ==0.0.1.2
|
||||
- hedgehog-fakedata ==0.0.1.3
|
||||
- hedgehog-fn ==1.0
|
||||
- hedgehog-quickcheck ==0.1.1
|
||||
- hedis ==0.12.13
|
||||
@ -1039,7 +1037,7 @@ default-package-overrides:
|
||||
- hformat ==0.3.3.1
|
||||
- hfsevents ==0.1.6
|
||||
- hidapi ==0.1.5
|
||||
- hie-bios ==0.5.0
|
||||
- hie-bios ==0.5.1
|
||||
- hi-file-parser ==0.1.0.0
|
||||
- higher-leveldb ==0.5.0.2
|
||||
- highlighting-kate ==0.6.4
|
||||
@ -1110,7 +1108,7 @@ default-package-overrides:
|
||||
- hspec-leancheck ==0.0.4
|
||||
- hspec-megaparsec ==2.1.0
|
||||
- hspec-meta ==2.6.0
|
||||
- hspec-need-env ==0.1.0.4
|
||||
- hspec-need-env ==0.1.0.5
|
||||
- hspec-parsec ==0
|
||||
- hspec-smallcheck ==0.5.2
|
||||
- hspec-tables ==0.0.1
|
||||
@ -1241,7 +1239,7 @@ default-package-overrides:
|
||||
- io-streams-haproxy ==1.0.1.0
|
||||
- ip6addr ==1.0.1
|
||||
- iproute ==1.7.9
|
||||
- IPv6Addr ==1.1.4
|
||||
- IPv6Addr ==1.1.5
|
||||
- ipynb ==0.1.0.1
|
||||
- ipython-kernel ==0.10.2.0
|
||||
- irc ==0.6.1.0
|
||||
@ -1344,7 +1342,7 @@ default-package-overrides:
|
||||
- lifted-base ==0.2.3.12
|
||||
- lift-generics ==0.1.3
|
||||
- line ==4.0.1
|
||||
- linear ==1.21
|
||||
- linear ==1.21.1
|
||||
- linenoise ==0.3.2
|
||||
- linux-file-extents ==0.2.0.0
|
||||
- linux-namespaces ==0.1.3.0
|
||||
@ -1390,9 +1388,9 @@ default-package-overrides:
|
||||
- markdown ==0.1.17.4
|
||||
- markdown-unlit ==0.5.0
|
||||
- markov-chain ==0.0.3.4
|
||||
- massiv ==0.5.2.0
|
||||
- massiv ==0.5.3.1
|
||||
- massiv-io ==0.2.1.0
|
||||
- massiv-test ==0.1.3
|
||||
- massiv-test ==0.1.3.1
|
||||
- mathexpr ==0.3.0.0
|
||||
- math-extras ==0.1.1.0
|
||||
- math-functions ==0.3.4.0
|
||||
@ -1440,7 +1438,7 @@ default-package-overrides:
|
||||
- minimorph ==0.2.2.0
|
||||
- minio-hs ==1.5.2
|
||||
- miniutter ==0.5.1.0
|
||||
- min-max-pqueue ==0.1.0.1
|
||||
- min-max-pqueue ==0.1.0.2
|
||||
- mintty ==0.1.2
|
||||
- miso ==1.6.0.0
|
||||
- missing-foreign ==0.1.1
|
||||
@ -1478,7 +1476,7 @@ default-package-overrides:
|
||||
- monad-peel ==0.2.1.2
|
||||
- monad-products ==4.0.1
|
||||
- MonadPrompt ==1.0.0.5
|
||||
- MonadRandom ==0.5.1.2
|
||||
- MonadRandom ==0.5.2
|
||||
- monad-resumption ==0.1.4.0
|
||||
- monad-skeleton ==0.1.5
|
||||
- monad-st ==0.2.4.1
|
||||
@ -1570,7 +1568,7 @@ default-package-overrides:
|
||||
- nsis ==0.3.3
|
||||
- numbers ==3000.2.0.2
|
||||
- numeric-extras ==0.1
|
||||
- numeric-prelude ==0.4.3.1
|
||||
- numeric-prelude ==0.4.3.2
|
||||
- numhask ==0.4.0
|
||||
- NumInstances ==1.4
|
||||
- numtype-dk ==0.5.0.2
|
||||
@ -1616,14 +1614,14 @@ default-package-overrides:
|
||||
- optparse-simple ==0.1.1.2
|
||||
- optparse-text ==0.1.1.0
|
||||
- ordered-containers ==0.2.2
|
||||
- ormolu ==0.1.0.0
|
||||
- ormolu ==0.1.2.0
|
||||
- overhang ==1.0.0
|
||||
- packcheck ==0.5.1
|
||||
- pager ==0.1.1.0
|
||||
- pagination ==0.2.1
|
||||
- pagure-cli ==0.2
|
||||
- pandoc ==2.9.2.1
|
||||
- pandoc-citeproc ==0.17
|
||||
- pandoc-citeproc ==0.17.0.1
|
||||
- pandoc-csv2table ==1.0.8
|
||||
- pandoc-plot ==0.6.1.0
|
||||
- pandoc-pyplot ==2.3.0.1
|
||||
@ -1651,7 +1649,7 @@ default-package-overrides:
|
||||
- path-io ==1.6.0
|
||||
- path-pieces ==0.2.1
|
||||
- path-text-utf8 ==0.0.1.6
|
||||
- pathtype ==0.8.1
|
||||
- pathtype ==0.8.1.1
|
||||
- pathwalk ==0.3.1.2
|
||||
- pattern-arrows ==0.0.2
|
||||
- pcg-random ==0.1.3.6
|
||||
@ -1780,7 +1778,7 @@ default-package-overrides:
|
||||
- pureMD5 ==2.1.3
|
||||
- purescript-bridge ==0.14.0.0
|
||||
- pushbullet-types ==0.4.1.0
|
||||
- pusher-http-haskell ==1.5.1.13
|
||||
- pusher-http-haskell ==1.5.1.14
|
||||
- pvar ==0.2.0.0
|
||||
- PyF ==0.9.0.1
|
||||
- qchas ==1.1.0.1
|
||||
@ -1799,7 +1797,7 @@ default-package-overrides:
|
||||
- quickcheck-simple ==0.1.1.1
|
||||
- quickcheck-special ==0.1.0.6
|
||||
- quickcheck-text ==0.1.2.1
|
||||
- quickcheck-transformer ==0.3.1
|
||||
- quickcheck-transformer ==0.3.1.1
|
||||
- quickcheck-unicode ==1.0.1.0
|
||||
- quiet ==0.2
|
||||
- radius ==0.6.1.0
|
||||
@ -1876,7 +1874,7 @@ default-package-overrides:
|
||||
- rerebase ==1.6.1
|
||||
- resolv ==0.1.2.0
|
||||
- resource-pool ==0.2.3.2
|
||||
- resourcet ==1.2.4.1
|
||||
- resourcet ==1.2.4.2
|
||||
- result ==0.2.6.0
|
||||
- rethinkdb-client-driver ==0.0.25
|
||||
- retry ==0.8.1.2
|
||||
@ -1922,7 +1920,7 @@ default-package-overrides:
|
||||
- scalpel-core ==0.6.2
|
||||
- scanf ==0.1.0.0
|
||||
- scanner ==0.3.1
|
||||
- scheduler ==1.4.2.2
|
||||
- scheduler ==1.4.2.3
|
||||
- scientific ==0.3.6.2
|
||||
- scotty ==0.11.6
|
||||
- scrypt ==0.5.0
|
||||
@ -2024,7 +2022,7 @@ default-package-overrides:
|
||||
- singleton-bool ==0.1.5
|
||||
- singleton-nats ==0.4.5
|
||||
- singletons ==2.6
|
||||
- singletons-presburger ==0.3.0.0
|
||||
- singletons-presburger ==0.3.0.1
|
||||
- siphash ==1.0.3
|
||||
- sitemap-gen ==0.1.0.0
|
||||
- size-based ==0.1.2.0
|
||||
@ -2074,7 +2072,7 @@ default-package-overrides:
|
||||
- squeather ==0.4.0.0
|
||||
- srcloc ==0.5.1.2
|
||||
- stache ==2.1.1
|
||||
- stackcollapse-ghc ==0.0.1
|
||||
- stackcollapse-ghc ==0.0.1.1
|
||||
- stack-templatizer ==0.1.0.2
|
||||
- starter ==0.3.0
|
||||
- stateref ==0.3
|
||||
@ -2094,7 +2092,7 @@ default-package-overrides:
|
||||
- storable-complex ==0.2.3.0
|
||||
- storable-record ==0.0.5
|
||||
- storable-tuple ==0.0.3.3
|
||||
- storablevector ==0.2.13
|
||||
- storablevector ==0.2.13.1
|
||||
- stratosphere ==0.53.0
|
||||
- streaming ==0.2.3.0
|
||||
- streaming-bytestring ==0.1.6
|
||||
@ -2134,7 +2132,7 @@ default-package-overrides:
|
||||
- svg-tree ==0.6.2.4
|
||||
- swagger ==0.3.0
|
||||
- swagger2 ==2.5
|
||||
- swish ==0.10.0.3
|
||||
- swish ==0.10.0.4
|
||||
- syb ==0.7.1
|
||||
- symbol ==0.2.4
|
||||
- symengine ==0.1.2.0
|
||||
@ -2160,7 +2158,7 @@ default-package-overrides:
|
||||
- tardis ==0.4.1.0
|
||||
- tasty ==1.2.3
|
||||
- tasty-ant-xml ==1.1.6
|
||||
- tasty-dejafu ==2.0.0.4
|
||||
- tasty-dejafu ==2.0.0.5
|
||||
- tasty-discover ==4.2.1
|
||||
- tasty-expected-failure ==0.11.1.2
|
||||
- tasty-golden ==2.3.3.2
|
||||
@ -2421,7 +2419,7 @@ default-package-overrides:
|
||||
- wai-session ==0.3.3
|
||||
- wai-slack-middleware ==0.2.0
|
||||
- wai-websockets ==3.0.1.2
|
||||
- warp ==3.3.12
|
||||
- warp ==3.3.13
|
||||
- warp-tls ==3.2.12
|
||||
- warp-tls-uid ==0.2.0.6
|
||||
- wave ==0.2.0
|
||||
@ -2436,8 +2434,8 @@ default-package-overrides:
|
||||
- weigh ==0.0.16
|
||||
- wide-word ==0.1.1.1
|
||||
- wikicfp-scraper ==0.1.0.11
|
||||
- wild-bind ==0.1.2.5
|
||||
- wild-bind-x11 ==0.2.0.9
|
||||
- wild-bind ==0.1.2.6
|
||||
- wild-bind-x11 ==0.2.0.10
|
||||
- Win32 ==2.6.1.0
|
||||
- Win32-notify ==0.3.0.3
|
||||
- windns ==0.1.0.1
|
||||
@ -2454,7 +2452,7 @@ default-package-overrides:
|
||||
- word8 ==0.1.3
|
||||
- word-trie ==0.3.0
|
||||
- word-wrap ==0.4.1
|
||||
- world-peace ==1.0.1.0
|
||||
- world-peace ==1.0.2.0
|
||||
- wrap ==0.0.0
|
||||
- wreq ==0.5.3.2
|
||||
- writer-cps-exceptions ==0.1.0.1
|
||||
@ -2499,7 +2497,7 @@ default-package-overrides:
|
||||
- xxhash-ffi ==0.2.0.0
|
||||
- yaml ==0.11.4.0
|
||||
- yamlparse-applicative ==0.1.0.1
|
||||
- yesod ==1.6.0.1
|
||||
- yesod ==1.6.0.2
|
||||
- yesod-auth ==1.6.10
|
||||
- yesod-auth-fb ==1.10.1
|
||||
- yesod-auth-hashdb ==1.7.1.2
|
||||
@ -2514,7 +2512,7 @@ default-package-overrides:
|
||||
- yesod-recaptcha2 ==1.0.0
|
||||
- yesod-sitemap ==1.6.0
|
||||
- yesod-static ==1.6.0.1
|
||||
- yesod-test ==1.6.9.1
|
||||
- yesod-test ==1.6.10
|
||||
- yesod-websockets ==0.3.0.2
|
||||
- yes-precure5-command ==5.5.3
|
||||
- yi-rope ==0.11
|
||||
@ -2586,6 +2584,7 @@ extra-packages:
|
||||
- mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms
|
||||
- network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below
|
||||
- network == 3.0.* # required by network-bsd, HTTP, and many others (2019-04-30)
|
||||
- ormolu == 0.0.5.0 # required by haskell-language-server
|
||||
- pantry == 0.2.0.0 # required by stack-2.1.3.1
|
||||
- parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3
|
||||
- patience ^>= 0.1 # required by chell-0.4.x
|
||||
@ -2685,11 +2684,12 @@ package-maintainers:
|
||||
sorki:
|
||||
- cayene-lpp
|
||||
- data-stm32
|
||||
# - gcodehs
|
||||
- gcodehs
|
||||
- nix-derivation
|
||||
- nix-narinfo
|
||||
- ttn
|
||||
# - ttn-client
|
||||
- update-nix-fetchgit
|
||||
- zre
|
||||
|
||||
unsupported-platforms:
|
||||
@ -3216,6 +3216,7 @@ broken-packages:
|
||||
- azubi
|
||||
- azure-acs
|
||||
- azure-email
|
||||
- azure-functions-worker
|
||||
- azure-service-api
|
||||
- azure-servicebus
|
||||
- azurify
|
||||
@ -3577,7 +3578,6 @@ broken-packages:
|
||||
- c10k
|
||||
- c2ats
|
||||
- cabal-audit
|
||||
- cabal-bounds
|
||||
- cabal-bundle-clib
|
||||
- cabal-cache
|
||||
- cabal-cargs
|
||||
@ -3594,7 +3594,6 @@ broken-packages:
|
||||
- cabal-install-bundle
|
||||
- cabal-install-ghc72
|
||||
- cabal-install-ghc74
|
||||
- cabal-lenses
|
||||
- cabal-meta
|
||||
- cabal-mon
|
||||
- cabal-nirvana
|
||||
@ -4989,7 +4988,6 @@ broken-packages:
|
||||
- flite
|
||||
- float-binstring
|
||||
- floating-bits
|
||||
- floskell
|
||||
- flow-er
|
||||
- flow2dot
|
||||
- flowdock
|
||||
@ -5171,7 +5169,6 @@ broken-packages:
|
||||
- gas
|
||||
- gbu
|
||||
- gc-monitoring-wai
|
||||
- gcodehs
|
||||
- gconf
|
||||
- gdax
|
||||
- gdiff-ig
|
||||
@ -7700,7 +7697,6 @@ broken-packages:
|
||||
- monad-atom
|
||||
- monad-atom-simple
|
||||
- monad-branch
|
||||
- monad-dijkstra
|
||||
- monad-exception
|
||||
- monad-finally
|
||||
- monad-fork
|
||||
@ -10564,7 +10560,6 @@ broken-packages:
|
||||
- unused
|
||||
- uom-plugin
|
||||
- up
|
||||
- update-nix-fetchgit
|
||||
- Updater
|
||||
- uploadcare
|
||||
- upskirt
|
||||
|
3132
pkgs/development/haskell-modules/hackage-packages.nix
generated
3132
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -16,4 +16,9 @@ self: super: {
|
||||
# spago is not released to Hackage.
|
||||
# https://github.com/spacchetti/spago/issues/512
|
||||
spago = self.callPackage ../tools/purescript/spago/spago.nix { };
|
||||
|
||||
# HLS and its fork of ghcide that it uses
|
||||
# both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh
|
||||
haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { };
|
||||
hls-ghcide = self.callPackage ../tools/haskell/haskell-language-server/hls-ghcide.nix { };
|
||||
}
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "joker";
|
||||
version = "0.15.4";
|
||||
version = "0.15.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "candid82";
|
||||
repo = "joker";
|
||||
sha256 = "1ad6cdqadd1zs9zh85zyhdiiv6ir28k28w034vzsx5zaipvy4kml";
|
||||
sha256 = "0v4mamd5zkw7r9gfl4rzy4mr1d7ni9klryd93izqssgps954bikz";
|
||||
};
|
||||
|
||||
vendorSha256 = "031ban30kx84r54fj9aq96pwkz9nqh4p9yzs4l8i1wqmy52rldvl";
|
||||
|
@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
|
||||
jruby = stdenv.mkDerivation rec {
|
||||
pname = "jruby";
|
||||
|
||||
version = "9.2.11.1";
|
||||
version = "9.2.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
|
||||
sha256 = "1p4ml5rqidqllc7z85zn2q4pyyih71j0gb71wl43j4v74p44j17i";
|
||||
sha256 = "013c1q1n525y9ghp369z1jayivm9bw8c1x0g5lz7479hqhj62zrh";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasmtime";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoSha256 = "149nav392wf4sr50dpdlnvfq3vfrrl9lqgr98g5dyzfjrf5jbzm3";
|
||||
cargoSha256 = "0r92jafxbji2sgc5a4syycsk705zcx4wqfwgg73sx568mfxkw225";
|
||||
|
||||
nativeBuildInputs = [ python cmake clang ];
|
||||
buildInputs = [ llvmPackages.libclang ] ++
|
||||
|
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apache-activemq";
|
||||
version = "5.15.13";
|
||||
version = "5.16.0";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "1hzapnd0lbiid243xiaz8kv67al8griccjj4dabml62hqhrk9k96";
|
||||
sha256 = "0x68l4n0v2jqmbawdgpghmhnchpg1jsvxzskj6s4hjll6hdgb6fk";
|
||||
url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
|
||||
};
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bzrtp";
|
||||
version = "4.3.1";
|
||||
version = "4.4.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "14fqp6r9rf7z6j5phbsrdxlbjak03hs8kb94b6jgcrcdxrxhy3fy";
|
||||
sha256 = "1yjmsbqmymzl4r7sba6w4a2yld8m6hzafr6jf7sj0syhwpnc3zv6";
|
||||
};
|
||||
|
||||
buildInputs = [ bctoolbox sqlite ];
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, cmake, boost, ffmpeg_3 }:
|
||||
{ stdenv, fetchurl, cmake, boost, ffmpeg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chromaprint";
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ boost ffmpeg_3 ];
|
||||
buildInputs = [ boost ffmpeg ];
|
||||
|
||||
cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ];
|
||||
|
||||
|
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgweather";
|
||||
version = "3.36.0";
|
||||
version = "3.36.1";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0bd30g3facfcgf18y2110xhc7ijly313y49mpwdkvl482z0fxzyj";
|
||||
sha256 = "0l74hc02rvzm4p530y539a67jwb080fqdaazdl8j0fr3xvq0j9yy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libvmaf";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netflix";
|
||||
repo = "vmaf";
|
||||
rev = "v${version}";
|
||||
sha256 = "10fw53k9k4aq4p2qi5qkfjfnhldw4p5bbmxggf8220gfa95nvyl3";
|
||||
sha256 = "18w0z3w90fdbzsqaa4diwvq0xmvg0aiw4hi3aaa4pq0zgnb8g3mk";
|
||||
};
|
||||
|
||||
sourceRoot = "source/libvmaf";
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/Netflix/vmaf";
|
||||
description = "Perceptual video quality assessment based on multi-method fusion (VMAF)";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.asl20;
|
||||
license = licenses.bsd2Patent;
|
||||
maintainers = [ maintainers.cfsmp3 maintainers.marsam ];
|
||||
};
|
||||
|
||||
|
@ -50,6 +50,8 @@ in stdenv.mkDerivation rec {
|
||||
--subst-var-by python ${pythonRuntime}/bin/python \
|
||||
--subst-var-by out $out
|
||||
chmod +x $out/bin/protoc-gen-nanopb
|
||||
|
||||
cp ../pb_common.c ../pb_decode.c ../pb_encode.c $out/include/
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nuspell";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nuspell";
|
||||
repo = "nuspell";
|
||||
rev = "v${version}";
|
||||
sha256 = "18zz3rdzlb3knzsd98vw8cfyb3iq0ilipnlz7rz10zgb5ail73s2";
|
||||
sha256 = "0wbb6dwmzlsyy224y0liis0azgzwbjdvcyzc31pw1aw6vbp36na6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ronn ];
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opendht";
|
||||
version = "2.1.3";
|
||||
version = "2.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savoirfairelinux";
|
||||
repo = "opendht";
|
||||
rev = version;
|
||||
sha256 = "0qz9mdkanz4vd38bdpwvcwvbpzf19i6019rmqw3k1vh5mh22ljhr";
|
||||
sha256 = "1ax26ri1ifb6s8ppd28jmanka9yf8mw3np65q2h4djhhik0phhal";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
@ -2,28 +2,25 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hepmc";
|
||||
version = "2.06.10";
|
||||
version = "2.06.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC-${version}.tar.gz";
|
||||
sha256 = "190i9jlnwz1xpc495y0xc70s4zdqb9s2zdq1zkjy2ivl7ygdvpjs";
|
||||
sha256 = "1pp89bs05nv60wjk1690ndwh4dsd5mk20bzsd4a2lklysdifvb6f";
|
||||
};
|
||||
|
||||
patches = [ ./in_source.patch ];
|
||||
buildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-Dmomentum:STRING=GEV"
|
||||
"-Dlength:STRING=MM"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "The HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
license = licenses.lgpl21;
|
||||
homepage = "http://hepmc.web.cern.ch/hepmc/";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ veprbl ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
};
|
||||
}
|
||||
|
@ -1,25 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -37,21 +37,6 @@ message(STATUS "default momentum and length are ${HEPMC_DEFAULT_MOM_UNIT} ${HEPM
|
||||
# find the HepMC cmake modules
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules ${CMAKE_MODULE_PATH})
|
||||
|
||||
-# make sure we are not building from within the source code directory
|
||||
-string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" in_source)
|
||||
-string( REGEX MATCH "${CMAKE_SOURCE_DIR}/" in_source_subdir
|
||||
-"${CMAKE_BINARY_DIR}")
|
||||
-if (in_source OR in_source_subdir)
|
||||
- message(FATAL_ERROR "
|
||||
-ERROR: In source builds of this project are not allowed.
|
||||
-A separate build directory is required.
|
||||
-Please create one and run cmake from the build directory.
|
||||
-Also note that cmake has just added files to your source code directory.
|
||||
-We suggest getting a new copy of the source code.
|
||||
-Otherwise, delete `CMakeCache.txt' and the directory `CMakeFiles'.
|
||||
- ")
|
||||
-endif ()
|
||||
-
|
||||
# build_docs is OFF (false) by default
|
||||
if ( build_docs )
|
||||
message(STATUS "documents WILL be built and installed" )
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rivet";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
|
||||
sha256 = "1cgr9jyfd9r7dwbk8fr3rys5dc74cmbx368441jvqngqymmb563w";
|
||||
sha256 = "0yjpx7n6ry3pfgkf7d7v7mcc3yv7681kf8nq2b1fgspl8jbd0hf0";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yoda";
|
||||
version = "1.8.2";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
|
||||
sha256 = "1nqbv334iwdvbsc5bw8g936cxzc1hyzv9r8kjy4v124vrw8qqmc9";
|
||||
sha256 = "12msmjiajvy2xj2m64n2fxblai5xg06a829wi7scsc7nw2jhxpfr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];
|
||||
|
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus
|
||||
{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python3Packages, dbus-glib, dbus
|
||||
, telepathy-farstream, telepathy-glib, fetchpatch }:
|
||||
|
||||
let
|
||||
inherit (python2Packages) python dbus-python;
|
||||
inherit (python3Packages) python dbus-python;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "telepathy-qt-0.9.7";
|
||||
name = "telepathy-qt-0.9.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
|
||||
sha256 = "0krxd4hhfx6r0ja19wh3848j7gn1rv8jrnakgmkbmi7bww5x7fi1";
|
||||
sha256 = "bf8e2a09060addb80475a4938105b9b41d9e6837999b7a00e5351783857e18ad";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig python ];
|
||||
@ -16,14 +16,6 @@ in stdenv.mkDerivation rec {
|
||||
buildInputs = [ dbus-glib ];
|
||||
checkInputs = [ dbus.daemon dbus-python ];
|
||||
|
||||
patches = [
|
||||
# https://github.com/TelepathyIM/telepathy-qt/issues/25
|
||||
(fetchpatch {
|
||||
url = "https://github.com/TelepathyIM/telepathy-qt/commit/d654dc70dbec7097e96e6d96ca74ab1b5b00ef8c.patch";
|
||||
sha256 = "1jzd9b9rqh3c8xlq8dr7c0r8aabzf5ywv2gpkk6phh3xwngzrfbh";
|
||||
})
|
||||
];
|
||||
|
||||
# No point in building tests if they are not run
|
||||
# On 0.9.7, they do not even build with QT4
|
||||
cmakeFlags = stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF";
|
||||
|
@ -1,10 +1,12 @@
|
||||
{ stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }:
|
||||
{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, libogg }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "tremor-unstable-2018-03-16";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.xiph.org/tremor.git";
|
||||
src = fetchFromGitLab {
|
||||
owner = "xiph";
|
||||
repo = "tremor";
|
||||
domain = "gitlab.xiph.org";
|
||||
rev = "562307a4a7082e24553f3d2c55dab397a17c4b4f";
|
||||
sha256 = "0m07gq4zfgigsiz8b518xyb19v7qqp76qmp7lb262825vkqzl3zq";
|
||||
};
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xxHash";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cyan4973";
|
||||
repo = "xxHash";
|
||||
rev = "v${version}";
|
||||
sha256 = "0bin0jch6lbzl4f8y052a7azfgq2n7iwqihzgqmcccv5vq4vcx5a";
|
||||
sha256 = "08j7wxshhzpyrnyilfnvhyv5ycm0yv5m7jf6q4kxcd7j4dcbhmpb";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "h3";
|
||||
version = "3.6.3";
|
||||
version = "3.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uber";
|
||||
repo = "h3";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zgq496m2pk2c1l0r1di0p39nxwza00kxzqa971qd4xgbrvd4w55";
|
||||
sha256 = "1a4scs5n9srq6sjkz8d60ffzpc6aadkxmk1i3hdj081j0jzsrpf7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -1,21 +1,23 @@
|
||||
{ lib, fetchurl, buildDunePackage, gettext, fileutils, ounit }:
|
||||
{ lib, fetchurl, buildDunePackage, cppo, gettext, fileutils, ounit }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "gettext";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-v${version}.tbz";
|
||||
sha256 = "0pwy6ym5fd77mdbgyas8x86vbrri9cgk79g8wxdjplhyi7zhh158";
|
||||
sha256 = "19ynsldb21r539fiwz1f43apsdnx7hj2a2d9qr9wg2hva9y2qrwb";
|
||||
};
|
||||
|
||||
buildInputs = [ cppo ];
|
||||
|
||||
propagatedBuildInputs = [ gettext fileutils ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkInputs = lib.optional doCheck ounit;
|
||||
checkInputs = [ ounit ];
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
|
22
pkgs/development/python-modules/btrfs/default.nix
Normal file
22
pkgs/development/python-modules/btrfs/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "btrfs";
|
||||
version = "11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1w92sj47wy53ygz725xr613k32pk5khi0g9lrpp6img871241hrx";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Inspect btrfs filesystems";
|
||||
homepage = "https://github.com/knorrie/python-btrfs";
|
||||
license = licenses.lgpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.evils ];
|
||||
};
|
||||
}
|
@ -4,6 +4,7 @@
|
||||
, pythonOlder
|
||||
, attrs
|
||||
, bitstruct
|
||||
, click
|
||||
, future
|
||||
, pathlib2
|
||||
, typing
|
||||
@ -17,20 +18,21 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "canmatrix";
|
||||
version = "0.8";
|
||||
version = "0.9.1";
|
||||
|
||||
# uses fetchFromGitHub as PyPi release misses test/ dir
|
||||
src = fetchFromGitHub {
|
||||
owner = "ebroecker";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1wzflapyj2j4xsi7d7gfmznmxbgr658n092xyq9nac46rbhpcphg";
|
||||
sha256 = "129lcchq45h8wqjvvn0rwpbmih4m0igass2cx7a21z94li97hcia";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# required
|
||||
attrs
|
||||
bitstruct
|
||||
click
|
||||
future
|
||||
pathlib2
|
||||
# optional
|
||||
@ -41,12 +43,18 @@ buildPythonPackage rec {
|
||||
pyyaml
|
||||
] ++ lib.optional (pythonOlder "3.5") typing;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "version = versioneer.get_version()" "version = \"${version}\""
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
# long_envvar_name_imports requires stable key value pair ordering
|
||||
checkPhase = ''
|
||||
pytest -s src/canmatrix
|
||||
pytest -s src/canmatrix -k 'not long_envvar_name_imports'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -1,33 +1,19 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, nose
|
||||
, can
|
||||
, canmatrix }:
|
||||
|
||||
buildPythonPackage {
|
||||
buildPythonPackage rec {
|
||||
pname = "canopen";
|
||||
version = "0.5.1";
|
||||
version = "1.1.0";
|
||||
|
||||
# use fetchFromGitHub until version containing test/sample.eds
|
||||
# is available on PyPi
|
||||
# https://github.com/christiansandberg/canopen/pull/57
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "christiansandberg";
|
||||
repo = "canopen";
|
||||
rev = "b20575d84c3aef790fe7c38c5fc77601bade0ea4";
|
||||
sha256 = "1qg47qrkyvyxiwi13sickrkk89jp9s91sly2y90bz0jhws2bxh64";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0fqa4p3qg7800fykib1x264gizhhmb6dz2hajgwr0hxf5xa19wdl";
|
||||
};
|
||||
|
||||
#src = fetchPypi {
|
||||
# inherit pname version;
|
||||
# sha256 = "0806cykarpjb9ili3mf82hsd9gdydbks8532nxgz93qzg4zdbv2g";
|
||||
#};
|
||||
|
||||
# test_pdo failure https://github.com/christiansandberg/canopen/issues/58
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs =
|
||||
[ can
|
||||
canmatrix
|
||||
|
68
pkgs/development/python-modules/debugpy/default.nix
Normal file
68
pkgs/development/python-modules/debugpy/default.nix
Normal file
@ -0,0 +1,68 @@
|
||||
{ stdenv, buildPythonPackage, fetchFromGitHub
|
||||
, substituteAll, gdb
|
||||
, colorama, django, flask, gevent, psutil, pytest
|
||||
, pytest-timeout, pytest_xdist, requests
|
||||
, isPy27
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "debugpy";
|
||||
version = "1.0.0b12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Microsoft";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0sz33aq5qldl7kh4qjf5w3d08l9s77ipcj4i9wfklj8f6vf9w1wh";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Hard code GDB path (used to attach to process)
|
||||
(substituteAll {
|
||||
src = ./hardcode-gdb.patch;
|
||||
inherit gdb;
|
||||
})
|
||||
|
||||
# Fix importing debugpy in:
|
||||
# - test_nodebug[module-launch(externalTerminal)]
|
||||
# - test_nodebug[module-launch(integratedTerminal)]
|
||||
#
|
||||
# NOTE: The import failures seen in these tests without the patch
|
||||
# will be seen if a user "installs" debugpy by adding it to PYTHONPATH.
|
||||
# To avoid this issue, debugpy should be installed using python.withPackages:
|
||||
# python.withPackages (ps: with ps; [ debugpy ])
|
||||
./fix-test-pythonpath.patch
|
||||
];
|
||||
|
||||
# Remove pre-compiled "attach" libraries and recompile for host platform
|
||||
# Compile flags taken from linux_and_mac/compile_linux.sh & linux_and_mac/compile_mac.sh
|
||||
preBuild = ''(
|
||||
set -x
|
||||
cd src/debugpy/_vendored/pydevd/pydevd_attach_to_process
|
||||
rm *.so *.dylib *.dll *.exe *.pdb
|
||||
${stdenv.cc}/bin/c++ linux_and_mac/attach.cpp -Ilinux_and_mac -fPIC -nostartfiles ${{
|
||||
"x86_64-linux" = "-shared -m64 -o attach_linux_amd64.so";
|
||||
"i686-linux" = "-shared -m32 -o attach_linux_x86.so";
|
||||
"x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch x86_64 -o attach_x86_64.dylib";
|
||||
"i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch i386 -o attach_x86.dylib";
|
||||
}.${stdenv.hostPlatform.system}}
|
||||
)'';
|
||||
|
||||
checkInputs = [
|
||||
colorama django flask gevent psutil pytest
|
||||
pytest-timeout pytest_xdist requests
|
||||
];
|
||||
|
||||
# Override default arguments in pytest.ini
|
||||
checkPhase = "pytest --timeout 0 -n $NIX_BUILD_CORES"
|
||||
# gevent fails to import zope.interface with Python 2.7
|
||||
+ stdenv.lib.optionalString isPy27 " -k 'not test_gevent'";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An implementation of the Debug Adapter Protocol for Python";
|
||||
homepage = "https://github.com/microsoft/debugpy";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ metadark ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" ];
|
||||
};
|
||||
}
|
@ -0,0 +1,12 @@
|
||||
diff --git a/tests/debug/session.py b/tests/debug/session.py
|
||||
index 2b39106..6d45a10 100644
|
||||
--- a/tests/debug/session.py
|
||||
+++ b/tests/debug/session.py
|
||||
@@ -625,6 +625,7 @@ class Session(object):
|
||||
if "PYTHONPATH" in self.config.env:
|
||||
# If specified, launcher will use it in lieu of PYTHONPATH it inherited
|
||||
# from the adapter when spawning debuggee, so we need to adjust again.
|
||||
+ self.config.env.prepend_to("PYTHONPATH", os.environ["PYTHONPATH"])
|
||||
self.config.env.prepend_to("PYTHONPATH", DEBUGGEE_PYTHONPATH.strpath)
|
||||
return self._request_start("launch")
|
||||
|
13
pkgs/development/python-modules/debugpy/hardcode-gdb.patch
Normal file
13
pkgs/development/python-modules/debugpy/hardcode-gdb.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
|
||||
index 6d031b4..ecf21f2 100644
|
||||
--- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
|
||||
+++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py
|
||||
@@ -293,7 +293,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show
|
||||
is_debug = 0
|
||||
# Note that the space in the beginning of each line in the multi-line is important!
|
||||
cmd = [
|
||||
- 'gdb',
|
||||
+ '@gdb@/bin/gdb',
|
||||
'--nw', # no gui interface
|
||||
'--nh', # no ~/.gdbinit
|
||||
'--nx', # no .gdbinit
|
@ -1,18 +1,18 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, isPy27, requests
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, isPy27, requests, netifaces
|
||||
, pytest, testtools, requests-mock }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "denonavr";
|
||||
version = "0.8.1";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scarface-4711";
|
||||
repo = "denonavr";
|
||||
rev = version;
|
||||
sha256 = "12g9w5674fmyf3f4plbhvpxpyhzw32pzwl0hvwswzrc2823xl6vx";
|
||||
sha256 = "0s8v918n6xn44r2mrq5hqbf0znpz64clq7a1jakkgz9py8bi6vnn";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
propagatedBuildInputs = [ requests netifaces ];
|
||||
|
||||
doCheck = !isPy27;
|
||||
checkInputs = [ pytest testtools requests-mock ];
|
||||
|
20
pkgs/development/python-modules/executing/default.nix
Normal file
20
pkgs/development/python-modules/executing/default.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ lib, buildPythonPackage, fetchzip, pytest, asttokens }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "executing";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/alexmojaki/executing/archive/v${version}.tar.gz";
|
||||
sha256 = "1fqfc26nl703nsx2flzf7x4mgr3rpbd8pnn9c195rca648zhi3nh";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest asttokens ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Get information about what a frame is currently doing, particularly the AST node being executed";
|
||||
homepage = "https://github.com/alexmojaki/executing";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ renatoGarcia ];
|
||||
};
|
||||
}
|
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "FoxDot";
|
||||
version = "0.8.8";
|
||||
version = "0.8.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "06y626kgaz1wn1qajlngihpvd4qz8m6lx6sknmjqhhrznyji58wi";
|
||||
sha256 = "00yqpkv7cxwk301cyiwjzr9yfq8hpnhqyspw3z874ydrl3cmssdb";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ tkinter supercollider ];
|
||||
|
22
pkgs/development/python-modules/icecream/default.nix
Normal file
22
pkgs/development/python-modules/icecream/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ lib, buildPythonPackage, fetchPypi
|
||||
, asttokens, colorama, executing, pygments
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "icecream";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "16kpixl43nrn093cvkmxiq2dzd9xc73zwzkmwp0rs7x01nji8kj3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ asttokens colorama executing pygments ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A little library for sweet and creamy print debugging";
|
||||
homepage = "https://github.com/gruns/icecream";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ renatoGarcia ];
|
||||
};
|
||||
}
|
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jc";
|
||||
version = "1.11.6";
|
||||
version = "1.11.8";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kellyjonbrazil";
|
||||
repo = "jc";
|
||||
rev = "v${version}";
|
||||
sha256 = "0jyygq7zmam7yriiv5j4d6mpjdi2p3p7d53bn3qwfzkh4ifsbfan";
|
||||
sha256 = "0rkckbgm04ql4r48wjgljfiqvsz36n99yqcpcyna8lvlm8h4nmwa";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ];
|
||||
|
@ -20,13 +20,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "matrix-nio";
|
||||
version = "0.12.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "poljar";
|
||||
repo = "matrix-nio";
|
||||
rev = version;
|
||||
sha256 = "1d4jhl2xjjp31yjs4zz2cfkvzbi2vr5bsrp07s6nhyc18azxr7ba";
|
||||
sha256 = "0mgb9m3298jvw3wa051zn7vp1m8qriys3ps0qn3sq54fndljgg5k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -2,6 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, dask
|
||||
, numpy
|
||||
, scipy
|
||||
, numba
|
||||
@ -19,7 +20,7 @@ buildPythonPackage rec {
|
||||
sha256 = "ffbca00a53f938e4f04230f582b210440efb54d74d60af1d1ced3864f61677ac";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
checkInputs = [ pytest dask ];
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
|
121
pkgs/development/python-modules/tokenizers/default.nix
Normal file
121
pkgs/development/python-modules/tokenizers/default.nix
Normal file
@ -0,0 +1,121 @@
|
||||
{ stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, maturin
|
||||
, pipInstallHook
|
||||
, pytest
|
||||
, python
|
||||
, requests
|
||||
}:
|
||||
|
||||
let
|
||||
robertaVocab = fetchurl {
|
||||
url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-vocab.json";
|
||||
sha256 = "0m86wpkfb2gdh9x9i9ng2fvwk1rva4p0s98xw996nrjxs7166zwy";
|
||||
};
|
||||
robertaMerges = fetchurl {
|
||||
url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-merges.txt";
|
||||
sha256 = "1idd4rvkpqqbks51i2vjbd928inw7slij9l4r063w3y5fd3ndq8w";
|
||||
};
|
||||
bertVocab = fetchurl {
|
||||
url = "https://s3.amazonaws.com/models.huggingface.co/bert/bert-base-uncased-vocab.txt";
|
||||
sha256 = "18rq42cmqa8zanydsbzrb34xwy4l6cz1y900r4kls57cbhvyvv07";
|
||||
};
|
||||
openaiVocab = fetchurl {
|
||||
url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-vocab.json";
|
||||
sha256 = "0y40gc9bixj5rxv674br1rxmxkd3ly29p80x1596h8yywwcrpx7x";
|
||||
};
|
||||
openaiMerges = fetchurl {
|
||||
url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-merges.txt";
|
||||
sha256 = "09a754pm4djjglv3x5pkgwd6f79i2rq8ydg0f7c3q1wmwqdbba8f";
|
||||
};
|
||||
in rustPlatform.buildRustPackage rec {
|
||||
pname = "tokenizers";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = "python-v${version}";
|
||||
sha256 = "0f5r1wm5ybyk3jvihj1g98y7ihq0iklg0pwkaa11pk1gv0k869w3";
|
||||
};
|
||||
|
||||
cargoSha256 = "131bvf35q5n65mq6zws1rp5fn2qkfwfg9sbxi5y6if24n8fpdz4m";
|
||||
|
||||
sourceRoot = "source/bindings/python";
|
||||
|
||||
nativeBuildInputs = [
|
||||
maturin
|
||||
pipInstallHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python
|
||||
];
|
||||
|
||||
# tokenizers uses pyo3, which requires Rust nightly.
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
doCheck = false;
|
||||
doInstallCheck = true;
|
||||
|
||||
postUnpack = ''
|
||||
# Add data files for tests, otherwise tests attempt network access.
|
||||
mkdir $sourceRoot/tests/data
|
||||
( cd $sourceRoot/tests/data
|
||||
ln -s ${robertaVocab} roberta-base-vocab.json
|
||||
ln -s ${robertaMerges} roberta-base-merges.txt
|
||||
ln -s ${bertVocab} bert-base-uncased-vocab.txt
|
||||
ln -s ${openaiVocab} openai-gpt-vocab.json
|
||||
ln -s ${openaiMerges} openai-gpt-merges.txt )
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
# pyo3's build check verifies that Rust is a nightly
|
||||
# version. Disable this check.
|
||||
substituteInPlace $NIX_BUILD_TOP/$cargoDepsCopy/pyo3/build.rs \
|
||||
--replace "check_rustc_version()?;" ""
|
||||
|
||||
# Patching the vendored dependency invalidates the file
|
||||
# checksums, so remove them. This should be safe, since
|
||||
# this is just a copy of the vendored dependencies and
|
||||
# the integrity of the vendored dependencies is validated
|
||||
# by cargoSha256.
|
||||
sed -r -i 's|"files":\{[^}]+\}|"files":{}|' \
|
||||
$NIX_BUILD_TOP/$cargoDepsCopy/pyo3/.cargo-checksum.json
|
||||
|
||||
# Maturin uses the crate name as the wheel name.
|
||||
substituteInPlace Cargo.toml \
|
||||
--replace "tokenizers-python" "tokenizers"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
maturin build --release --manylinux off
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
# Put the wheels where the pip install hook can find them.
|
||||
install -Dm644 -t dist target/wheels/*.whl
|
||||
pipInstallPhase
|
||||
'';
|
||||
|
||||
installCheckInputs = [
|
||||
pytest
|
||||
requests
|
||||
];
|
||||
|
||||
installCheckPhase = ''
|
||||
# Append paths, or the binding's tokenizer module will be
|
||||
# used, since the test directories have __init__.py
|
||||
pytest --import-mode=append
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/huggingface/tokenizers";
|
||||
description = "Fast State-of-the-Art Tokenizers optimized for Research and Production";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
};
|
||||
}
|
@ -1,41 +1,81 @@
|
||||
{ buildPythonPackage
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, sacremoses
|
||||
, requests
|
||||
, sentencepiece
|
||||
, boto3
|
||||
, tqdm
|
||||
, filelock
|
||||
, regex
|
||||
, requests
|
||||
, numpy
|
||||
, pytest
|
||||
, sacremoses
|
||||
, sentencepiece
|
||||
, timeout-decorator
|
||||
, tokenizers
|
||||
, tqdm
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "transformers";
|
||||
version = "2.2.1";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1p8p3lhhiyk1xl9gpgq4vbchyz57v3w7hhvsj1r90zs3cckindl8";
|
||||
sha256 = "1l8l82zi021sq5dnzlbjx3wx0n4yy7k96n3m2fr893y9lfkhhd8z";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy sacremoses requests sentencepiece boto3 tqdm regex ];
|
||||
propagatedBuildInputs = [
|
||||
boto3
|
||||
filelock
|
||||
numpy
|
||||
regex
|
||||
requests
|
||||
sacremoses
|
||||
sentencepiece
|
||||
tokenizers
|
||||
tqdm
|
||||
];
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
# pretrained tries to download from s3
|
||||
checkPhase = ''
|
||||
cd transformers # avoid importing local files
|
||||
HOME=$TMPDIR pytest -k 'not pretrained_tokenizers'
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
timeout-decorator
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "tokenizers == 0.8.0-rc4" "tokenizers>=0.8,<0.9"
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export HOME="$TMPDIR"
|
||||
cd tests
|
||||
'';
|
||||
|
||||
# Disable tests that require network access.
|
||||
disabledTests = [
|
||||
"test_all_tokenizers"
|
||||
"test_batch_encoding_is_fast"
|
||||
"test_batch_encoding_pickle"
|
||||
"test_config_from_model_shortcut"
|
||||
"test_config_model_type_from_model_identifier"
|
||||
"test_from_pretrained_use_fast_toggle"
|
||||
"test_hf_api"
|
||||
"test_outputs_can_be_shorter"
|
||||
"test_outputs_not_longer_than_maxlen"
|
||||
"test_pretokenized_tokenizers"
|
||||
"test_tokenizer_equivalence_en_de"
|
||||
"test_tokenizer_from_model_type"
|
||||
"test_tokenizer_from_model_type"
|
||||
"test_tokenizer_from_pretrained"
|
||||
"test_tokenizer_identifier_with_correct_config"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/huggingface/transformers";
|
||||
description = "State-of-the-art Natural Language Processing for TensorFlow 2.0 and PyTorch";
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ pashashocky ];
|
||||
maintainers = with maintainers; [ danieldk pashashocky ];
|
||||
};
|
||||
}
|
||||
|
@ -3,19 +3,18 @@
|
||||
, fetchPypi
|
||||
, cffi
|
||||
, hypothesis
|
||||
, zstd
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zstandard";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e5cbd8b751bd498f275b0582f449f92f14e64f4e03b5bf51c571240d40d43561";
|
||||
sha256 = "0lkn7n3bfp7zip6hkqwkqwc8pxmhhs4rr699k77h51rfln6kjllh";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cffi zstd ];
|
||||
propagatedBuildInputs = [ cffi ];
|
||||
|
||||
checkInputs = [ hypothesis ];
|
||||
|
||||
|
@ -12,12 +12,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hopper";
|
||||
version = "4.5.28";
|
||||
version = "4.5.29";
|
||||
rev = "v${lib.versions.major version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz";
|
||||
sha256 = "0mjpkd5c9igkxp9jg8cvrgrxw9x7ag1p5xivjbzhb3vld6xjm4dh";
|
||||
sha256 = "1v1pff5fiv41khvrnlpdks2vddjnvziyn14qqj6v26snyhwi86zh";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
@ -1,20 +1,21 @@
|
||||
{ stdenv, fetchurl, unzip }:
|
||||
{ stdenv, fetchurl, unzip, makeWrapper, openjdk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pmd";
|
||||
version = "6.17.0";
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
version = "6.25.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
|
||||
sha256 = "0000w28dg5z8gs7cxhx7d0fv10ry0yxamk5my28ncqqsg7a4qy8w";
|
||||
sha256 = "0ykg0wylyfiwjlhkbfjqfam34174paihrw7x1dwfq9anyn5bjf0k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -R {bin,lib} $out
|
||||
wrapProgram $out/bin/run.sh --prefix PATH : ${openjdk.jre}/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bmake";
|
||||
version = "20200606";
|
||||
version = "20200629";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz";
|
||||
sha256 = "00kh1g8z6808ylbfcn9afpb0xmb99k302dfdsmyx1rsn65xs58v7";
|
||||
sha256 = "1cxmsz48ap6gpwx5qkkvvfsiqxc7zpn8gzmhvc1jsfha68195ms5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ getopt ];
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user