Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
commit
9ab61ab8e2
|
|
@ -3429,6 +3429,11 @@
|
|||
github = "pkmx";
|
||||
name = "Chih-Mao Chen";
|
||||
};
|
||||
plchldr = {
|
||||
email = "mail@oddco.de";
|
||||
github = "plchldr";
|
||||
name = "Jonas Beyer";
|
||||
};
|
||||
plcplc = {
|
||||
email = "plcplc@gmail.com";
|
||||
github = "plcplc";
|
||||
|
|
|
|||
|
|
@ -47,7 +47,8 @@ if test -n "$bootable"; then
|
|||
|
||||
isoBootFlags="-eltorito-boot ${bootImage}
|
||||
-eltorito-catalog .boot.cat
|
||||
-no-emul-boot -boot-load-size 4 -boot-info-table"
|
||||
-no-emul-boot -boot-load-size 4 -boot-info-table
|
||||
--sort-weight 1 /isolinux" # Make sure isolinux is near the beginning of the ISO
|
||||
fi
|
||||
|
||||
if test -n "$usbBootable"; then
|
||||
|
|
@ -112,7 +113,7 @@ xorriso="xorriso
|
|||
-r
|
||||
-path-list pathlist
|
||||
--sort-weight 0 /
|
||||
--sort-weight 1 /isolinux" # Make sure isolinux is near the beginning of the ISO
|
||||
"
|
||||
|
||||
$xorriso -output $out/iso/$isoName
|
||||
|
||||
|
|
|
|||
|
|
@ -156,9 +156,23 @@ in rec {
|
|||
test = passMeta (runTests driver);
|
||||
report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; });
|
||||
|
||||
in (if makeCoverageReport then report else test) // {
|
||||
inherit nodes driver test;
|
||||
};
|
||||
nodeNames = builtins.attrNames nodes;
|
||||
invalidNodeNames = lib.filter
|
||||
(node: builtins.match "^[A-z_][A-z0-9_]+$" node == null) nodeNames;
|
||||
|
||||
in
|
||||
if lib.length invalidNodeNames > 0 then
|
||||
throw ''
|
||||
Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!
|
||||
All machines are referenced as perl variables in the testing framework which will break the
|
||||
script when special characters are used.
|
||||
|
||||
Please stick to alphanumeric chars and underscores as separation.
|
||||
''
|
||||
else
|
||||
(if makeCoverageReport then report else test) // {
|
||||
inherit nodes driver test;
|
||||
};
|
||||
|
||||
runInMachine =
|
||||
{ drv
|
||||
|
|
|
|||
25
nixos/modules/config/appstream.nix
Normal file
25
nixos/modules/config/appstream.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
with lib;
|
||||
{
|
||||
options = {
|
||||
appstream.enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to install files to support the
|
||||
<link xlink:href="https://www.freedesktop.org/software/appstream/docs/index.html">AppStream metadata specification</link>.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf config.appstream.enable {
|
||||
environment.pathsToLink = [
|
||||
# per component metadata
|
||||
"/share/metainfo"
|
||||
# legacy path for above
|
||||
"/share/appdata"
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
22
nixos/modules/config/xdg/sounds.nix
Normal file
22
nixos/modules/config/xdg/sounds.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
with lib;
|
||||
{
|
||||
options = {
|
||||
xdg.sounds.enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether to install files to support the
|
||||
<link xlink:href="https://www.freedesktop.org/wiki/Specifications/sound-theme-spec/">XDG Sound Theme specification</link>.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf config.xdg.sounds.enable {
|
||||
environment.pathsToLink = [
|
||||
"/share/sounds"
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
28
nixos/modules/hardware/bladeRF.nix
Normal file
28
nixos/modules/hardware/bladeRF.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.hardware.bladeRF;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
options.hardware.bladeRF = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Enables udev rules for BladeRF devices. By default grants access
|
||||
to users in the "bladerf" group. You may want to install the
|
||||
libbladeRF package.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.udev.packages = [ pkgs.libbladeRF ];
|
||||
users.groups.bladerf = {};
|
||||
};
|
||||
}
|
||||
|
|
@ -50,7 +50,7 @@ let
|
|||
finalCfg = {
|
||||
name = "NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel}";
|
||||
params = "init=${config.system.build.toplevel}/init ${additional} ${toString config.boot.kernelParams}";
|
||||
image = "/boot/bzImage";
|
||||
image = "/boot/${config.system.boot.loader.kernelFile}";
|
||||
initrd = "/boot/initrd";
|
||||
};
|
||||
in
|
||||
|
|
@ -163,7 +163,7 @@ let
|
|||
cp -v ${pkgs.refind}/share/refind/refind_x64.efi $out/EFI/boot/
|
||||
''
|
||||
else
|
||||
"# No refind for ia32"
|
||||
"# No refind for ${targetArch}"
|
||||
;
|
||||
|
||||
grubMenuCfg = ''
|
||||
|
|
@ -222,18 +222,34 @@ let
|
|||
efiDir = pkgs.runCommand "efi-directory" {} ''
|
||||
mkdir -p $out/EFI/boot/
|
||||
|
||||
# ALWAYS required modules.
|
||||
MODULES="fat iso9660 part_gpt part_msdos \
|
||||
normal boot linux configfile loopback chain halt \
|
||||
efifwsetup efi_gop efi_uga \
|
||||
efifwsetup efi_gop \
|
||||
ls search search_label search_fs_uuid search_fs_file \
|
||||
gfxmenu gfxterm gfxterm_background gfxterm_menu test all_video loadenv \
|
||||
exfat ext2 ntfs btrfs hfsplus udf \
|
||||
videoinfo png \
|
||||
echo serial \
|
||||
"
|
||||
|
||||
echo "Building GRUB with modules:"
|
||||
for mod in $MODULES; do
|
||||
echo " - $mod"
|
||||
done
|
||||
|
||||
# Modules that may or may not be available per-platform.
|
||||
echo "Adding additional modules:"
|
||||
for mod in efi_uga; do
|
||||
if [ -f ${pkgs.grub2_efi}/lib/grub/${pkgs.grub2_efi.grubTarget}/$mod.mod ]; then
|
||||
echo " - $mod"
|
||||
MODULES+=" $mod"
|
||||
fi
|
||||
done
|
||||
|
||||
# Make our own efi program, we can't rely on "grub-install" since it seems to
|
||||
# probe for devices, even with --skip-fs-probe.
|
||||
${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/${if targetArch == "x64" then "bootx64" else "bootia32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \
|
||||
${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/boot${targetArch}.efi -p /EFI/boot -O ${pkgs.grub2_efi.grubTarget} \
|
||||
$MODULES
|
||||
cp ${pkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/
|
||||
|
||||
|
|
@ -344,12 +360,19 @@ let
|
|||
${pkgs.dosfstools}/sbin/fsck.vfat -vn "$out"
|
||||
''; # */
|
||||
|
||||
targetArch = if pkgs.stdenv.isi686 then
|
||||
"ia32"
|
||||
else if pkgs.stdenv.isx86_64 then
|
||||
"x64"
|
||||
else
|
||||
throw "Unsupported architecture";
|
||||
# Name used by UEFI for architectures.
|
||||
targetArch =
|
||||
if pkgs.stdenv.isi686 then
|
||||
"ia32"
|
||||
else if pkgs.stdenv.isx86_64 then
|
||||
"x64"
|
||||
else if pkgs.stdenv.isAarch64 then
|
||||
"aa64"
|
||||
else
|
||||
throw "Unsupported architecture";
|
||||
|
||||
# Syslinux (and isolinux) only supports x86-based architectures.
|
||||
canx86BiosBoot = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64;
|
||||
|
||||
in
|
||||
|
||||
|
|
@ -483,9 +506,9 @@ in
|
|||
# here and it causes a cyclic dependency.
|
||||
boot.loader.grub.enable = false;
|
||||
|
||||
# !!! Hack - attributes expected by other modules.
|
||||
system.boot.loader.kernelFile = "bzImage";
|
||||
environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ];
|
||||
environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi ]
|
||||
++ optional canx86BiosBoot pkgs.syslinux
|
||||
;
|
||||
|
||||
# In stage 1 of the boot, mount the CD as the root FS by label so
|
||||
# that we don't need to know its device. We pass the label of the
|
||||
|
|
@ -556,13 +579,7 @@ in
|
|||
# Individual files to be included on the CD, outside of the Nix
|
||||
# store on the CD.
|
||||
isoImage.contents =
|
||||
[ { source = pkgs.substituteAll {
|
||||
name = "isolinux.cfg";
|
||||
src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg;
|
||||
bootRoot = "/boot";
|
||||
};
|
||||
target = "/isolinux/isolinux.cfg";
|
||||
}
|
||||
[
|
||||
{ source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile;
|
||||
target = "/boot/" + config.system.boot.loader.kernelFile;
|
||||
}
|
||||
|
|
@ -572,9 +589,6 @@ in
|
|||
{ source = config.system.build.squashfsStore;
|
||||
target = "/nix-store.squashfs";
|
||||
}
|
||||
{ source = "${pkgs.syslinux}/share/syslinux";
|
||||
target = "/isolinux";
|
||||
}
|
||||
{ source = config.isoImage.efiSplashImage;
|
||||
target = "/EFI/boot/efi-background.png";
|
||||
}
|
||||
|
|
@ -584,6 +598,17 @@ in
|
|||
{ source = pkgs.writeText "version" config.system.nixos.label;
|
||||
target = "/version.txt";
|
||||
}
|
||||
] ++ optionals canx86BiosBoot [
|
||||
{ source = pkgs.substituteAll {
|
||||
name = "isolinux.cfg";
|
||||
src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg;
|
||||
bootRoot = "/boot";
|
||||
};
|
||||
target = "/isolinux/isolinux.cfg";
|
||||
}
|
||||
{ source = "${pkgs.syslinux}/share/syslinux";
|
||||
target = "/isolinux";
|
||||
}
|
||||
] ++ optionals config.isoImage.makeEfiBootable [
|
||||
{ source = efiImg;
|
||||
target = "/boot/efi.img";
|
||||
|
|
@ -591,7 +616,7 @@ in
|
|||
{ source = "${efiDir}/EFI";
|
||||
target = "/EFI";
|
||||
}
|
||||
] ++ optionals config.boot.loader.grub.memtest86.enable [
|
||||
] ++ optionals (config.boot.loader.grub.memtest86.enable && canx86BiosBoot) [
|
||||
{ source = "${pkgs.memtest86plus}/memtest.bin";
|
||||
target = "/boot/memtest.bin";
|
||||
}
|
||||
|
|
@ -606,9 +631,10 @@ in
|
|||
# Create the ISO image.
|
||||
system.build.isoImage = pkgs.callPackage ../../../lib/make-iso9660-image.nix ({
|
||||
inherit (config.isoImage) isoName compressImage volumeID contents;
|
||||
bootable = true;
|
||||
bootable = canx86BiosBoot;
|
||||
bootImage = "/isolinux/isolinux.bin";
|
||||
} // optionalAttrs config.isoImage.makeUsbBootable {
|
||||
syslinux = if canx86BiosBoot then pkgs.syslinux else null;
|
||||
} // optionalAttrs (config.isoImage.makeUsbBootable && canx86BiosBoot) {
|
||||
usbBootable = true;
|
||||
isohybridMbrImage = "${pkgs.syslinux}/share/syslinux/isohdpfx.bin";
|
||||
} // optionalAttrs config.isoImage.makeEfiBootable {
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@
|
|||
./config/xdg/icons.nix
|
||||
./config/xdg/menus.nix
|
||||
./config/xdg/mime.nix
|
||||
./config/appstream.nix
|
||||
./config/xdg/sounds.nix
|
||||
./config/gtk/gtk-icon-cache.nix
|
||||
./config/gnu.nix
|
||||
./config/i18n.nix
|
||||
|
|
@ -34,6 +36,7 @@
|
|||
./config/vpnc.nix
|
||||
./config/zram.nix
|
||||
./hardware/all-firmware.nix
|
||||
./hardware/bladeRF.nix
|
||||
./hardware/brightnessctl.nix
|
||||
./hardware/ckb-next.nix
|
||||
./hardware/cpu/amd-microcode.nix
|
||||
|
|
|
|||
|
|
@ -98,7 +98,12 @@ in
|
|||
if [ "$TERM" != "dumb" -o -n "$INSIDE_EMACS" ]; then
|
||||
PROMPT_COLOR="1;31m"
|
||||
let $UID && PROMPT_COLOR="1;32m"
|
||||
PS1="\n\[\033[$PROMPT_COLOR\][\[\e]0;\u@\h: \w\a\]\u@\h:\w]\$\[\033[0m\] "
|
||||
if [ -n "$INSIDE_EMACS" ]; then
|
||||
# Emacs term mode doesn't support xterm title escape sequence (\e]0;)
|
||||
PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
|
||||
else
|
||||
PS1="\n\[\033[$PROMPT_COLOR\][\[\e]0;\u@\h: \w\a\]\u@\h:\w]\$\[\033[0m\] "
|
||||
fi
|
||||
if test "$TERM" = "xterm"; then
|
||||
PS1="\[\033]2;\h:\u:\w\007\]$PS1"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
configuration format of <literal>oh-my-zsh</literal>.
|
||||
<programlisting>
|
||||
{
|
||||
programs.ohMyZsh = {
|
||||
programs.zsh.ohMyZsh = {
|
||||
enable = true;
|
||||
plugins = [ "git" "python" "man" ];
|
||||
theme = "agnoster";
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
The module can do this as well:
|
||||
<programlisting>
|
||||
{
|
||||
programs.ohMyZsh.custom = "~/path/to/custom/scripts";
|
||||
programs.zsh.ohMyZsh.custom = "~/path/to/custom/scripts";
|
||||
}
|
||||
</programlisting>
|
||||
</para>
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
<programlisting>
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
programs.ohMyZsh.customPkgs = with pkgs; [
|
||||
programs.zsh.ohMyZsh.customPkgs = with pkgs; [
|
||||
pkgs.nix-zsh-completions
|
||||
# and even more...
|
||||
];
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
|
||||
<para>
|
||||
<emphasis>Please keep in mind that this is not compatible with
|
||||
<literal>programs.ohMyZsh.custom</literal> as it requires an immutable store
|
||||
<literal>programs.zsh.ohMyZsh.custom</literal> as it requires an immutable store
|
||||
path while <literal>custom</literal> shall remain mutable! An evaluation
|
||||
failure will be thrown if both <literal>custom</literal> and
|
||||
<literal>customPkgs</literal> are set.</emphasis>
|
||||
|
|
|
|||
|
|
@ -25,9 +25,14 @@ in {
|
|||
type = types.package;
|
||||
default = pkgs.bluez;
|
||||
defaultText = "pkgs.bluez";
|
||||
example = "pkgs.bluez.override { enableMidi = true; }";
|
||||
example = "pkgs.bluezFull";
|
||||
description = ''
|
||||
Which BlueZ package to use.
|
||||
|
||||
<note><para>
|
||||
Use the <literal>pkgs.bluezFull</literal> package to enable all
|
||||
bluez plugins.
|
||||
</para></note>
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -228,6 +228,7 @@ let
|
|||
|
||||
createSSLOptsStr = o: ''
|
||||
ssl = {
|
||||
cafile = "/etc/ssl/certs/ca-bundle.crt";
|
||||
key = "${o.key}";
|
||||
certificate = "${o.cert}";
|
||||
${concatStringsSep "\n" (mapAttrsToList (name: value: "${name} = ${toLua value};") o.extraOptions)}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ in
|
|||
cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {};
|
||||
chromium = (handleTestOn ["x86_64-linux"] ./chromium.nix {}).stable or {};
|
||||
cjdns = handleTest ./cjdns.nix {};
|
||||
clamav = handleTest ./clamav.nix {};
|
||||
cloud-init = handleTest ./cloud-init.nix {};
|
||||
codimd = handleTest ./codimd.nix {};
|
||||
containers-bridge = handleTest ./containers-bridge.nix {};
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
import ./make-test.nix ({ pkgs, ... }: let
|
||||
|
||||
eicarTestFile = pkgs.fetchurl {
|
||||
url = "http://2016.eicar.org/download/eicar.com.txt";
|
||||
sha256 = "03zxa7vap2jkqjif4bzcjp33yrnip5yrz2bisia9wj5npwdh4ni7";
|
||||
};
|
||||
|
||||
clamavMain = builtins.fetchurl "http://database.clamav.net/main.cvd";
|
||||
clamavDaily = builtins.fetchurl "http://database.clamav.net/daily.cvd";
|
||||
clamavBytecode = builtins.fetchurl "http://database.clamav.net/bytecode.cvd";
|
||||
|
||||
in {
|
||||
name = "clamav";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
maintainers = [ fpletz ];
|
||||
};
|
||||
|
||||
nodes.machine = { ... }: {
|
||||
virtualisation.memorySize = 1024;
|
||||
|
||||
services.clamav.daemon.enable = true;
|
||||
systemd.services.clamav-daemon.preStart = ''
|
||||
mkdir -p /var/lib/clamav
|
||||
ln -sf ${clamavMain} /var/lib/clamav/main.cvd
|
||||
ln -sf ${clamavDaily} /var/lib/clamav/daily.cvd
|
||||
ln -sf ${clamavBytecode} /var/lib/clamav/bytecode.cvd
|
||||
'';
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
startAll;
|
||||
$machine->waitForUnit("multi-user.target");
|
||||
$machine->waitForUnit("clamav-daemon.service");
|
||||
$machine->waitForFile("/run/clamav/clamd.ctl");
|
||||
$machine->fail("clamdscan ${eicarTestFile}");
|
||||
'';
|
||||
})
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
let
|
||||
version = "2.2.4";
|
||||
sha256 = "12qcfmc56vnay25nlflgwhm3iwlr7hd286wzzanlsalizaj5s5ja";
|
||||
cargoSha256 = "11cwzqd459ld0apl2wnarfc4nb6j9j0dh26y3smvr0zsxvaz1r53";
|
||||
version = "2.2.5";
|
||||
sha256 = "0q9vgwc0jlja73r4na7yil624iagq1607ac47wh8a7xgfjmjjai1";
|
||||
cargoSha256 = "0ibdmyh1jvfq51vhwn4riyhilqwhf71hjd4vyj525smn95p75b14";
|
||||
in
|
||||
import ./parity.nix { inherit version sha256 cargoSha256; }
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
let
|
||||
version = "2.1.9";
|
||||
sha256 = "1xxpv2cxfcjwxfxkn2732y1wxh9rpiwmlb2ij09cg5nph669hy0v";
|
||||
cargoSha256 = "1v44l90bacw8d3ilnmrc49dxdpyckh7iamylkpa1pc0rrpiv5vy4";
|
||||
version = "2.1.10";
|
||||
sha256 = "1l4yl8i24q8v4hzljzai37f587x8m3cz3byzifhvq3bjky7p8h80";
|
||||
cargoSha256 = "04pni9cmz8nhlqznwafz9d81006808kh24aqnb8rjdcr84d11zis";
|
||||
in
|
||||
import ./parity.nix { inherit version sha256 cargoSha256; }
|
||||
|
|
|
|||
49
pkgs/applications/audio/csound/csound-qt/default.nix
Normal file
49
pkgs/applications/audio/csound/csound-qt/default.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{ stdenv, csound, desktop-file-utils,
|
||||
fetchFromGitHub, python, python-qt, qmake,
|
||||
qtwebengine, rtmidi, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "csound-qt-${version}";
|
||||
version = "0.9.6-beta2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CsoundQt";
|
||||
repo = "CsoundQt";
|
||||
rev = "${version}";
|
||||
sha256 = "12jv7cvns3wj2npha0mvpn88kkkfsxsvhgzs2wrw04kbrvbhbffi";
|
||||
};
|
||||
|
||||
patches = [ ./rtmidipath.patch ];
|
||||
|
||||
nativeBuildInputs = [ qmake qtwebengine ];
|
||||
|
||||
buildInputs = [ csound desktop-file-utils rtmidi unzip ];
|
||||
|
||||
qmakeFlags = [ "qcs.pro" "CONFIG+=rtmidi" "CONFIG+=pythonqt"
|
||||
"CSOUND_INCLUDE_DIR=${csound}/include/csound"
|
||||
"CSOUND_LIBRARY_DIR=${csound}/lib"
|
||||
"RTMIDI_DIR=${rtmidi.src}"
|
||||
"PYTHONQT_SRC_DIR=${python-qt}/lib"
|
||||
"PYTHONQT_LIB_DIR=${python-qt}/lib"
|
||||
"LIBS+=${python-qt}/lib/libPythonQt-Qt5-Python2.7.so"
|
||||
"LIBS+=${python-qt}/lib/libPythonQt_QtAll-Qt5-Python2.7.so"
|
||||
"INCLUDEPATH+=${python-qt}/include/PythonQt"
|
||||
"INCLUDEPATH+=${python}/include/python2.7"
|
||||
"INSTALL_DIR=$(out)"
|
||||
"SHARE_DIR=$(out)/share"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r bin $out
|
||||
make install
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features.";
|
||||
homepage = https://csoundqt.github.io/;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ hlolli ];
|
||||
};
|
||||
}
|
||||
17
pkgs/applications/audio/csound/csound-qt/rtmidipath.patch
Normal file
17
pkgs/applications/audio/csound/csound-qt/rtmidipath.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
diff --git a/src/src.pri b/src/src.pri
|
||||
index e5e0c896..9a9fa513 100644
|
||||
--- a/src/src.pri
|
||||
+++ b/src/src.pri
|
||||
@@ -155,9 +155,9 @@ pythonqt {
|
||||
"src/pyqcsobject.cpp"
|
||||
}
|
||||
rtmidi {
|
||||
- HEADERS += "src/../$${RTMIDI_DIR}/RtMidi.h"
|
||||
- SOURCES += "src/../$${RTMIDI_DIR}/RtMidi.cpp"
|
||||
- INCLUDEPATH += src/../$${RTMIDI_DIR}
|
||||
+ HEADERS += "$${RTMIDI_DIR}/RtMidi.h"
|
||||
+ SOURCES += "$${RTMIDI_DIR}/RtMidi.cpp"
|
||||
+ INCLUDEPATH += $${RTMIDI_DIR}
|
||||
}
|
||||
|
||||
perfThread_build {
|
||||
|
|
@ -14,6 +14,9 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "csound-${version}";
|
||||
# When updating, please check if https://github.com/csound/csound/issues/1078
|
||||
# has been fixed in the new version so we can use the normal fluidsynth
|
||||
# version and remove fluidsynth 1.x from nixpkgs again.
|
||||
version = "6.12.0";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,17 +1,33 @@
|
|||
{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake
|
||||
, alsaLib, glib, libjack2, libsndfile, libpulseaudio
|
||||
, AudioUnit, CoreAudio, CoreMIDI, CoreServices
|
||||
, version ? "2"
|
||||
}:
|
||||
|
||||
let
|
||||
versionMap = {
|
||||
"1" = {
|
||||
fluidsynthVersion = "1.1.11";
|
||||
sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh";
|
||||
};
|
||||
"2" = {
|
||||
fluidsynthVersion = "2.0.1";
|
||||
sha256 = "1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
with versionMap.${version};
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fluidsynth-${version}";
|
||||
version = "2.0.1";
|
||||
name = "fluidsynth-${fluidsynthVersion}";
|
||||
version = fluidsynthVersion;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FluidSynth";
|
||||
repo = "fluidsynth";
|
||||
rev = "v${version}";
|
||||
sha256 = "1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7";
|
||||
rev = "v${fluidsynthVersion}";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "padthv1-${version}";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/padthv1/${name}.tar.gz";
|
||||
sha256 = "157w28wxggqpqkibz716v3r756q2z78g70ipncpalchb9dfr42b6";
|
||||
sha256 = "0k4vlg3clsn2i4k12imvcjiwlp9nx1mikwyrnarg9shxzzdzcf4y";
|
||||
};
|
||||
|
||||
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qsampler-${version}";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qsampler/${name}.tar.gz";
|
||||
sha256 = "0xb0j57k03pkdl7yl5mcv1i21ljnxcq6b9h3zp6mris916lj45zq";
|
||||
sha256 = "02xazvz8iaksglbgq3jhw4fq3f5pdcq9sss79jxs082md0mry17d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "samplv1-${version}";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
|
||||
sha256 = "1yvdr0fvw13lj2r8dppmn0aw83g9f5r1hp5ixvw7cdhrxs7fh4vw";
|
||||
sha256 = "17a61lliplhs14b3x83qz3kv7ww4dn3a02jfdlcx2z903hwn5sld";
|
||||
};
|
||||
|
||||
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
let
|
||||
pname = "sound-juicer";
|
||||
version = "3.16.1";
|
||||
version = "3.24.0";
|
||||
in stdenv.mkDerivation rec{
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0mx6n901vb97hsv0cwaafjffj75s1kcp8jsqay90dy3099849dyz";
|
||||
sha256 = "19qg4xv0f9rkq34lragkmhii1llxsa87llbl28i759b0ks4f6sny";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "synthv1-${version}";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
|
||||
sha256 = "0f58k5n2k667q8wsigg7bzl3lfgaf6jdj98r2a5nvyb18v1wpy2c";
|
||||
sha256 = "18xjj14g8gnnbwyrf39bdxc5aswb620w9i323skdf6rnaq229jyv";
|
||||
};
|
||||
|
||||
buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ least specific (the system profile)"
|
|||
woman-manpath)))
|
||||
|
||||
;;; Make tramp work for remote NixOS machines
|
||||
(eval-after-load 'tramp
|
||||
(eval-after-load 'tramp-sh
|
||||
;; TODO: We should also add the other `NIX_PROFILES' to this path.
|
||||
;; However, these are user-specific, so we would need to discover
|
||||
;; them dynamically after connecting via `tramp'
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "focuswriter-${version}";
|
||||
version = "1.6.16";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
|
||||
sha256 = "1warfv9d485a7ysmjazxw4zvi9l0ih1021s6c5adkc86m88k296m";
|
||||
sha256 = "0321wqhjfs020q113lgh959qq03zfamm72zk22mnqxf3ng3adc3g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig qmake qttools ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "1.33";
|
||||
version = "1.34";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.geany.org/${name}.tar.bz2";
|
||||
sha256 = "66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2";
|
||||
sha256 = "63b93d25d037eaffa77895ae6dd29c91bca570e4053eff5cc8490f87e6021f8e";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool libintl ];
|
||||
|
|
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = https://www.geany.org/;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [];
|
||||
maintainers = with maintainers; [ frlan ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -250,12 +250,12 @@ in
|
|||
|
||||
clion = buildClion rec {
|
||||
name = "clion-${version}";
|
||||
version = "2018.2.6"; /* updated by script */
|
||||
version = "2018.3.1"; /* updated by script */
|
||||
description = "C/C++ IDE. New. Intelligent. Cross-platform";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
|
||||
sha256 = "1mgm3a6ph3j085bidl6vsy85kpscfspzxbzdmh3biklwfv3445rf"; /* updated by script */
|
||||
sha256 = "0wv4hmh71ca9fl4pslf8nn6wppa98sc94272z4nb42jbs6dnb9ji"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-clion";
|
||||
update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
|
||||
|
|
@ -276,12 +276,12 @@ in
|
|||
|
||||
goland = buildGoland rec {
|
||||
name = "goland-${version}";
|
||||
version = "2018.3"; /* updated by script */
|
||||
version = "2018.3.1"; /* updated by script */
|
||||
description = "Up and Coming Go IDE";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/go/${name}.tar.gz";
|
||||
sha256 = "0hd44flxqnnxg390mkf4ppjs2nxv0nwdc7a2i65f69bp5h61x783"; /* updated by script */
|
||||
sha256 = "0z3z9hc7h3n63mfy7c5zh5sz8c0bzgxk79xamw08sxphrsjahasz"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-goland";
|
||||
update-channel = "GoLand Release";
|
||||
|
|
@ -289,12 +289,12 @@ in
|
|||
|
||||
idea-community = buildIdea rec {
|
||||
name = "idea-community-${version}";
|
||||
version = "2018.3"; /* updated by script */
|
||||
version = "2018.3.1"; /* updated by script */
|
||||
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
|
||||
sha256 = "01ccz5ksbv8xh8mnk3zxqpia8zgayy8bcgmbwqibrykz47y6r7yy"; /* updated by script */
|
||||
sha256 = "1zi4aib1h4jfn241gsg83jsqfj99fpbci4pkh8xarap6xrallyiq"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-idea-ce";
|
||||
update-channel = "IntelliJ IDEA Release";
|
||||
|
|
@ -302,12 +302,12 @@ in
|
|||
|
||||
idea-ultimate = buildIdea rec {
|
||||
name = "idea-ultimate-${version}";
|
||||
version = "2018.3"; /* updated by script */
|
||||
version = "2018.3.1"; /* updated by script */
|
||||
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
|
||||
sha256 = "16z0pqmxjn5dl42rbz7mx8gi13xs3220pzkdsdkh1k1ny9caqzvj"; /* updated by script */
|
||||
sha256 = "0x0dplmv37gqdbrwxsx6xaix9dbaa6kqc09ganln5r4nl2bg64i8"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-idea";
|
||||
update-channel = "IntelliJ IDEA Release";
|
||||
|
|
@ -315,12 +315,12 @@ in
|
|||
|
||||
phpstorm = buildPhpStorm rec {
|
||||
name = "phpstorm-${version}";
|
||||
version = "2018.2.5"; /* updated by script */
|
||||
version = "2018.2.6"; /* updated by script */
|
||||
description = "Professional IDE for Web and PHP developers";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
|
||||
sha256 = "0crr3056hlv9x2q1i1n00aavj53xkwkfy4lgyyphk81c0gly4dg1"; /* updated by script */
|
||||
sha256 = "0z627q9mcxlz8a92dndnaz2qa9dkaapimsfqkvc0i8ab88yw75v1"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-phpstorm";
|
||||
update-channel = "PhpStorm 2018.2";
|
||||
|
|
@ -328,12 +328,12 @@ in
|
|||
|
||||
pycharm-community = buildPycharm rec {
|
||||
name = "pycharm-community-${version}";
|
||||
version = "2018.3"; /* updated by script */
|
||||
version = "2018.3.1"; /* updated by script */
|
||||
description = "PyCharm Community Edition";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
||||
sha256 = "0kgrh3w4lpk7qkp5gss24in1nqahdfllvf97qz6r77zn9n5k1wq7"; /* updated by script */
|
||||
sha256 = "02vs8nxxm139jl622nhxs59i9gw9rs5rjymkg8a0ajpybang24jk"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-pycharm-ce";
|
||||
update-channel = "PyCharm Release";
|
||||
|
|
@ -341,12 +341,12 @@ in
|
|||
|
||||
pycharm-professional = buildPycharm rec {
|
||||
name = "pycharm-professional-${version}";
|
||||
version = "2018.3"; /* updated by script */
|
||||
version = "2018.3.1"; /* updated by script */
|
||||
description = "PyCharm Professional Edition";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
||||
sha256 = "0q4scwnqy0h725g9z5hd145c3n10iaj04z790s4lixg1c63h3y8q"; /* updated by script */
|
||||
sha256 = "0g4ag9lid2km69s5g31hhhvz3zjx52wxca1q4qz1h0s9km0ca1sq"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-pycharm";
|
||||
update-channel = "PyCharm Release";
|
||||
|
|
@ -367,12 +367,12 @@ in
|
|||
|
||||
ruby-mine = buildRubyMine rec {
|
||||
name = "ruby-mine-${version}";
|
||||
version = "2018.2.5"; /* updated by script */
|
||||
version = "2018.2.6"; /* updated by script */
|
||||
description = "The Most Intelligent Ruby and Rails IDE";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
|
||||
sha256 = "0b01fnifk5iawyf2zi7r5ffz8dxlh18g2ilrkc5746vmnsp0jxq4"; /* updated by script */
|
||||
sha256 = "0xbmj7d1ccq2qf1jsvch1zxdrypkvzxdfkr431c8fnabh993yxx1"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-rubymine";
|
||||
update-channel = "RubyMine 2018.2";
|
||||
|
|
@ -380,12 +380,12 @@ in
|
|||
|
||||
webstorm = buildWebStorm rec {
|
||||
name = "webstorm-${version}";
|
||||
version = "2018.3"; /* updated by script */
|
||||
version = "2018.3.1"; /* updated by script */
|
||||
description = "Professional IDE for Web and JavaScript development";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
|
||||
sha256 = "0msvgdjbdipc4g8j705d1jya2mjmx4wwhb23nch3znh7grryr75s"; /* updated by script */
|
||||
sha256 = "1l3jy1ifx82gdnvpgz77ycxbwymcwwd830i4mfidkr9gkndlxpsp"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-webstorm";
|
||||
update-channel = "WebStorm Release";
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "neovim-qt-${version}";
|
||||
version = "0.2.10";
|
||||
version = "0.2.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "equalsraf";
|
||||
repo = "neovim-qt";
|
||||
rev = "v${version}";
|
||||
sha256 = "0hq3w9d6qbzf0j7zm3ls0wpvnab64kypb4i0bhmsnk605mvx63r4";
|
||||
sha256 = "0pc1adxc89p2rdvb6nxyqr9sjzqz9zw2dg7a4ardxsl3a8jga1wh";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ let
|
|||
}.${stdenv.hostPlatform.system};
|
||||
|
||||
sha256 = {
|
||||
"i686-linux" = "0bd2jdn67vnbhrsqy54bymz4di3fw3p18ni5j2wikqkl4d9h4jj1";
|
||||
"x86_64-linux" = "1zbnyff0q15xkvkrs14rfgyn6xb9v0xivcnbl8yckl71s45vb2l1";
|
||||
"x86_64-darwin" = "1qgzhpfzcwym1qyzx2v14336l106hzhs7ii84g356vxkm219x7kw";
|
||||
"i686-linux" = "1xadkgqfwsl53blm2f0kdvczwmag47585dswa1hpafzc8i86009b";
|
||||
"x86_64-linux" = "0h77kc6z9c5bkkb8svjxjabnbbv0lb835kzd1c2yypamkhag9j4a";
|
||||
"x86_64-darwin" = "1f8grgav5capd2mm1nx0416na8c6qjh91680cfvf1jh4pjihs6g4";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
|
||||
archive_fmt = if stdenv.hostPlatform.system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
|
@ -31,7 +31,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "vscode-${version}";
|
||||
version = "1.30.0";
|
||||
version = "1.30.1";
|
||||
|
||||
src = fetchurl {
|
||||
name = "VSCode_${version}_${plat}.${archive_fmt}";
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
|
|||
|
||||
ln -sT "${vscode}/share/pixmaps/code.png" "$out/share/pixmaps/code.png"
|
||||
ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop"
|
||||
makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" \
|
||||
--add-flags \
|
||||
"--extensions-dir ${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions"
|
||||
makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${lib.optionalString (vscodeExtensions != []) ''
|
||||
--add-flags "--extensions-dir ${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions"
|
||||
''}
|
||||
''
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "glabels-${version}";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz";
|
||||
sha256 = "04345crf5yrhq6rlrymz630rxnm8yw41vx04hb6xn2nkjn9hf3nl";
|
||||
url = "mirror://gnome/sources/glabels/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ];
|
||||
|
|
@ -25,11 +25,11 @@ stdenv.mkDerivation rec {
|
|||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Create labels and business cards";
|
||||
homepage = http://glabels.org/;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.nico202 ];
|
||||
homepage = https://glabels.org/;
|
||||
license = with licenses; [ gpl3Plus lgpl3Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.nico202 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "graphicsmagick-${version}";
|
||||
version = "1.3.30";
|
||||
version = "1.3.31";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
|
||||
sha256 = "1warar0731xf94r4bn5x1km85rjabl4iq8r0dk3ywmczap3farfr";
|
||||
sha256 = "0y22740f25qxsqqqg26xqlfp920dm57b7hrgaqmx7azksrcvnsq9";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
let
|
||||
pname = "gthumb";
|
||||
version = "3.6.1";
|
||||
version = "3.6.2";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1vj26gw9b5y4bmb2m49wplqg0md568g3gxin500v3slggzhzkaww";
|
||||
sha256 = "0rjb0bsjhn7nyl5jyjgrypvr6qdr9dc2g586j3lzan96a2vnpgy9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ itstool libxml2 intltool pkgconfig bison flex wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ with python3Packages;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "img2pdf";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "071s3gf28nb8ifxkix7dzjny6vib7791mnp0v3f4zagcjcic22a4";
|
||||
sha256 = "07wxgn5khmy94zqqv8l84q9b3yy84ddvwr2f7j4pjycrj2gg7si8";
|
||||
};
|
||||
|
||||
doCheck = false; # needs pdfrw
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
version = "0.12.3";
|
||||
version = "0.13.1";
|
||||
name = "kitty-${version}";
|
||||
format = "other";
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonApplication rec {
|
|||
owner = "kovidgoyal";
|
||||
repo = "kitty";
|
||||
rev = "v${version}";
|
||||
sha256 = "1nhk8pbwr673gw9qjgca4lzjgp8rw7sf99ra4wsh8jplf3kvgq5c";
|
||||
sha256 = "1j24zjasdh48z7majfpqr71n1wn5a9688wsmmqn26v8kfb68pqs4";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notejot";
|
||||
version = "1.4.7";
|
||||
version = "1.5.2";
|
||||
|
||||
name = "${pname}-${version}";
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "lainsce";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0mjig4y2rb6v2dyzya44mfz0dxgp5wnjs3kdavf9ha2jzjjr5xyb";
|
||||
sha256 = "17rqyckq7z5cxj3mbfrar1zzgwbzhrx87ps7mm6bf798hwflm9qk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "osmium-tool-${version}";
|
||||
version = "1.9.1";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmcode";
|
||||
repo = "osmium-tool";
|
||||
rev = "v${version}";
|
||||
sha256 = "1cwabjbrdpqbi2gl7448sgniiwwa73avi9l6pnvh4r0jia2wi5wk";
|
||||
sha256 = "1balhz78nva0agmbp8n9vg8fhmdssnd9fjxj20bpw7b45mxhjc20";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "polar-bookshelf-${version}";
|
||||
version = "1.1.0";
|
||||
version = "1.5.1";
|
||||
|
||||
# fetching a .deb because there's no easy way to package this Electron app
|
||||
src = fetchurl {
|
||||
url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb";
|
||||
sha256 = "13h6c9sqbc7c5p1rc1wm7wza249sh0j04aq67n6gnqg5p22a7pmw";
|
||||
sha256 = "1nnbybrzk1ms83490gbw5gakfim0j2c8gp83d9iaqwl4590qgwlg";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchurl, qt5 }:
|
||||
{ stdenv, fetchzip, qt5 }:
|
||||
|
||||
let
|
||||
version = "1.40.23";
|
||||
version = "1.40.30";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "qtbitcointrader-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
src = fetchzip {
|
||||
url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz";
|
||||
sha256 = "11r2jzb09a62hf9fkg6aw8pg2js8c87k6lba9xz2q8n6d6jv44r1";
|
||||
sha256 = "0xbgdmwb8d3lrddcnx2amfsknd3g408f5gy5mdydcm3vqqfi9a0c";
|
||||
};
|
||||
|
||||
buildInputs = [ qt5.qtbase qt5.qtmultimedia qt5.qtscript ];
|
||||
|
|
@ -25,11 +25,11 @@ stdenv.mkDerivation {
|
|||
runHook postConfigure
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib;
|
||||
{ description = "Bitcoin trading client";
|
||||
homepage = https://centrabit.com/;
|
||||
license = licenses.lgpl3;
|
||||
platforms = qt5.qtbase.meta.platforms;
|
||||
maintainers = [ maintainers.ehmry ];
|
||||
};
|
||||
meta = with stdenv.lib; {
|
||||
description = "Bitcoin trading client";
|
||||
homepage = https://centrabit.com/;
|
||||
license = licenses.gpl3;
|
||||
platforms = qt5.qtbase.meta.platforms;
|
||||
maintainers = [ maintainers.ehmry ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
} :
|
||||
|
||||
let
|
||||
version = "0.3.5";
|
||||
version = "0.4.0";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "soapybladerf-${version}";
|
||||
|
|
@ -12,7 +12,7 @@ in stdenv.mkDerivation {
|
|||
owner = "pothosware";
|
||||
repo = "SoapyBladeRF";
|
||||
rev = "soapy-bladerf-${version}";
|
||||
sha256 = "1n7vy6y8k1smq3l729npxbhxbnrc79gz06dxkibsihz4k8sddkrg";
|
||||
sha256 = "1gf1azfydw033nlg2bgs9cbsbp9npjdrgjwlsffn0d9x0qbgxjqp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
name = "wego-${version}";
|
||||
version = "20160407-${stdenv.lib.strings.substring 0 7 rev}";
|
||||
rev = "81d72ffd761f032fbd73dba4f94bd94c8c2d53d5";
|
||||
version = "20170403-${stdenv.lib.strings.substring 0 7 rev}";
|
||||
rev = "415efdfab5d5ee68300bf261a0c6f630c6c2584c";
|
||||
|
||||
goPackagePath = "github.com/schachmat/wego";
|
||||
|
||||
src = fetchgit {
|
||||
inherit rev;
|
||||
url = "https://github.com/schachmat/wego";
|
||||
sha256 = "14p3hvv82bsxqnbnzz8hjv75i39kzg154a132n6cdxx3vgw76gck";
|
||||
sha256 = "0w8sypwg0s2mvhk9cdibqr8bz5ipiiacs60a39sdswrpc4z486hg";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
|
|
|||
21
pkgs/applications/misc/wego/deps.nix
generated
21
pkgs/applications/misc/wego/deps.nix
generated
|
|
@ -1,11 +1,20 @@
|
|||
[
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-isatty";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-isatty";
|
||||
rev = "v0.0.4";
|
||||
sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-runewidth";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-runewidth";
|
||||
rev = "d6bea18f789704b5f83375793155289da36a3c7f";
|
||||
sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs";
|
||||
rev = "v0.0.4";
|
||||
sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -13,8 +22,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-colorable";
|
||||
rev = "3dac7b4f76f6e17fb39b768b89e3783d16e237fe";
|
||||
sha256 = "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6";
|
||||
rev = "v0.0.9";
|
||||
sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -22,8 +31,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/schachmat/ingo";
|
||||
rev = "fab41e4e62cbef5d92998746ec25f7e195100f38";
|
||||
sha256 = "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb";
|
||||
rev = "a4bdc0729a3fda62cc4069b6e490fc657fd54e33";
|
||||
sha256 = "1gw0kddy7jh3467imsqni86cf9yq7k6vpfc0ywkbwj0zsjsdgd49";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,44 +1,46 @@
|
|||
{ stdenv, lib, fetchurl,
|
||||
dpkg,
|
||||
alsaLib,
|
||||
at-spi2-atk,
|
||||
atk,
|
||||
cairo,
|
||||
cups,
|
||||
dbus,
|
||||
expat,
|
||||
fontconfig,
|
||||
freetype,
|
||||
gdk_pixbuf,
|
||||
glib,
|
||||
gnome2,
|
||||
gnome3,
|
||||
gtk3,
|
||||
libuuid,
|
||||
libX11,
|
||||
libXcomposite,
|
||||
libXcursor,
|
||||
libXdamage,
|
||||
libXext,
|
||||
libXfixes,
|
||||
libXi,
|
||||
libXrandr,
|
||||
libXrender,
|
||||
libXScrnSaver,
|
||||
libXtst,
|
||||
nspr,
|
||||
nss,
|
||||
pango,
|
||||
udev,
|
||||
xorg,
|
||||
zlib,
|
||||
xdg_utils,
|
||||
wrapGAppsHook
|
||||
{ stdenv, lib, fetchurl
|
||||
, dpkg
|
||||
, alsaLib
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
, atk
|
||||
, cairo
|
||||
, cups
|
||||
, dbus
|
||||
, expat
|
||||
, fontconfig
|
||||
, freetype
|
||||
, gdk_pixbuf
|
||||
, glib
|
||||
, gnome2
|
||||
, gnome3
|
||||
, gtk3
|
||||
, libuuid
|
||||
, libX11
|
||||
, libXcomposite
|
||||
, libXcursor
|
||||
, libXdamage
|
||||
, libXext
|
||||
, libXfixes
|
||||
, libXi
|
||||
, libXrandr
|
||||
, libXrender
|
||||
, libXScrnSaver
|
||||
, libXtst
|
||||
, nspr
|
||||
, nss
|
||||
, pango
|
||||
, udev
|
||||
, xorg
|
||||
, zlib
|
||||
, xdg_utils
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
let rpath = lib.makeLibraryPath [
|
||||
alsaLib
|
||||
at-spi2-atk
|
||||
at-spi2-core
|
||||
atk
|
||||
cairo
|
||||
cups
|
||||
|
|
@ -50,8 +52,8 @@ let rpath = lib.makeLibraryPath [
|
|||
glib
|
||||
gnome2.GConf
|
||||
gtk3
|
||||
libuuid
|
||||
libX11
|
||||
libXScrnSaver
|
||||
libXcomposite
|
||||
libXcursor
|
||||
libXdamage
|
||||
|
|
@ -60,25 +62,25 @@ let rpath = lib.makeLibraryPath [
|
|||
libXi
|
||||
libXrandr
|
||||
libXrender
|
||||
libXScrnSaver
|
||||
libXtst
|
||||
libuuid
|
||||
nspr
|
||||
nss
|
||||
pango
|
||||
udev
|
||||
xdg_utils
|
||||
xorg.libxcb
|
||||
zlib
|
||||
xdg_utils
|
||||
];
|
||||
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "0.56.15";
|
||||
version = "0.57.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "1d18fgnxcgl95bhkgfqjyv4p81q6fciqibd3ss4vwh1ljjy1fv76";
|
||||
sha256 = "0p5j3kkkalnyi6brgd9vfv43is00g2b6p1y3hajjr2vbm9iwpzg7";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_10, go-bindata, makeWrapper, rsync
|
||||
{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync
|
||||
, components ? [
|
||||
"cmd/kubeadm"
|
||||
"cmd/kubectl"
|
||||
|
|
@ -15,16 +15,16 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kubernetes-${version}";
|
||||
version = "1.12.3";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
sha256 = "0y227qzv7hsibf0sil5ylfdvkfsd43qlsyprc1dwgbj8igjl6q2d";
|
||||
sha256 = "048ckirz7v1djari6l9ddkcd9i4yafcv57wk131dv0cs2zady9va";
|
||||
};
|
||||
|
||||
buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata ];
|
||||
buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
|
||||
|
||||
outputs = ["out" "man" "pause"];
|
||||
|
||||
|
|
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
preFixup = ''
|
||||
find $out/bin $pause/bin -type f -exec remove-references-to -t ${go_1_10} '{}' +
|
||||
find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' +
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
|
|||
sed -i 's/<2.2.0//' setup.py
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ];
|
||||
propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon boto3 ];
|
||||
|
||||
# Requires tox, hadoop, and google cloud
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -39,15 +39,15 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-aws";
|
||||
version = "1.51.0";
|
||||
sha256 = "1hx4zbmwcbaslq2pj01m3y8b44gipw9gg235jsv7454nrd3jhvhg";
|
||||
version = "1.52.0";
|
||||
sha256 = "037n26spp49r4b4f6cyv6d3sgqw2d80g97fqgz1j0hcwi0am56h1";
|
||||
};
|
||||
azurerm =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-azurerm";
|
||||
version = "1.19.0";
|
||||
sha256 = "1b07g90vmdvlfyz2q40sjd14xnbjyf9c7hgg7rzyhnkfi7imjbbf";
|
||||
version = "1.20.0";
|
||||
sha256 = "0hfq5gk4bhmw65x1rsdpwv0massgr1sczvcbyh572qlkkhvm59xd";
|
||||
};
|
||||
azurestack =
|
||||
{
|
||||
|
|
@ -144,8 +144,8 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-digitalocean";
|
||||
version = "1.0.2";
|
||||
sha256 = "0ilkdnadzsidq8hia5wk4jyk6034pmajrpkgwf4ryz7kx41vy2g6";
|
||||
version = "1.1.0";
|
||||
sha256 = "1w5xslm8939rz13bsiv9hfcl8cyvi03gr0h24c0ybwj8alxmxhb4";
|
||||
};
|
||||
dme =
|
||||
{
|
||||
|
|
@ -221,8 +221,8 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-google";
|
||||
version = "1.19.1";
|
||||
sha256 = "1n2a1y9103xkndmvr5cvj7i1m8s9lv61vgijgk3m2f73pb4znak0";
|
||||
version = "1.20.0";
|
||||
sha256 = "1brkq4iz140miai6gzvzxfl28qi4j8gcc22igd7cb4qzafnlbxaj";
|
||||
};
|
||||
grafana =
|
||||
{
|
||||
|
|
@ -242,15 +242,15 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-helm";
|
||||
version = "0.6.2";
|
||||
sha256 = "11j4lpzbrdszgkjf1gjyibh9c5w0fly01qdkrflv98ry5csx9q5b";
|
||||
version = "0.7.0";
|
||||
sha256 = "172l5cpl6vfdz75s3s60iqcavi5m66gwbrm7aw47hby8lv5ivflc";
|
||||
};
|
||||
heroku =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-heroku";
|
||||
version = "1.6.0";
|
||||
sha256 = "0byz9prx2x3nz9dl65mjnp0f33in62am35kcsza3538jcvymkhk2";
|
||||
version = "1.7.0";
|
||||
sha256 = "0zk5w4xwbg631m7592gfmdbsmrr0r7vla5nd1p5frh6szg6psy6m";
|
||||
};
|
||||
http =
|
||||
{
|
||||
|
|
@ -396,8 +396,8 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-oci";
|
||||
version = "3.9.0";
|
||||
sha256 = "1mm6q9crn2izx1il6fk3mhi9is1zrrsy7rnldcj05bzyywnq3r97";
|
||||
version = "3.10.0";
|
||||
sha256 = "0dhz3y62dp66jkn0q4x7v2cnqw8kiq34sgyfx8mw706hg9sdqb0l";
|
||||
};
|
||||
oneandone =
|
||||
{
|
||||
|
|
@ -410,8 +410,8 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-opc";
|
||||
version = "1.3.0";
|
||||
sha256 = "1ksqjfp6gxgrpc9gcs9jv3wj5058z93h7prv4mhvc2bilal4gc0p";
|
||||
version = "1.3.1";
|
||||
sha256 = "0rpkhaja6vq1y1xah136vjlp1d5v9adymq300ajssbjkqf93wzs6";
|
||||
};
|
||||
openstack =
|
||||
{
|
||||
|
|
@ -424,8 +424,8 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-opentelekomcloud";
|
||||
version = "1.3.0";
|
||||
sha256 = "07rmav271wgjp1sby88s2ghh8w5hnkdy6rsc8pj69zy332i7n6wk";
|
||||
version = "1.4.0";
|
||||
sha256 = "0dv756npyhadzr08zlv28ghazaj1fdp3avcld7y6ri99hamncm95";
|
||||
};
|
||||
opsgenie =
|
||||
{
|
||||
|
|
@ -438,8 +438,8 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-oraclepaas";
|
||||
version = "1.3.2";
|
||||
sha256 = "138522cidaiy2akqqblik3w6qnx8zgn70ih7am1sxn13vqm1vlhb";
|
||||
version = "1.4.0";
|
||||
sha256 = "1hhkijxnwmm21b0w9qc3lk5vfcg0ac0sg7v4g0ffjqv68mssrz6x";
|
||||
};
|
||||
ovh =
|
||||
{
|
||||
|
|
@ -599,8 +599,8 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-tfe";
|
||||
version = "0.4.0";
|
||||
sha256 = "02qvxc4ljb6s8bkw521wdsxhp53pmk7sbk3dyjbrwpz9xdg8dscn";
|
||||
version = "0.5.0";
|
||||
sha256 = "1acmmsb4nj3l4d7zlzjrh97nhrkgm99wlazjrfavxwly253ck283";
|
||||
};
|
||||
tls =
|
||||
{
|
||||
|
|
@ -627,8 +627,8 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-vault";
|
||||
version = "1.3.1";
|
||||
sha256 = "1rhwq45g6jggmxf953w5lckqzngdr15g5ncwwl2mjhz2xakn44lh";
|
||||
version = "1.4.1";
|
||||
sha256 = "1nkhcgd2y7wyi179l2znjpakmjjcxarwc9j5mb7r191p2m27k27s";
|
||||
};
|
||||
vcd =
|
||||
{
|
||||
|
|
|
|||
|
|
@ -88,8 +88,8 @@ let
|
|||
plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"];
|
||||
in rec {
|
||||
terraform_0_11 = pluggable (generic {
|
||||
version = "0.11.10";
|
||||
sha256 = "08mapla89g106bvqr41zfd7l4ki55by6207qlxq9caiha54nx4nb";
|
||||
version = "0.11.11";
|
||||
sha256 = "1hsi5sibs0fk1620wzzxrc1gqjs6slqrjvlqcgvgg1yl22q9g7f5";
|
||||
patches = [ ./provider-path.patch ];
|
||||
passthru = { inherit plugins; };
|
||||
});
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ let
|
|||
mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
|
||||
stableVersion = {
|
||||
stable = true;
|
||||
version = "1.5.1";
|
||||
sha256Hash = "1y2fhw57g6raiv820sb53hjsqrmm81ij58dxlrv64z7ng0s8cnar";
|
||||
version = "1.5.2";
|
||||
sha256Hash = "0kg1xw1b4zj5a2yf6x5r7wrpl7w0fs52s58w606n9gyx7kdcgkj8";
|
||||
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
|
||||
archPatchesRevision = "415526";
|
||||
archPatchesHash = "1lfzws90ab0vajhm5r64gyyqqc1g6a2ay0a1vkp0ah1iw5jh11ik";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite
|
||||
, inotify-tools, makeWrapper, libgnome-keyring, openssl_1_1, pcre, qtwebengine
|
||||
, inotify-tools, makeWrapper, openssl_1_1, pcre, qtwebengine, libsecret
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
|
||||
|
||||
buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools ];
|
||||
|
||||
|
|
@ -32,7 +32,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postInstall = ''
|
||||
sed -i 's/\(Icon.*\)=nextcloud/\1=Nextcloud/g' \
|
||||
$out/share/applications/nextcloud.desktop
|
||||
$out/share/applications/nextcloud.desktop
|
||||
|
||||
wrapProgram "$out/bin/nextcloud" \
|
||||
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libsecret ]}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
{ lib, nextcloud-client, makeWrapper, symlinkJoin, withGnomeKeyring ? false, libgnome-keyring }:
|
||||
|
||||
if (!withGnomeKeyring) then nextcloud-client else symlinkJoin {
|
||||
name = "${nextcloud-client.name}-with-gnome-keyring";
|
||||
paths = [ nextcloud-client ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postBuild = ''
|
||||
wrapProgram "$out/bin/nextcloud" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libgnome-keyring ]}
|
||||
'';
|
||||
|
||||
inherit (nextcloud-client) meta;
|
||||
}
|
||||
|
|
@ -9,13 +9,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "resilio-sync-${version}";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
|
||||
sha256 = {
|
||||
"x86_64-linux" = "02wbllrj80kqpyywfr05fsqpgwrv2i8smr3gfdpn7ni9b8hkj0ji";
|
||||
"i686-linux" = "02zhh6gfds6miznbx30ghzihhm330mh5xnm42mxj8j29aqlzgd95";
|
||||
"x86_64-linux" = "0vq8jz4v740zz3pvgqfya8mhy35fh49wpn8d08xjrs5062hl1yc2";
|
||||
"i686-linux" = "1gvq29bkdqvbcgnnhl3018h564rswk3r88s33lx5iph1rpxc6v5h";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "star-${version}";
|
||||
version = "2.6.1c";
|
||||
version = "2.6.1d";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "STAR";
|
||||
owner = "alexdobin";
|
||||
rev = version;
|
||||
sha256 = "0macdbxa0v5xplag83fpdhfpyhnqncmi9wf9r92wa7w8zkln12vd";
|
||||
sha256 = "1h0j8qj95a0brv7p3gxmg3z7z6f4670jzjg56kzyc33k8dmzxvli";
|
||||
};
|
||||
|
||||
sourceRoot = "source/source";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtkwave-${version}";
|
||||
version = "3.3.95";
|
||||
version = "3.3.97";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
|
||||
sha256 = "1999wnipah1ncvjzjf95pfdrvgq1kd6hli8xlaj2hfjka8pamfaf";
|
||||
sha256 = "0jy5qk0b0np9xsxgnvv8jjgyw81l170wrm5q04qs48wpw7d0rm3v";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qalculate-gtk-${version}";
|
||||
version = "2.8.1";
|
||||
version = "2.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-gtk";
|
||||
rev = "v${version}";
|
||||
sha256 = "029yq9db2rm4fy83c11aynxjsd6vvi7ffamaf9zvkkamqqj1sjlf";
|
||||
sha256 = "0vdrpnarbwhappwgp38jjndnq30h1lh8hbk75i9rhkb7x4kblqfi";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -122,6 +122,8 @@ let
|
|||
|
||||
hubUnstable = throw "use gitAndTools.hub instead";
|
||||
|
||||
lab = callPackage ./lab { };
|
||||
|
||||
pre-commit = callPackage ./pre-commit { };
|
||||
|
||||
pass-git-helper = python3Packages.callPackage ./pass-git-helper { };
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "lab-${version}";
|
||||
version = "0.14.0";
|
||||
|
||||
goPackagePath = "github.com/zaquestion/lab";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zaquestion";
|
||||
repo = "lab";
|
||||
rev = "v${version}";
|
||||
sha256 = "0dqahzm721kpps4i33qgk78y982n8gj5afpk73qyzbraf5y3cw92";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab";
|
||||
homepage = https://zaquestion.github.io/lab;
|
||||
license = licenses.unlicense;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
327
pkgs/applications/version-management/git-and-tools/lab/deps.nix
generated
Normal file
327
pkgs/applications/version-management/git-and-tools/lab/deps.nix
generated
Normal file
|
|
@ -0,0 +1,327 @@
|
|||
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/avast/retry-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/avast/retry-go";
|
||||
rev = "5469272a8171235352a56af37e5f7facf814423f";
|
||||
sha256 = "0ql8x5c99sh1f4vdd5614zd0bi4z8z19228vm4xkvii11bsj8dx6";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/cpuguy83/go-md2man";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/cpuguy83/go-md2man";
|
||||
rev = "20f5889cbdc3c73dbd2862796665e7c465ade7d1";
|
||||
sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/davecgh/go-spew";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/davecgh/go-spew";
|
||||
rev = "346938d642f2ec3594ed81d874461961cd0faa76";
|
||||
sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/fsnotify/fsnotify";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/fsnotify/fsnotify";
|
||||
rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
|
||||
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gdamore/encoding";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gdamore/encoding";
|
||||
rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9";
|
||||
sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gdamore/tcell";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gdamore/tcell";
|
||||
rev = "2f258105ca8ce35819115b49f5ac58197241653e";
|
||||
sha256 = "1sji4fjd7i70lc6l19zhz718xld96k0h1sb1as1mmrx0iv858xaz";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/golang/protobuf";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/protobuf";
|
||||
rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
|
||||
sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/google/go-querystring";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/google/go-querystring";
|
||||
rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a";
|
||||
sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/hashicorp/hcl";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hashicorp/hcl";
|
||||
rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
|
||||
sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/inconshreveable/mousetrap";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/inconshreveable/mousetrap";
|
||||
rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
|
||||
sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/lucasb-eyer/go-colorful";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/lucasb-eyer/go-colorful";
|
||||
rev = "231272389856c976b7500c4fffcc52ddf06ff4eb";
|
||||
sha256 = "161n224v46mln3swzv0009ffj9fxg2n814l9vqs3zh9dq1dmj0jn";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/lunixbochs/vtclean";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/lunixbochs/vtclean";
|
||||
rev = "2d01aacdc34a083dca635ba869909f5fc0cd4f41";
|
||||
sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/magiconair/properties";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/magiconair/properties";
|
||||
rev = "c3beff4c2358b44d0493c7dda585e7db7ff28ae6";
|
||||
sha256 = "04ccjc9nd1wffvw24ixyfw3v5g48zq7pbq1wz1zg9cyqyxy14qgr";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-runewidth";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-runewidth";
|
||||
rev = "9e777a8366cce605130a531d2cd6363d07ad7317";
|
||||
sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mitchellh/mapstructure";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mitchellh/mapstructure";
|
||||
rev = "00c29f56e2386353d58c599509e8dc3801b0d716";
|
||||
sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pelletier/go-toml";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pelletier/go-toml";
|
||||
rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8";
|
||||
sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pkg/errors";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pkg/errors";
|
||||
rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
|
||||
sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pmezard/go-difflib";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pmezard/go-difflib";
|
||||
rev = "792786c7400a136282c1664665ae0a8db921c6c2";
|
||||
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/rivo/tview";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/rivo/tview";
|
||||
rev = "f855bee0205c35e6a055b86cc341effea0f446ce";
|
||||
sha256 = "0jn9r3gzvm3gr72rb7zz2g8794nnl56l8flqfav00pfk0qiqp8xw";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/russross/blackfriday";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/russross/blackfriday";
|
||||
rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5";
|
||||
sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/afero";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/afero";
|
||||
rev = "63644898a8da0bc22138abf860edaf5277b6102e";
|
||||
sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/cast";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/cast";
|
||||
rev = "8965335b8c7107321228e3e3702cab9832751bac";
|
||||
sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/cobra";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/cobra";
|
||||
rev = "615425954c3b0d9485a7027d4d451fdcdfdee84e";
|
||||
sha256 = "01zsislgc72j86a1zq7xs7xj3lvxjjviz4lgn4144jzgppwanpk6";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/jwalterweatherman";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/jwalterweatherman";
|
||||
rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
|
||||
sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/pflag";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/pflag";
|
||||
rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
|
||||
sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spf13/viper";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spf13/viper";
|
||||
rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4";
|
||||
sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/stretchr/testify";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/stretchr/testify";
|
||||
rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71";
|
||||
sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/tcnksm/go-gitconfig";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/tcnksm/go-gitconfig";
|
||||
rev = "d154598bacbf4501c095a309753c5d4af66caa81";
|
||||
sha256 = "0sz7h383h7ngrqkk35ic37kfvhlk07g4kanps8bnapwczrcm2am9";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/xanzy/go-gitlab";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/xanzy/go-gitlab";
|
||||
rev = "8d21e61ce4a9b9c7fe645e48672872e9fdb71138";
|
||||
sha256 = "1lac57ard1vrd16ri8gfyd0ck8d7xg7zbcjlz90223jp0vc3l8nv";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "e73bf333ef8920dbb52ad18d4bd38ad9d9bc76d7";
|
||||
sha256 = "1amcpva20vff8v0lww655icaaf7388ns8xhm859whn4w4v0vanyg";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/net";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "f4c29de78a2a91c00474a2e689954305c350adf9";
|
||||
sha256 = "02nibjrr1il8sxnr0w1s5fj7gz6ayhg3hsywf948qhc68n5adv8x";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/oauth2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/oauth2";
|
||||
rev = "3d292e4d0cdc3a0113e6d207bb137145ef1de42f";
|
||||
sha256 = "0jvivlvx7snacd6abd1prqxa7h1z6b7s6mqahn8lpqlag3asryrl";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "79b0c6888797020a994db17c8510466c72fe75d9";
|
||||
sha256 = "0aydjw886c4dwcjg7ssb7xp39ag1529nh3ly1la71rqjr94cjnag";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/text";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
|
||||
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "google.golang.org/appengine";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/appengine";
|
||||
rev = "b1f26356af11148e710935ed1ac8a7f5702c7612";
|
||||
sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/yaml.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/go-yaml/yaml";
|
||||
rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
|
||||
sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
let
|
||||
# if you bump version, update pkgs.tortoisehg too or ping maintainer
|
||||
version = "4.8";
|
||||
version = "4.8.1";
|
||||
name = "mercurial-${version}";
|
||||
inherit (python2Packages) docutils hg-git dulwich python;
|
||||
in python2Packages.buildPythonApplication {
|
||||
|
|
@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://mercurial-scm.org/release/${name}.tar.gz";
|
||||
sha256 = "00rzjbf2blxkc0qwd9mdzx5fnzgpp4jxzijq6wgsjgmqscx40sy5";
|
||||
sha256 = "08gsn0s5802bs8ks77xqg7c8dwpbsh8df47kvb1gn14ivrf5z928";
|
||||
};
|
||||
|
||||
inherit python; # pass it so that the same version can be used in hg2git
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "shotcut-${version}";
|
||||
version = "18.10.08";
|
||||
version = "18.11.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mltframework";
|
||||
repo = "shotcut";
|
||||
rev = "v${version}";
|
||||
sha256 = "1s2zic675f7rx61j839fn86bwckb4823j9krv1q7z4hsvbpiyj08";
|
||||
sha256 = "0yhrjqc5cby9vc81z5zh5xg34mvh6q8dd896p2izfcqcdhdz7cs3";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -159,12 +159,8 @@ rec {
|
|||
|
||||
# CPAN mirrors.
|
||||
cpan = [
|
||||
https://ftp.gwdg.de/pub/languages/perl/CPAN/
|
||||
https://download.xs4all.nl/mirror/CPAN/
|
||||
https://cpan.metacpan.org/
|
||||
https://cpan.perl.org/
|
||||
http://ftp.tuwien.ac.at/pub/CPAN/
|
||||
http://ftp.funet.fi/pub/CPAN/
|
||||
http://backpan.perl.org/ # for old releases
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
{stdenv, fetchurl, fontforge, pythonPackages, python}:
|
||||
{ stdenv, fetchFromGitHub, fontforge, pythonPackages, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liberationsansnarrow";
|
||||
version = "1.07.3";
|
||||
name = "${pname}-${version}";
|
||||
pname = "liberation-sans-narrow";
|
||||
version = "1.07.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
|
||||
sha256 = "0qkr7n97jmj4q85jr20nsf6n5b48j118l9hr88vijn22ikad4wsp";
|
||||
src = fetchFromGitHub {
|
||||
owner = "liberationfonts";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1qw554jbdnqkg6pjjl4cqkgsalq3398kzvww2naw30vykcz752bm";
|
||||
};
|
||||
|
||||
buildInputs = [ fontforge pythonPackages.fonttools python ];
|
||||
|
|
@ -16,8 +17,8 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p $out/share/fonts/truetype
|
||||
cp -v $(find . -name '*Narrow*.ttf') $out/share/fonts/truetype
|
||||
|
||||
mkdir -p "$out/doc/${name}"
|
||||
cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
|
||||
mkdir -p "$out/doc/${pname}-${version}"
|
||||
cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${pname}-${version}" || true
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
@ -32,8 +33,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
license = licenses.gpl2;
|
||||
homepage = https://fedorahosted.org/liberation-fonts/;
|
||||
maintainers = [ maintainers.leenaars
|
||||
];
|
||||
homepage = https://github.com/liberationfonts;
|
||||
maintainers = [ maintainers.leenaars ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
{ stdenv, fetchurl, liberationsansnarrow }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.07.3";
|
||||
name = "liberationsansnarrow-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
|
||||
sha256 = "0qkr7n97jmj4q85jr20nsf6n5b48j118l9hr88vijn22ikad4wsp";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/fonts/truetype
|
||||
cp -v $(find . -name '*Narrow*.ttf') $out/share/fonts/truetype
|
||||
|
||||
mkdir -p "$out/doc/${name}"
|
||||
cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
|
||||
'';
|
||||
|
||||
inherit (liberationsansnarrow) meta;
|
||||
}
|
||||
|
|
@ -1,14 +1,18 @@
|
|||
{stdenv, fetchurl, fontforge, python2}:
|
||||
{ stdenv, fetchFromGitHub, fontforge, python3 }:
|
||||
|
||||
let
|
||||
inherit (python2.pkgs) fonttools;
|
||||
inherit (python3.pkgs) fonttools;
|
||||
|
||||
common =
|
||||
{version, url, sha256, nativeBuildInputs, postPatch ? null, outputHash}:
|
||||
{ version, repo, sha256, nativeBuildInputs, postPatch ? null, outputHash }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "liberation-fonts-${version}";
|
||||
src = fetchurl {
|
||||
inherit url sha256;
|
||||
pname = "liberation-fonts";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liberationfonts";
|
||||
rev = version;
|
||||
inherit repo sha256;
|
||||
};
|
||||
|
||||
inherit nativeBuildInputs postPatch;
|
||||
|
|
@ -17,8 +21,8 @@ let
|
|||
mkdir -p $out/share/fonts/truetype
|
||||
cp -v $( find . -name '*.ttf') $out/share/fonts/truetype
|
||||
|
||||
mkdir -p "$out/share/doc/${name}"
|
||||
cp -v AUTHORS ChangeLog COPYING License.txt README "$out/share/doc/${name}" || true
|
||||
mkdir -p "$out/share/doc/${pname}-${version}"
|
||||
cp -v AUTHORS ChangeLog COPYING License.txt README "$out/share/doc/${pname}-${version}" || true
|
||||
'';
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
|
|
@ -40,7 +44,7 @@ let
|
|||
'';
|
||||
|
||||
license = licenses.ofl;
|
||||
homepage = https://pagure.io/liberation-fonts/;
|
||||
homepage = https://github.com/liberationfonts;
|
||||
maintainers = [
|
||||
maintainers.raskin
|
||||
];
|
||||
|
|
@ -49,37 +53,23 @@ let
|
|||
};
|
||||
|
||||
in {
|
||||
liberation_ttf_v1_from_source = common rec {
|
||||
version = "1.07.4";
|
||||
url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz";
|
||||
sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d";
|
||||
liberation_ttf_v1 = common rec {
|
||||
repo = "liberation-1.7-fonts";
|
||||
version = "1.07.5";
|
||||
nativeBuildInputs = [ fontforge ];
|
||||
outputHash = "1q102rmg4004p74f8m4y8a6iklmnva0q39sq260jsq3lhcfypg7p";
|
||||
sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v";
|
||||
outputHash = "16jn17p22z2vip58aza2dfg1ri31ki6z3hsnmidfqfi7v8k83vq4";
|
||||
};
|
||||
liberation_ttf_v1_binary = common rec {
|
||||
version = "1.07.4";
|
||||
url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
|
||||
sha256 = "0p7frz29pmjlk2d0j2zs5kfspygwdnpzxkb2hwzcfhrafjvf59v1";
|
||||
nativeBuildInputs = [ ];
|
||||
outputHash = "12gwb9b4ij9d93ky4c9ykgp03fqr62axy37pds88q7y6zgciwkab";
|
||||
};
|
||||
liberation_ttf_v2_from_source = common rec {
|
||||
version = "2.00.1";
|
||||
url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz";
|
||||
sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs";
|
||||
liberation_ttf_v2 = common rec {
|
||||
repo = "liberation-fonts";
|
||||
version = "2.00.4";
|
||||
nativeBuildInputs = [ fontforge fonttools ];
|
||||
postPatch = ''
|
||||
substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \
|
||||
'font = ttLib.TTFont(fontfile)' \
|
||||
'font = ttLib.TTFont(fontfile, recalcTimestamp=False)'
|
||||
'';
|
||||
outputHash = "0nldgawm0a6lpn86w4w3rzx01ns3ph09ar1knq1g4jkxc8ci5rqn";
|
||||
};
|
||||
liberation_ttf_v2_binary = common rec {
|
||||
version = "2.00.1";
|
||||
url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
|
||||
sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q";
|
||||
nativeBuildInputs = [ ];
|
||||
outputHash = "19jky9li345zsig9pcb0rnlsjqqclh7r60vbi4pwh16f14850gpk";
|
||||
sha256 = "14bn1zlhyr4qaz5z2sx4h115pnbd41ix1vky8fxm2lx76xrjjiaa";
|
||||
outputHash = "14c0c5n4vzd5y0hf9jkh48h12kkd8hlg94npbmv41j449g6wv6vn";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
80
pkgs/data/themes/plata/default.nix
Normal file
80
pkgs/data/themes/plata/default.nix
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel
|
||||
, sassc, inkscape, libxml2, gnome2, gdk_pixbuf, librsvg, gtk-engine-murrine
|
||||
, cinnamonSupport ? true
|
||||
, gnomeFlashbackSupport ? true
|
||||
, gnomeShellSupport ? true
|
||||
, mateSupport ? true
|
||||
, openboxSupport ? true
|
||||
, xfceSupport ? true
|
||||
, gtkNextSupport ? false
|
||||
, plankSupport ? false
|
||||
, telegramSupport ? false
|
||||
, tweetdeckSupport ? false
|
||||
, selectionColor ? null # Primary color for 'selected-items' (Default: #3F51B5 = Indigo500)
|
||||
, accentColor ? null # Secondary color for notifications and OSDs (Default: #7986CB = Indigo300)
|
||||
, suggestionColor ? null # Secondary color for 'suggested' buttons (Default: #673AB7 = DPurple500)
|
||||
, destructionColor ? null # Tertiary color for 'destructive' buttons (Default: #F44336 = Red500)
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "plata-theme-${version}";
|
||||
version = "0.4.9";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "tista500";
|
||||
repo = "plata-theme";
|
||||
rev = version;
|
||||
sha256 = "0kj04nj265rgkbbhzhz9f7q6z5yr1dxmcrnq1b5ldha3xqrq2pv9";
|
||||
};
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkgconfig
|
||||
parallel
|
||||
sassc
|
||||
inkscape
|
||||
libxml2
|
||||
gnome2.glib.dev
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gdk_pixbuf
|
||||
librsvg
|
||||
];
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
configureFlags =
|
||||
let
|
||||
inherit (stdenv.lib) enableFeature optional;
|
||||
withOptional = value: feat: optional (value != null) "--with-${feat}=${value}";
|
||||
in [
|
||||
"--enable-parallel"
|
||||
(enableFeature cinnamonSupport "cinnamon")
|
||||
(enableFeature gnomeFlashbackSupport "flashback")
|
||||
(enableFeature gnomeShellSupport "gnome")
|
||||
(enableFeature mateSupport "mate")
|
||||
(enableFeature openboxSupport "openbox")
|
||||
(enableFeature xfceSupport "xfce")
|
||||
(enableFeature gtkNextSupport "gtk_next")
|
||||
(enableFeature plankSupport "plank")
|
||||
(enableFeature telegramSupport "telegram")
|
||||
(enableFeature tweetdeckSupport "tweetdeck")
|
||||
]
|
||||
++ (withOptional selectionColor "selection_color")
|
||||
++ (withOptional accentColor "accent_color")
|
||||
++ (withOptional suggestionColor "suggestion_color")
|
||||
++ (withOptional destructionColor "destruction_color");
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A Gtk+ theme based on Material Design Refresh";
|
||||
homepage = https://gitlab.com/tista500/plata-theme;
|
||||
license = with licenses; [ gpl2 cc-by-sa-40 ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.tadfisher ];
|
||||
};
|
||||
}
|
||||
|
|
@ -36,7 +36,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
];
|
||||
|
||||
inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
|
||||
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4
|
||||
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
|
||||
easytag meld orca rhythmbox shotwell gnome-usage
|
||||
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib;
|
||||
|
||||
|
|
@ -155,8 +155,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
gsound = callPackage ./core/gsound { };
|
||||
|
||||
gtksourceviewmm = callPackage ./core/gtksourceviewmm { };
|
||||
|
||||
gucharmap = callPackage ./core/gucharmap { };
|
||||
|
||||
gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, cups
|
||||
, fetchurl
|
||||
, gmp, gnutls
|
||||
, libffi
|
||||
, libffi, libbfd
|
||||
, libjpeg, libtiff, libpng, giflib, libungif
|
||||
, libxml2, libxslt, libiconv
|
||||
, libobjc, libgcrypt
|
||||
|
|
@ -24,7 +24,7 @@ gsmakeDerivation {
|
|||
aspell audiofile
|
||||
cups
|
||||
gmp gnutls
|
||||
libffi
|
||||
libffi libbfd
|
||||
libjpeg libtiff libpng giflib libungif
|
||||
libxml2 libxslt libiconv
|
||||
libobjc libgcrypt
|
||||
|
|
|
|||
69
pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
Executable file
69
pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
Executable file
|
|
@ -0,0 +1,69 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell --pure -i python3 -p "python3.withPackages (ps: with ps; [ requests ])"
|
||||
|
||||
import json
|
||||
import re
|
||||
import requests
|
||||
import sys
|
||||
|
||||
releases = ["openjdk11"]
|
||||
oses = ["mac", "linux"]
|
||||
types = ["jre", "jdk"]
|
||||
impls = ["hotspot", "openj9"]
|
||||
|
||||
arch_to_nixos = {
|
||||
"x64": "x86_64",
|
||||
"aarch64": "aarch64",
|
||||
}
|
||||
|
||||
def get_sha256(url):
|
||||
resp = requests.get(url)
|
||||
if resp.status_code != 200:
|
||||
print("error: could not fetch checksum from url {}: code {}".format(url, resp.code), file=sys.stderr)
|
||||
sys.exit(1)
|
||||
return resp.text.strip().split(" ")[0]
|
||||
|
||||
RE_RELEASE_NAME = re.compile(r'[^-]+-([0-9.]+)\+([0-9]+)') # example release name: jdk-11.0.1+13
|
||||
def generate_sources(release, assets):
|
||||
out = {}
|
||||
for asset in assets:
|
||||
if asset["os"] not in oses: continue
|
||||
if asset["binary_type"] not in types: continue
|
||||
if asset["openjdk_impl"] not in impls: continue
|
||||
if asset["heap_size"] != "normal": continue
|
||||
if asset["architecture"] not in arch_to_nixos: continue
|
||||
|
||||
version, build = RE_RELEASE_NAME.match(asset["release_name"]).groups()
|
||||
|
||||
type_map = out.setdefault(asset["os"], {})
|
||||
impl_map = type_map.setdefault(asset["binary_type"], {})
|
||||
arch_map = impl_map.setdefault(asset["openjdk_impl"], {
|
||||
"version": version,
|
||||
"build": build,
|
||||
"packageType": asset["binary_type"],
|
||||
"vmType": asset["openjdk_impl"],
|
||||
})
|
||||
|
||||
if arch_map["version"] != version or arch_map["build"] != build:
|
||||
print("error: architectures have different latest versions ({}+{} vs {}+{})".format(
|
||||
arch_map["version"], arch_map["build"], version, build
|
||||
), file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
arch_map[arch_to_nixos[asset["architecture"]]] = {
|
||||
"url": asset["binary_link"],
|
||||
"sha256": get_sha256(asset["checksum_link"]),
|
||||
}
|
||||
|
||||
return out
|
||||
|
||||
out = {}
|
||||
for release in releases:
|
||||
resp = requests.get("https://api.adoptopenjdk.net/v2/latestAssets/releases/" + release)
|
||||
if resp.status_code != 200:
|
||||
print("error: could not fetch data for release {} (code {})".format(release, resp.code), file=sys.stderr)
|
||||
sys.exit(1)
|
||||
out[release] = generate_sources(release, resp.json())
|
||||
|
||||
with open("sources.json", "w") as f:
|
||||
json.dump(out, f, indent=2, sort_keys=True)
|
||||
|
|
@ -1,7 +1,4 @@
|
|||
{ name
|
||||
, url
|
||||
, sha256
|
||||
}:
|
||||
sourcePerArch:
|
||||
|
||||
{ swingSupport ? true # not used for now
|
||||
, stdenv
|
||||
|
|
@ -9,10 +6,12 @@
|
|||
}:
|
||||
|
||||
let result = stdenv.mkDerivation rec {
|
||||
inherit name;
|
||||
name = if sourcePerArch.packageType == "jdk"
|
||||
then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"
|
||||
else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}";
|
||||
|
||||
src = fetchurl {
|
||||
inherit url sha256;
|
||||
inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256;
|
||||
};
|
||||
|
||||
# See: https://github.com/NixOS/patchelf/issues/10
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
{ name
|
||||
, url
|
||||
, sha256
|
||||
}:
|
||||
sourcePerArch:
|
||||
|
||||
{ swingSupport ? true
|
||||
, stdenv
|
||||
|
|
@ -48,10 +45,12 @@ let
|
|||
in
|
||||
|
||||
let result = stdenv.mkDerivation rec {
|
||||
inherit name;
|
||||
name = if sourcePerArch.packageType == "jdk"
|
||||
then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"
|
||||
else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}";
|
||||
|
||||
src = fetchurl {
|
||||
inherit url sha256;
|
||||
inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ file ];
|
||||
|
|
@ -112,7 +111,7 @@ let result = stdenv.mkDerivation rec {
|
|||
meta = with stdenv.lib; {
|
||||
license = licenses.gpl2Classpath;
|
||||
description = "AdoptOpenJDK, prebuilt OpenJDK binary";
|
||||
platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
|
||||
platforms = stdenv.lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
|
||||
maintainers = with stdenv.lib.maintainers; [ taku0 ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,43 +1,9 @@
|
|||
let
|
||||
makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-darwin-base.nix {
|
||||
name = if packageType == "jdk"
|
||||
then
|
||||
"adoptopenjdk-${vmType}-bin-${version}"
|
||||
else
|
||||
"adoptopenjdk-${packageType}-${vmType}-bin-${version}";
|
||||
|
||||
url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_mac_${vmType}_${version}_${buildNumber}.tar.gz";
|
||||
|
||||
inherit sha256;
|
||||
};
|
||||
sources = builtins.fromJSON (builtins.readFile ./sources.json);
|
||||
in
|
||||
{
|
||||
jdk-hotspot = makePackage {
|
||||
version = "11";
|
||||
buildNumber = "28";
|
||||
packageType = "jdk";
|
||||
vmType = "hotspot";
|
||||
sha256 = "ca0ec49548c626904061b491cae0a29b9b4b00fb34d8973dc217e10ab21fb0f3";
|
||||
};
|
||||
jre-hotspot = makePackage {
|
||||
version = "11";
|
||||
buildNumber = "28";
|
||||
packageType = "jre";
|
||||
vmType = "hotspot";
|
||||
sha256 = "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c";
|
||||
};
|
||||
jdk-openj9 = makePackage {
|
||||
version = "11.0.1";
|
||||
buildNumber = "13";
|
||||
packageType = "jdk";
|
||||
vmType = "openj9";
|
||||
sha256 = "c5e9b588b4ac5b0bd5b4edd69d59265d1199bb98af7ca3270e119b264ffb6e3f";
|
||||
};
|
||||
jre-openj9 = makePackage {
|
||||
version = "11.0.1";
|
||||
buildNumber = "13";
|
||||
packageType = "jre";
|
||||
vmType = "openj9";
|
||||
sha256 = "0901dc5946fdf967f92f7b719ddfffdcdde5bd3fef86a83d7a3f2f39ddbef1f8";
|
||||
};
|
||||
jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot;
|
||||
jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot;
|
||||
jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9;
|
||||
jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,43 +1,9 @@
|
|||
let
|
||||
makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-linux-base.nix {
|
||||
name = if packageType == "jdk"
|
||||
then
|
||||
"adoptopenjdk-${vmType}-bin-${version}"
|
||||
else
|
||||
"adoptopenjdk-${packageType}-${vmType}-bin-${version}";
|
||||
|
||||
url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_linux_${vmType}_${version}_${buildNumber}.tar.gz";
|
||||
|
||||
inherit sha256;
|
||||
};
|
||||
sources = builtins.fromJSON (builtins.readFile ./sources.json);
|
||||
in
|
||||
{
|
||||
jdk-hotspot = makePackage {
|
||||
version = "11";
|
||||
buildNumber = "28";
|
||||
packageType = "jdk";
|
||||
vmType = "hotspot";
|
||||
sha256 = "e1e18fc9ce2917473da3e0acb5a771bc651f600c0195a3cb40ef6f22f21660af";
|
||||
};
|
||||
jre-hotspot = makePackage {
|
||||
version = "11";
|
||||
buildNumber = "28";
|
||||
packageType = "jre";
|
||||
vmType = "hotspot";
|
||||
sha256 = "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c";
|
||||
};
|
||||
jdk-openj9 = makePackage {
|
||||
version = "11.0.1";
|
||||
buildNumber = "13";
|
||||
packageType = "jdk";
|
||||
vmType = "openj9";
|
||||
sha256 = "765947ab9457a29d2aa9d11460a4849611343c1e0ea3b33b9c08409cd4672251";
|
||||
};
|
||||
jre-openj9 = makePackage {
|
||||
version = "11.0.1";
|
||||
buildNumber = "13";
|
||||
packageType = "jre";
|
||||
vmType = "openj9";
|
||||
sha256 = "a016413fd8415429b42e543fed7a1bee5010b1dbaf71d29a26e1c699f334c6ff";
|
||||
};
|
||||
jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.hotspot;
|
||||
jre-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.hotspot;
|
||||
jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.openj9;
|
||||
jre-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.openj9;
|
||||
}
|
||||
|
|
|
|||
94
pkgs/development/compilers/adoptopenjdk-bin/sources.json
Normal file
94
pkgs/development/compilers/adoptopenjdk-bin/sources.json
Normal file
|
|
@ -0,0 +1,94 @@
|
|||
{
|
||||
"openjdk11": {
|
||||
"linux": {
|
||||
"jdk": {
|
||||
"hotspot": {
|
||||
"aarch64": {
|
||||
"sha256": "b66121b9a0c2e7176373e670a499b9d55344bcb326f67140ad6d0dc24d13d3e2",
|
||||
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz"
|
||||
},
|
||||
"build": "13",
|
||||
"packageType": "jdk",
|
||||
"version": "11.0.1",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"sha256": "22bd2f1a2e0cb6e4075967bfeda4a960b0325879305aa739a0ba2d6e5cd4c3e2",
|
||||
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz"
|
||||
}
|
||||
},
|
||||
"openj9": {
|
||||
"build": "13",
|
||||
"packageType": "jdk",
|
||||
"version": "11.0.1",
|
||||
"vmType": "openj9",
|
||||
"x86_64": {
|
||||
"sha256": "ef9bf07cba79082285a9d426ea4eb3e8df57561ce2afe07cc5f299a8fa203279",
|
||||
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
"jre": {
|
||||
"hotspot": {
|
||||
"aarch64": {
|
||||
"sha256": "6fd756bda392e3fddb48382460daae263c6fb5708683a691c8d30af2eb870bb8",
|
||||
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_aarch64_linux_hotspot_11_28.tar.gz"
|
||||
},
|
||||
"build": "28",
|
||||
"packageType": "jre",
|
||||
"version": "11",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"sha256": "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c",
|
||||
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_hotspot_11_28.tar.gz"
|
||||
}
|
||||
},
|
||||
"openj9": {
|
||||
"build": "28",
|
||||
"packageType": "jre",
|
||||
"version": "11",
|
||||
"vmType": "openj9",
|
||||
"x86_64": {
|
||||
"sha256": "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42",
|
||||
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_openj9_11_28.tar.gz"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"mac": {
|
||||
"jdk": {
|
||||
"hotspot": {
|
||||
"build": "13",
|
||||
"packageType": "jdk",
|
||||
"version": "11.0.1",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"sha256": "e219e7e2d586ed09ae65f4ec390fca5d5f0c37a61b47677648610194daf1aaa7",
|
||||
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz"
|
||||
}
|
||||
},
|
||||
"openj9": {
|
||||
"build": "13",
|
||||
"packageType": "jdk",
|
||||
"version": "11.0.1",
|
||||
"vmType": "openj9",
|
||||
"x86_64": {
|
||||
"sha256": "c9a816d6a3f8aac9dc5b3b41c5a9e4e5460af433a06e003ae25d5a06dea8375f",
|
||||
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_openj9_macosXL-jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
"jre": {
|
||||
"hotspot": {
|
||||
"build": "28",
|
||||
"packageType": "jre",
|
||||
"version": "11",
|
||||
"vmType": "hotspot",
|
||||
"x86_64": {
|
||||
"sha256": "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c",
|
||||
"url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_mac_hotspot_11_28.tar.gz"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "clean-2.4";
|
||||
name = "clean-3.0";
|
||||
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "i686-linux" then (fetchurl {
|
||||
url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_boot.tar.gz";
|
||||
sha256 = "1w8vvmkwzq8g51639r62apcy75sj69nm08082a34xvqm9ymfgkq5";
|
||||
url = "https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_32_boot.tar.gz";
|
||||
sha256 = "0cjxv3vqrg6pz3aicwfdz1zyhk0q650464j3qyl0wzaikh750010";
|
||||
})
|
||||
else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl {
|
||||
url = "https://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz";
|
||||
sha256 = "08gsa1pjl5wyzh4ah8ccfx8a7mdcn6ycsn1lzkrr9adygv1gmm7r";
|
||||
url = "https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_64_boot.tar.gz";
|
||||
sha256 = "06k283y9adbi28f78k3m5ssg6py73qqkz3sm8dgxc89drv4krl2i";
|
||||
})
|
||||
else throw "Architecture not supported";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
|
||||
|
||||
let
|
||||
version = "1.3.10";
|
||||
version = "1.3.11";
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
name = "kotlin-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
|
||||
sha256 = "0zf6p0pzdi6dz2d4dca364wf30zyq326xdfg97zk8kp1a4qwjyfa";
|
||||
sha256 = "02d4x65z6kp20hmf5ri56zmq4rq45yc9br0awqrn9ls99cd0zph3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ] ;
|
||||
|
|
|
|||
|
|
@ -24,11 +24,13 @@ let
|
|||
name = "ocaml${optionalString flambdaSupport "+flambda"}-${version}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (args // rec {
|
||||
|
||||
let
|
||||
x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; };
|
||||
x11lib = x11env + "/lib";
|
||||
x11inc = x11env + "/include";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (args // rec {
|
||||
|
||||
inherit name;
|
||||
inherit version;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
{ go, govers, lib, fetchgit, fetchhg, fetchbzr, rsync
|
||||
, removeReferencesTo, fetchFromGitHub, stdenv }:
|
||||
|
||||
{ name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
|
||||
{ buildInputs ? []
|
||||
, nativeBuildInputs ? []
|
||||
, passthru ? {}
|
||||
, preFixup ? ""
|
||||
, shellHook ? ""
|
||||
|
||||
# We want parallel builds by default
|
||||
|
|
@ -34,7 +37,6 @@
|
|||
|
||||
, meta ? {}, ... } @ args':
|
||||
|
||||
if disabled then throw "${name} not supported for go ${go.meta.branch}" else
|
||||
|
||||
with builtins;
|
||||
|
||||
|
|
@ -72,170 +74,171 @@ let
|
|||
|
||||
goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs
|
||||
else extraSrcs;
|
||||
in
|
||||
package = go.stdenv.mkDerivation (
|
||||
(builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // {
|
||||
|
||||
go.stdenv.mkDerivation (
|
||||
(builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // {
|
||||
nativeBuildInputs = [ removeReferencesTo go ]
|
||||
++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
|
||||
buildInputs = buildInputs;
|
||||
|
||||
inherit name;
|
||||
nativeBuildInputs = [ removeReferencesTo go ]
|
||||
++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
|
||||
buildInputs = buildInputs;
|
||||
inherit (go) GOOS GOARCH;
|
||||
|
||||
inherit (go) GOOS GOARCH;
|
||||
configurePhase = args.configurePhase or ''
|
||||
runHook preConfigure
|
||||
|
||||
configurePhase = args.configurePhase or ''
|
||||
runHook preConfigure
|
||||
# Extract the source
|
||||
cd "$NIX_BUILD_TOP"
|
||||
mkdir -p "go/src/$(dirname "$goPackagePath")"
|
||||
mv "$sourceRoot" "go/src/$goPackagePath"
|
||||
|
||||
# Extract the source
|
||||
cd "$NIX_BUILD_TOP"
|
||||
mkdir -p "go/src/$(dirname "$goPackagePath")"
|
||||
mv "$sourceRoot" "go/src/$goPackagePath"
|
||||
'' + lib.flip lib.concatMapStrings goPath ({ src, goPackagePath }: ''
|
||||
mkdir goPath
|
||||
(cd goPath; unpackFile "${src}")
|
||||
mkdir -p "go/src/$(dirname "${goPackagePath}")"
|
||||
chmod -R u+w goPath/*
|
||||
mv goPath/* "go/src/${goPackagePath}"
|
||||
rmdir goPath
|
||||
|
||||
'' + lib.flip lib.concatMapStrings goPath ({ src, goPackagePath }: ''
|
||||
mkdir goPath
|
||||
(cd goPath; unpackFile "${src}")
|
||||
mkdir -p "go/src/$(dirname "${goPackagePath}")"
|
||||
chmod -R u+w goPath/*
|
||||
mv goPath/* "go/src/${goPackagePath}"
|
||||
rmdir goPath
|
||||
'') + (lib.optionalString (extraSrcPaths != []) ''
|
||||
${rsync}/bin/rsync -a ${lib.concatMapStringsSep " " (p: "${p}/src") extraSrcPaths} go
|
||||
|
||||
'') + (lib.optionalString (extraSrcPaths != []) ''
|
||||
${rsync}/bin/rsync -a ${lib.concatMapStringsSep " " (p: "${p}/src") extraSrcPaths} go
|
||||
'') + ''
|
||||
export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
|
||||
export GOCACHE=$TMPDIR/go-cache
|
||||
|
||||
'') + ''
|
||||
export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
|
||||
export GOCACHE=$TMPDIR/go-cache
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
renameImports = args.renameImports or (
|
||||
let
|
||||
inputsWithAliases = lib.filter (x: x ? goPackageAliases)
|
||||
(buildInputs ++ (args.propagatedBuildInputs or [ ]));
|
||||
rename = to: from: "echo Renaming '${from}' to '${to}'; govers -d -m ${from} ${to}";
|
||||
renames = p: lib.concatMapStringsSep "\n" (rename p.goPackagePath) p.goPackageAliases;
|
||||
in lib.concatMapStringsSep "\n" renames inputsWithAliases);
|
||||
|
||||
renameImports = args.renameImports or (
|
||||
let
|
||||
inputsWithAliases = lib.filter (x: x ? goPackageAliases)
|
||||
(buildInputs ++ (args.propagatedBuildInputs or [ ]));
|
||||
rename = to: from: "echo Renaming '${from}' to '${to}'; govers -d -m ${from} ${to}";
|
||||
renames = p: lib.concatMapStringsSep "\n" (rename p.goPackagePath) p.goPackageAliases;
|
||||
in lib.concatMapStringsSep "\n" renames inputsWithAliases);
|
||||
buildPhase = args.buildPhase or ''
|
||||
runHook preBuild
|
||||
|
||||
buildPhase = args.buildPhase or ''
|
||||
runHook preBuild
|
||||
runHook renameImports
|
||||
|
||||
runHook renameImports
|
||||
|
||||
buildGoDir() {
|
||||
local d; local cmd;
|
||||
cmd="$1"
|
||||
d="$2"
|
||||
. $TMPDIR/buildFlagsArray
|
||||
echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0
|
||||
[ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
|
||||
local OUT
|
||||
if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then
|
||||
if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
|
||||
echo "$OUT" >&2
|
||||
return 1
|
||||
buildGoDir() {
|
||||
local d; local cmd;
|
||||
cmd="$1"
|
||||
d="$2"
|
||||
. $TMPDIR/buildFlagsArray
|
||||
echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0
|
||||
[ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
|
||||
local OUT
|
||||
if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then
|
||||
if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
|
||||
echo "$OUT" >&2
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if [ -n "$OUT" ]; then
|
||||
echo "$OUT" >&2
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
if [ -n "$OUT" ]; then
|
||||
echo "$OUT" >&2
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
getGoDirs() {
|
||||
local type;
|
||||
type="$1"
|
||||
if [ -n "$subPackages" ]; then
|
||||
echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g"
|
||||
getGoDirs() {
|
||||
local type;
|
||||
type="$1"
|
||||
if [ -n "$subPackages" ]; then
|
||||
echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g"
|
||||
else
|
||||
pushd "$NIX_BUILD_TOP/go/src" >/dev/null
|
||||
find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort | uniq
|
||||
popd >/dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
if (( "''${NIX_DEBUG:-0}" >= 1 )); then
|
||||
buildFlagsArray+=(-x)
|
||||
fi
|
||||
|
||||
if [ ''${#buildFlagsArray[@]} -ne 0 ]; then
|
||||
declare -p buildFlagsArray > $TMPDIR/buildFlagsArray
|
||||
else
|
||||
pushd "$NIX_BUILD_TOP/go/src" >/dev/null
|
||||
find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort | uniq
|
||||
popd >/dev/null
|
||||
touch $TMPDIR/buildFlagsArray
|
||||
fi
|
||||
}
|
||||
|
||||
if (( "''${NIX_DEBUG:-0}" >= 1 )); then
|
||||
buildFlagsArray+=(-x)
|
||||
fi
|
||||
|
||||
if [ ''${#buildFlagsArray[@]} -ne 0 ]; then
|
||||
declare -p buildFlagsArray > $TMPDIR/buildFlagsArray
|
||||
else
|
||||
touch $TMPDIR/buildFlagsArray
|
||||
fi
|
||||
export -f buildGoDir # xargs needs to see the function
|
||||
if [ -z "$enableParallelBuilding" ]; then
|
||||
export NIX_BUILD_CORES=1
|
||||
fi
|
||||
getGoDirs "" | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir install "$@"' --
|
||||
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
# normalize cross-compiled builds w.r.t. native builds
|
||||
(
|
||||
dir=$NIX_BUILD_TOP/go/bin/${go.GOOS}_${go.GOARCH}
|
||||
if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then
|
||||
mv $dir/* $dir/..
|
||||
export -f buildGoDir # xargs needs to see the function
|
||||
if [ -z "$enableParallelBuilding" ]; then
|
||||
export NIX_BUILD_CORES=1
|
||||
fi
|
||||
if [[ -d $dir ]]; then
|
||||
rmdir $dir
|
||||
fi
|
||||
)
|
||||
'' + ''
|
||||
runHook postBuild
|
||||
'';
|
||||
getGoDirs "" | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir install "$@"' --
|
||||
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
# normalize cross-compiled builds w.r.t. native builds
|
||||
(
|
||||
dir=$NIX_BUILD_TOP/go/bin/${go.GOOS}_${go.GOARCH}
|
||||
if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then
|
||||
mv $dir/* $dir/..
|
||||
fi
|
||||
if [[ -d $dir ]]; then
|
||||
rmdir $dir
|
||||
fi
|
||||
)
|
||||
'' + ''
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
doCheck = args.doCheck or false;
|
||||
checkPhase = args.checkPhase or ''
|
||||
runHook preCheck
|
||||
doCheck = args.doCheck or false;
|
||||
checkPhase = args.checkPhase or ''
|
||||
runHook preCheck
|
||||
|
||||
getGoDirs test | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir test "$@"' --
|
||||
getGoDirs test | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir test "$@"' --
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = args.installPhase or ''
|
||||
runHook preInstall
|
||||
installPhase = args.installPhase or ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $bin
|
||||
dir="$NIX_BUILD_TOP/go/bin"
|
||||
[ -e "$dir" ] && cp -r $dir $bin
|
||||
mkdir -p $bin
|
||||
dir="$NIX_BUILD_TOP/go/bin"
|
||||
[ -e "$dir" ] && cp -r $dir $bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = preFixup + ''
|
||||
find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
|
||||
'';
|
||||
preFixup = preFixup + ''
|
||||
find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
|
||||
'';
|
||||
|
||||
shellHook = ''
|
||||
d=$(mktemp -d "--suffix=-$name")
|
||||
'' + toString (map (dep: ''
|
||||
mkdir -p "$d/src/$(dirname "${dep.goPackagePath}")"
|
||||
ln -s "${dep.src}" "$d/src/${dep.goPackagePath}"
|
||||
''
|
||||
) goPath) + ''
|
||||
export GOPATH=${lib.concatStringsSep ":" ( ["$d"] ++ ["$GOPATH"] ++ ["$PWD"] ++ extraSrcPaths)}
|
||||
'' + shellHook;
|
||||
shellHook = ''
|
||||
d=$(mktemp -d "--suffix=-$name")
|
||||
'' + toString (map (dep: ''
|
||||
mkdir -p "$d/src/$(dirname "${dep.goPackagePath}")"
|
||||
ln -s "${dep.src}" "$d/src/${dep.goPackagePath}"
|
||||
''
|
||||
) goPath) + ''
|
||||
export GOPATH=${lib.concatStringsSep ":" ( ["$d"] ++ ["$GOPATH"] ++ ["$PWD"] ++ extraSrcPaths)}
|
||||
'' + shellHook;
|
||||
|
||||
disallowedReferences = lib.optional (!allowGoReference) go
|
||||
++ lib.optional (!dontRenameImports) govers;
|
||||
disallowedReferences = lib.optional (!allowGoReference) go
|
||||
++ lib.optional (!dontRenameImports) govers;
|
||||
|
||||
passthru = passthru //
|
||||
{ inherit go; } //
|
||||
lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; };
|
||||
passthru = passthru //
|
||||
{ inherit go; } //
|
||||
lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; };
|
||||
|
||||
enableParallelBuilding = enableParallelBuilding;
|
||||
enableParallelBuilding = enableParallelBuilding;
|
||||
|
||||
# I prefer to call this dev but propagatedBuildInputs expects $out to exist
|
||||
outputs = args.outputs or [ "bin" "out" ];
|
||||
# I prefer to call this dev but propagatedBuildInputs expects $out to exist
|
||||
outputs = args.outputs or [ "bin" "out" ];
|
||||
|
||||
meta = {
|
||||
# Add default meta information
|
||||
homepage = "https://${goPackagePath}";
|
||||
platforms = go.meta.platforms or lib.platforms.all;
|
||||
} // meta // {
|
||||
# add an extra maintainer to every package
|
||||
maintainers = (meta.maintainers or []) ++
|
||||
[ lib.maintainers.ehmry lib.maintainers.lethalman ];
|
||||
};
|
||||
})
|
||||
meta = {
|
||||
# Add default meta information
|
||||
homepage = "https://${goPackagePath}";
|
||||
platforms = go.meta.platforms or lib.platforms.all;
|
||||
} // meta // {
|
||||
# add an extra maintainer to every package
|
||||
maintainers = (meta.maintainers or []) ++
|
||||
[ lib.maintainers.ehmry lib.maintainers.lethalman ];
|
||||
};
|
||||
});
|
||||
in if disabled then
|
||||
throw "${package.name} not supported for go ${go.meta.branch}"
|
||||
else
|
||||
package
|
||||
|
|
|
|||
|
|
@ -731,7 +731,7 @@ self: super: {
|
|||
rev = "v${ver}";
|
||||
sha256 = "0kqglih3rv12nmkzxvalhfaaafk4b2irvv9x5xmc48i1ns71y23l";
|
||||
}}/doc";
|
||||
buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ];
|
||||
nativeBuildInputs = with pkgs.buildPackages.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ];
|
||||
makeFlags = "html";
|
||||
installPhase = ''
|
||||
mv _build/html $out
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
|
|||
jruby = stdenv.mkDerivation rec {
|
||||
name = "jruby-${version}";
|
||||
|
||||
version = "9.2.4.0";
|
||||
version = "9.2.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
|
||||
sha256 = "034asndnqjgha74b6qr1gza9xfrmq9m8f6ysnblgd2axr218qqxr";
|
||||
sha256 = "0jgkpp90x4v3izl58r53lg5ndf9pm6q6qgwqvxhkb9zcha00ibgl";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "rude";
|
||||
repo = "love";
|
||||
rev = "${version}";
|
||||
sha256 = "0bp22mzkjy48gncj5vm9b7whzrggcbs5pd4cnb6k8jpl9j02dhdv";
|
||||
sha256 = "0q1lsgc1621czrg49nmabq6am9sgxa9syxrwzlksqqr4dyzw4nmf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
{ lib, stdenv, fetchurl, flex, bison, autoconf
|
||||
, mysql, libxml2, readline, zlib, curl, postgresql, gettext
|
||||
, openssl, pcre, pcre2, pkgconfig, sqlite, config, libjpeg, libpng, freetype
|
||||
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
|
||||
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash
|
||||
, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2, libzip
|
||||
}:
|
||||
|
||||
|
|
@ -17,7 +17,6 @@ let
|
|||
, imapSupport ? config.php.imap or (!stdenv.isDarwin)
|
||||
, ldapSupport ? config.php.ldap or true
|
||||
, mhashSupport ? config.php.mhash or true
|
||||
, mysqlSupport ? (config.php.mysql or true)
|
||||
, mysqlndSupport ? config.php.mysqlnd or true
|
||||
, mysqliSupport ? config.php.mysqli or true
|
||||
, pdo_mysqlSupport ? config.php.pdo_mysql or true
|
||||
|
|
@ -27,14 +26,13 @@ let
|
|||
, bcmathSupport ? config.php.bcmath or true
|
||||
, socketsSupport ? config.php.sockets or true
|
||||
, curlSupport ? config.php.curl or true
|
||||
, curlWrappersSupport ? config.php.curlWrappers or true
|
||||
, gettextSupport ? config.php.gettext or true
|
||||
, pcntlSupport ? config.php.pcntl or true
|
||||
, postgresqlSupport ? config.php.postgresql or true
|
||||
, pdo_pgsqlSupport ? config.php.pdo_pgsql or true
|
||||
, readlineSupport ? config.php.readline or true
|
||||
, sqliteSupport ? config.php.sqlite or true
|
||||
, soapSupport ? config.php.soap or true
|
||||
, soapSupport ? (config.php.soap or true) && (libxml2Support)
|
||||
, zlibSupport ? config.php.zlib or true
|
||||
, opensslSupport ? config.php.openssl or true
|
||||
, mbstringSupport ? config.php.mbstring or true
|
||||
|
|
@ -48,7 +46,6 @@ let
|
|||
, ftpSupport ? config.php.ftp or true
|
||||
, fpmSupport ? config.php.fpm or true
|
||||
, gmpSupport ? config.php.gmp or true
|
||||
, mssqlSupport ? config.php.mssql or (!stdenv.isDarwin)
|
||||
, ztsSupport ? config.php.zts or false
|
||||
, calendarSupport ? config.php.calendar or true
|
||||
, sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2")
|
||||
|
|
@ -59,6 +56,7 @@ let
|
|||
, cgiSupport ? config.php.cgi or true
|
||||
, cliSupport ? config.php.cli or true
|
||||
, pharSupport ? config.php.phar or true
|
||||
, xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support)
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -92,7 +90,6 @@ let
|
|||
++ optional postgresqlSupport postgresql
|
||||
++ optional pdo_pgsqlSupport postgresql
|
||||
++ optional pdo_mysqlSupport mysqlBuildInputs
|
||||
++ optional mysqlSupport mysqlBuildInputs
|
||||
++ optional mysqliSupport mysqlBuildInputs
|
||||
++ optional gmpSupport gmp
|
||||
++ optional gettextSupport gettext
|
||||
|
|
@ -100,7 +97,6 @@ let
|
|||
++ optional xslSupport libxslt
|
||||
++ optional mcryptSupport libmcrypt'
|
||||
++ optional bz2Support bzip2
|
||||
++ optional (mssqlSupport && !stdenv.isDarwin) freetds
|
||||
++ optional sodiumSupport libsodium
|
||||
++ optional tidySupport html-tidy
|
||||
++ optional argon2Support libargon2
|
||||
|
|
@ -130,20 +126,27 @@ let
|
|||
++ optional embedSupport "--enable-embed"
|
||||
++ optional mhashSupport "--with-mhash"
|
||||
++ optional curlSupport "--with-curl=${curl.dev}"
|
||||
++ optional curlWrappersSupport "--with-curlwrappers"
|
||||
++ optional zlibSupport "--with-zlib=${zlib.dev}"
|
||||
++ optional libxml2Support "--with-libxml-dir=${libxml2.dev}"
|
||||
++ optional (!libxml2Support) [
|
||||
"--disable-dom"
|
||||
"--disable-libxml"
|
||||
"--disable-simplexml"
|
||||
"--disable-xml"
|
||||
"--disable-xmlreader"
|
||||
"--disable-xmlwriter"
|
||||
"--without-pear"
|
||||
]
|
||||
++ optional pcntlSupport "--enable-pcntl"
|
||||
++ optional readlineSupport "--with-readline=${readline.dev}"
|
||||
++ optional sqliteSupport "--with-pdo-sqlite=${sqlite.dev}"
|
||||
++ optional postgresqlSupport "--with-pgsql=${postgresql}"
|
||||
++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}"
|
||||
++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}"
|
||||
++ optional mysqlSupport "--with-mysql${if mysqlndSupport then "=mysqlnd" else ""}"
|
||||
++ optionals mysqliSupport [
|
||||
"--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"
|
||||
]
|
||||
++ optional ( pdo_mysqlSupport || mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock"
|
||||
++ optional ( pdo_mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock"
|
||||
++ optional bcmathSupport "--enable-bcmath"
|
||||
# FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
|
||||
++ optionals gdSupport [
|
||||
|
|
@ -166,7 +169,6 @@ let
|
|||
++ optional zipSupport "--enable-zip"
|
||||
++ optional ftpSupport "--enable-ftp"
|
||||
++ optional fpmSupport "--enable-fpm"
|
||||
++ optional (mssqlSupport && !stdenv.isDarwin) "--with-mssql=${freetds}"
|
||||
++ optional ztsSupport "--enable-maintainer-zts"
|
||||
++ optional calendarSupport "--enable-calendar"
|
||||
++ optional sodiumSupport "--with-sodium=${libsodium.dev}"
|
||||
|
|
@ -177,7 +179,8 @@ let
|
|||
++ optional (!phpdbgSupport) "--disable-phpdbg"
|
||||
++ optional (!cgiSupport) "--disable-cgi"
|
||||
++ optional (!cliSupport) "--disable-cli"
|
||||
++ optional (!pharSupport) "--disable-phar";
|
||||
++ optional (!pharSupport) "--disable-phar"
|
||||
++ optional xmlrpcSupport "--with-xmlrpc";
|
||||
|
||||
hardeningDisable = [ "bindnow" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,19 +10,16 @@
|
|||
assert zlibSupport -> zlib != null;
|
||||
|
||||
let
|
||||
majorVersion = "6.0";
|
||||
minorVersion = "0";
|
||||
minorVersionSuffix = "";
|
||||
version = "6.0.0";
|
||||
pythonVersion = "2.7";
|
||||
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
|
||||
libPrefix = "pypy${majorVersion}";
|
||||
libPrefix = "pypy${pythonVersion}";
|
||||
sitePackages = "site-packages";
|
||||
|
||||
pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]);
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "pypy-${version}";
|
||||
inherit majorVersion version pythonVersion;
|
||||
inherit version pythonVersion;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2";
|
||||
|
|
@ -69,12 +66,7 @@ in stdenv.mkDerivation rec {
|
|||
${pythonForPypy.interpreter} rpython/bin/rpython \
|
||||
--make-jobs="$NIX_BUILD_CORES" \
|
||||
-Ojit \
|
||||
--batch pypy/goal/targetpypystandalone.py \
|
||||
--withmod-_minimal_curses \
|
||||
--withmod-unicodedata \
|
||||
--withmod-thread \
|
||||
--withmod-bz2 \
|
||||
--withmod-_multiprocessing
|
||||
--batch pypy/goal/targetpypystandalone.py
|
||||
'';
|
||||
|
||||
setupHook = python-setup-hook sitePackages;
|
||||
|
|
@ -87,9 +79,7 @@ in stdenv.mkDerivation rec {
|
|||
# disable shutils because it assumes gid 0 exists
|
||||
# disable socket because it has two actual network tests that fail
|
||||
# disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com)
|
||||
# disable test_ssl because no shared cipher' not found in '[Errno 1] error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure
|
||||
# disable test_zipfile64 because it causes ENOSPACE
|
||||
./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_ssl or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil or test_zipfile64 )' lib-python
|
||||
./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil )' lib-python
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -126,6 +116,8 @@ in stdenv.mkDerivation rec {
|
|||
inherit zlibSupport libPrefix sitePackages;
|
||||
executable = "pypy";
|
||||
isPypy = true;
|
||||
isPy2 = true;
|
||||
isPy27 = true;
|
||||
buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
|
||||
interpreter = "${self}/bin/${executable}";
|
||||
withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ace-${version}";
|
||||
version = "6.5.2";
|
||||
version = "6.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
|
||||
sha256 = "1ibc62r3nh33c5w9mbnmzzhalb0jry6ccfb5ph62xsayy9nksfgh";
|
||||
sha256 = "06lvy5ylcg4vsc58p1yqr5607n542a57n0whpchmrlab74bagmmi";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, agda, fetchFromGitHub, ghcWithPackages }:
|
||||
|
||||
agda.mkDerivation (self: rec {
|
||||
version = "0.16.1";
|
||||
version = "0.17";
|
||||
name = "agda-stdlib-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "agda-stdlib";
|
||||
owner = "agda";
|
||||
rev = "v${version}";
|
||||
sha256 = "17dv5r3ygmbwwh7k8qaffp2965sv165b47i53ymc0gbfcwr6cy2n";
|
||||
sha256 = "05c5zgj9fcaqz7z2l70jh48b3g4811vm7bccj0vd9r82wi02g3p1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "aubio-0.4.7";
|
||||
name = "aubio-0.4.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://aubio.org/pub/${name}.tar.bz2";
|
||||
sha256 = "0hd0kzfmr46am00ygxar8alrldv92c5azqy701iilfmbqpz4mvfb";
|
||||
sha256 = "1fjbz1l9axscrb7dl6jv4ifhvmq1g77ihvg0bbwwfg0j3qz4gxyw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig python wafHook ];
|
||||
|
|
|
|||
11
pkgs/development/libraries/boost/1.69.nix
Normal file
11
pkgs/development/libraries/boost/1.69.nix
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.69_0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_1_69_0.tar.bz2";
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_69_0.html
|
||||
sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406";
|
||||
};
|
||||
})
|
||||
|
|
@ -6,11 +6,11 @@
|
|||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "eccodes-${version}";
|
||||
version = "2.9.2";
|
||||
version = "2.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
|
||||
sha256 = "18gjzhz7bkibc34a0djq1r4b2y3hpn7ym0zs0nj07yq58v4pdx08";
|
||||
sha256 = "1n429najxlq6y76wyx1mbw41b0l4prdhfmy4id9ni8zwm96cp8xy";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "geos-3.7.0";
|
||||
name = "geos-3.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.osgeo.org/geos/${name}.tar.bz2";
|
||||
sha256 = "1mrz778m6bd1x9k6sha5kld43kalhq79h2lynlx2jx7xjakl3gsg";
|
||||
sha256 = "1312m02xk4sp6f1xdpb9w0ic0zbxg90p5y66qnwidl5fksscf1h0";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec{
|
||||
name = "grib-api-${version}";
|
||||
version = "1.27.0";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz";
|
||||
sha256 = "1vx6bx9jhz5vdh2vx5y532ihwgyylagqz6pbx2p2bsx4kmj4pxdd";
|
||||
sha256 = "0qbj12ap7yy2rl1pq629chnss2jl73wxdj1lwzv0xp87r6z5qdfl";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtkd-${version}";
|
||||
version = "3.8.3";
|
||||
version = "3.8.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip";
|
||||
sha256 = "10jhwy1421bypq62ki1dzv8irvlgwr7s40z6l6vxallm4jkgk9gj";
|
||||
sha256 = "0q2kf1jwr89i8ajjzyf3b4bbla33djvnwrvljq17y206q7qknfyz";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ let
|
|||
checkInputs = [ xvfb_run dbus ];
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "gtksourceview-${version}";
|
||||
version = "3.24.8";
|
||||
version = "3.24.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "1zinqid62zjcsq7vy1y4mq1qh3hzd3zj7p8np7g0bdqd37zvi6qy";
|
||||
sha256 = "1hh7brcvpip96mkf9460ksy2qpx2pwynwd0634rx78z6afj7d7b9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview, gnome3 }:
|
||||
{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview3, gnome3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtksourceviewmm-${version}";
|
||||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ glibmm gtkmm gtksourceview ];
|
||||
buildInputs = [ glibmm gtkmm3 gtksourceview3 ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
platforms = platforms.linux;
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gupnp-av-${version}";
|
||||
version = "0.12.10";
|
||||
version = "0.12.11";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gupnp-av/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||
sha256 = "0nmq6wlbfsssanv3jgv2z0nhfkv8vzfr3gq5qa8svryvvn2fyf40";
|
||||
sha256 = "1p3grslwqm9bc8rmpn4l48d7v9s84nina4r9xbd932dbj8acz7b8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
|
||||
|
|
|
|||
|
|
@ -6,12 +6,17 @@ assert x11Support -> libX11 != null && cairo != null;
|
|||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hwloc-2.0.2";
|
||||
let
|
||||
version = "2.0.3";
|
||||
versmm = versions.major version + "." + versions.minor version;
|
||||
name = "hwloc-${version}";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.open-mpi.org/software/hwloc/v2.0/downloads/${name}.tar.bz2";
|
||||
sha256 = "1phc863d5b2fvwpyyq4mlh4rkjdslh6h0h197zmyk3prwrq7si8l";
|
||||
url = "http://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2";
|
||||
sha256 = "09f7ajak8wv5issr0hw72vs3jkldc7crcc7z5fd34sspkvrsm4z3";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Library with the aim of simplifying DNS programming in C";
|
||||
license = licenses.bsd3;
|
||||
homepage = http://www.nlnetlabs.nl/projects/ldns/;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ jgeerds ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla
|
||||
, libusb1, udev }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.9.0";
|
||||
version = "2.0.2";
|
||||
name = "libbladeRF-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nuand";
|
||||
repo = "bladeRF";
|
||||
rev = "libbladeRF_v${version}";
|
||||
sha256 = "0frvphp4xxdxwzmi94b0asl7b891sd3fk8iw9kfk8h6f3cdhj8xa";
|
||||
sha256 = "18qwljjdnf4lds04kc1zvslr5hh9cjnnjkcy07lbkrq7pj0pfnc6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
@ -21,8 +21,17 @@ stdenv.mkDerivation rec {
|
|||
# Fixup shebang
|
||||
prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash";
|
||||
|
||||
# Fixes macos and freebsd compilation issue.
|
||||
# https://github.com/Nuand/bladeRF/commit/0cb4ea888543b2dc75b876f7024e180854fbe9c3
|
||||
patches = [ (fetchpatch {
|
||||
name = "fix-OSX-and-FreeBSD-build.patch";
|
||||
url = "https://github.com/Nuand/bladeRF/commit/0cb4ea88.diff";
|
||||
sha256 = "1ccpa69vz2nlpdnxprh4rd1pgphk82z5lfmbrfdkn7srw6nxl469";
|
||||
})
|
||||
];
|
||||
|
||||
# Let us avoid nettools as a dependency.
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
sed -i 's/$(hostname)/hostname/' host/utilities/bladeRF-cli/src/cmd/doc/generate.bash
|
||||
'';
|
||||
|
||||
|
|
@ -31,6 +40,7 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals stdenv.isLinux [
|
||||
"-DUDEV_RULES_PATH=etc/udev/rules.d"
|
||||
"-DINSTALL_UDEV_RULES=ON"
|
||||
"-DBLADERF_GROUP=bladerf"
|
||||
];
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libcouchbase-${version}";
|
||||
version = "2.10.0";
|
||||
version = "2.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "couchbase";
|
||||
repo = "libcouchbase";
|
||||
rev = version;
|
||||
sha256 = "08bvnd0m18qs5akbblf80l54khm1523fdiiajp7fj88vrs86nbi2";
|
||||
sha256 = "1znhy99nhiv21j2jwsx9dsmg8br01wg0hsf1yfwsjny0myv13xkm";
|
||||
};
|
||||
|
||||
cmakeFlags = "-DLCB_NO_MOCK=ON";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.20.0";
|
||||
version = "3.20.2";
|
||||
name = "libdap-${version}";
|
||||
|
||||
nativeBuildInputs = [ bison flex ];
|
||||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.opendap.org/pub/source/${name}.tar.gz";
|
||||
sha256 = "0cr3d7dlzq583dqqrkbs1bkcrwag4hp7hwrx5c0mjk7q4vrslh92";
|
||||
sha256 = "0kp35ghj48wqgy67xyplwhmw21r8r0p00y2hw0fv65g4yrsgvsk0";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null;
|
|||
assert videoSupport -> ffmpeg != null && libmpeg2 != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libextractor-1.7";
|
||||
name = "libextractor-1.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libextractor/${name}.tar.gz";
|
||||
sha256 = "13wf6vj7mkv6gw8h183cnk7m24ir0gyf198pyb2148ng4klgv9p0";
|
||||
sha256 = "1z1cb35griqzvshqdv5ck98dy0sgpsswn7fgiy7lbzi34sma8dg2";
|
||||
};
|
||||
|
||||
preConfigure =
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue