Merge remote-tracking branch 'origin/master' into openssl-1.1
This commit is contained in:
commit
d1d602f559
|
@ -582,6 +582,12 @@
|
|||
githubId = 816777;
|
||||
name = "Ashley Gillman";
|
||||
};
|
||||
ashkitten = {
|
||||
email = "ashlea@protonmail.com";
|
||||
github = "ashkitten";
|
||||
githubId = 9281956;
|
||||
name = "ash lea";
|
||||
};
|
||||
aske = {
|
||||
email = "aske@fmap.me";
|
||||
github = "aske";
|
||||
|
|
|
@ -609,6 +609,7 @@
|
|||
./services/networking/iodine.nix
|
||||
./services/networking/iperf3.nix
|
||||
./services/networking/ircd-hybrid/default.nix
|
||||
./services/networking/jormungandr.nix
|
||||
./services/networking/iwd.nix
|
||||
./services/networking/keepalived/default.nix
|
||||
./services/networking/keybase.nix
|
||||
|
|
97
nixos/modules/services/networking/jormungandr.nix
Normal file
97
nixos/modules/services/networking/jormungandr.nix
Normal file
|
@ -0,0 +1,97 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.jormungandr;
|
||||
|
||||
inherit (lib) mkEnableOption mkIf mkOption;
|
||||
inherit (lib) optionalString types;
|
||||
|
||||
dataDir = "/var/lib/jormungandr";
|
||||
|
||||
# Default settings so far, as the service matures we will
|
||||
# move these out as separate settings
|
||||
configSettings = {
|
||||
storage = dataDir;
|
||||
p2p = {
|
||||
public_address = "/ip4/127.0.0.1/tcp/8606";
|
||||
messages = "high";
|
||||
blocks = "high";
|
||||
};
|
||||
rest = {
|
||||
listen = "127.0.0.1:8607";
|
||||
};
|
||||
};
|
||||
|
||||
configFile = if cfg.configFile == null then
|
||||
pkgs.writeText "jormungandr.yaml" (builtins.toJSON configSettings)
|
||||
else cfg.configFile;
|
||||
|
||||
in {
|
||||
|
||||
options = {
|
||||
|
||||
services.jormungandr = {
|
||||
enable = mkEnableOption "jormungandr service";
|
||||
|
||||
configFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
example = "/var/lib/jormungandr/node.yaml";
|
||||
description = ''
|
||||
The path of the jormungandr blockchain configuration file in YAML format.
|
||||
If no file is specified, a file is generated using the other options.
|
||||
'';
|
||||
};
|
||||
|
||||
secretFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
example = "/etc/secret/jormungandr.yaml";
|
||||
description = ''
|
||||
The path of the jormungandr blockchain secret node configuration file in
|
||||
YAML format. Do not store this in nix store!
|
||||
'';
|
||||
};
|
||||
|
||||
genesisBlockHash = mkOption {
|
||||
type = types.nullOr types.string;
|
||||
default = null;
|
||||
example = "d70495af81ae8600aca3e642b2427327cb6001ec4d7a0037e96a00dabed163f9";
|
||||
description = ''
|
||||
Set the genesis block hash (the hash of the block0) so we can retrieve
|
||||
the genesis block (and the blockchain configuration) from the existing
|
||||
storage or from the network.
|
||||
'';
|
||||
};
|
||||
|
||||
genesisBlockFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
example = "/var/lib/jormungandr/block-0.bin";
|
||||
description = ''
|
||||
The path of the genesis block file if we are hosting it locally.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
systemd.services.jormungandr = {
|
||||
description = "jormungandr server";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
StateDirectory = baseNameOf dataDir;
|
||||
ExecStart = ''
|
||||
${pkgs.jormungandr}/bin/jormungandr --config ${configFile} \
|
||||
${optionalString (cfg.secretFile != null) " --secret ${cfg.secretFile}"} \
|
||||
${optionalString (cfg.genesisBlockHash != null) " --genesis-block-hash ${cfg.genesisBlockHash}"} \
|
||||
${optionalString (cfg.genesisBlockFile != null) " --genesis-block ${cfg.genesisBlockFile}"}
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -39,6 +39,16 @@ in {
|
|||
services.usbguard = {
|
||||
enable = mkEnableOption "USBGuard daemon";
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.usbguard;
|
||||
defaultText = "pkgs.usbguard";
|
||||
description = ''
|
||||
The usbguard package to use. If you do not need the Qt GUI, use
|
||||
<literal>pkgs.usbguard-nox</literal> to save disk space.
|
||||
'';
|
||||
};
|
||||
|
||||
ruleFile = mkOption {
|
||||
type = types.path;
|
||||
default = "/var/lib/usbguard/rules.conf";
|
||||
|
@ -179,7 +189,7 @@ in {
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
environment.systemPackages = [ pkgs.usbguard ];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
systemd.services.usbguard = {
|
||||
description = "USBGuard daemon";
|
||||
|
@ -195,7 +205,7 @@ in {
|
|||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -P -k -c ${daemonConfFile}'';
|
||||
ExecStart = ''${cfg.package}/bin/usbguard-daemon -P -k -c ${daemonConfFile}'';
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -127,6 +127,7 @@ in
|
|||
jackett = handleTest ./jackett.nix {};
|
||||
jellyfin = handleTest ./jellyfin.nix {};
|
||||
jenkins = handleTest ./jenkins.nix {};
|
||||
jormungandr = handleTest ./jormungandr.nix {};
|
||||
kafka = handleTest ./kafka.nix {};
|
||||
kerberos = handleTest ./kerberos/default.nix {};
|
||||
kernel-latest = handleTest ./kernel-latest.nix {};
|
||||
|
@ -141,6 +142,7 @@ in
|
|||
latestKernel.login = handleTest ./login.nix { latestKernel = true; };
|
||||
ldap = handleTest ./ldap.nix {};
|
||||
leaps = handleTest ./leaps.nix {};
|
||||
libxmlb = handleTest ./libxmlb.nix {};
|
||||
lidarr = handleTest ./lidarr.nix {};
|
||||
lightdm = handleTest ./lightdm.nix {};
|
||||
limesurvey = handleTest ./limesurvey.nix {};
|
||||
|
|
49
nixos/tests/jormungandr.nix
Normal file
49
nixos/tests/jormungandr.nix
Normal file
|
@ -0,0 +1,49 @@
|
|||
import ./make-test.nix ({ pkgs, ... }: {
|
||||
name = "jormungandr";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
maintainers = [ mmahut ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
bft = { ... }: {
|
||||
environment.systemPackages = [ pkgs.jormungandr ];
|
||||
|
||||
services.jormungandr.enable = true;
|
||||
services.jormungandr.genesisBlockFile = "/var/lib/jormungandr/block-0.bin";
|
||||
services.jormungandr.secretFile = "/etc/secrets/jormungandr.yaml";
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
startAll;
|
||||
|
||||
# Let's wait for the StateDirectory
|
||||
$bft->waitForFile("/var/lib/jormungandr/");
|
||||
|
||||
# First, we generate the genesis file for our new blockchain
|
||||
$bft->succeed("jcli genesis init > /root/genesis.yaml");
|
||||
|
||||
# We need to generate our secret key
|
||||
$bft->succeed("jcli key generate --type=Ed25519 > /root/key.prv");
|
||||
|
||||
# We include the secret key into our services.jormungandr.secretFile
|
||||
$bft->succeed("mkdir -p /etc/secrets");
|
||||
$bft->succeed("echo -e \"bft:\\n signing_key:\" \$(cat /root/key.prv) > /etc/secrets/jormungandr.yaml");
|
||||
|
||||
# After that, we generate our public key from it
|
||||
$bft->succeed("cat /root/key.prv | jcli key to-public > /root/key.pub");
|
||||
|
||||
# We add our public key as a consensus leader in the genesis configration file
|
||||
$bft->succeed("sed -ie \"s/ed25519_pk1vvwp2s0n5jl5f4xcjurp2e92sj2awehkrydrlas4vgqr7xzt33jsadha32/\$(cat /root/key.pub)/\" /root/genesis.yaml");
|
||||
|
||||
# Now we can generate the genesis block from it
|
||||
$bft->succeed("jcli genesis encode --input /root/genesis.yaml --output /var/lib/jormungandr/block-0.bin");
|
||||
|
||||
# We should have everything to start the service now
|
||||
$bft->succeed("systemctl restart jormungandr");
|
||||
$bft->waitForUnit("jormungandr.service");
|
||||
|
||||
# Now we can test if we are able to reach the REST API
|
||||
$bft->waitUntilSucceeds("curl -L http://localhost:8607/api/v0/node/stats | grep uptime");
|
||||
'';
|
||||
})
|
17
nixos/tests/libxmlb.nix
Normal file
17
nixos/tests/libxmlb.nix
Normal file
|
@ -0,0 +1,17 @@
|
|||
# run installed tests
|
||||
import ./make-test.nix ({ pkgs, ... }:
|
||||
|
||||
{
|
||||
name = "libxmlb";
|
||||
meta = {
|
||||
maintainers = pkgs.libxmlb.meta.maintainers;
|
||||
};
|
||||
|
||||
machine = { pkgs, ... }: {
|
||||
environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
$machine->succeed("gnome-desktop-testing-runner -d '${pkgs.libxmlb.installedTests}/share'");
|
||||
'';
|
||||
})
|
|
@ -45,8 +45,7 @@ import ../make-test.nix ({ pkgs, ... }: {
|
|||
ip: "127.0.0.1"
|
||||
module: ejabberd_service
|
||||
access: local
|
||||
shaper_rule: fast
|
||||
ip: "127.0.0.1"
|
||||
shaper: fast
|
||||
|
||||
## Disabling digest-md5 SASL authentication. digest-md5 requires plain-text
|
||||
## password storage (see auth_password_format option).
|
||||
|
@ -181,7 +180,6 @@ import ../make-test.nix ({ pkgs, ... }: {
|
|||
mod_client_state: {}
|
||||
mod_configure: {} # requires mod_adhoc
|
||||
## mod_delegation: {} # for xep0356
|
||||
mod_echo: {}
|
||||
#mod_irc:
|
||||
# host: "irc.@HOST@"
|
||||
# default_encoding: "utf-8"
|
||||
|
|
|
@ -1,19 +1,20 @@
|
|||
{ stdenv, makeDesktopItem, fetchurl, unzip
|
||||
, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3
|
||||
, xorg, mozjpeg, makeWrapper, wrapGAppsHook, hicolor-icon-theme, libuuid
|
||||
, xorg, mozjpeg, makeWrapper, wrapGAppsHook, hicolor-icon-theme, libuuid, at-spi2-core
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "avocode-${version}";
|
||||
version = "3.9.0";
|
||||
version = "3.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
|
||||
sha256 = "0fk62farnsxz59q82kxagibxmn9p9ckp6ix0wqg297gvasgad31q";
|
||||
sha256 = "18yzw7bss1dkmmd8lxr9x8s46qmpnqci202g16zrp6j9jdj094d3";
|
||||
};
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath (with xorg; [
|
||||
stdenv.cc.cc.lib
|
||||
at-spi2-core.out
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, unzip, jdk, makeWrapper}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.1.5.2";
|
||||
version = "4.3.0";
|
||||
pname = "omegat";
|
||||
|
||||
src = fetchurl { # their zip has repeated files or something, so no fetchzip
|
||||
url = mirror://sourceforge/project/omegat/OmegaT%20-%20Latest/OmegaT%204.1.5%20update%202/OmegaT_4.1.5_02_Beta_Without_JRE.zip;
|
||||
sha256 = "1mdnsvjgsccpd5xwpqzgva5jjp8yd1akq9aqpild4v6k70lqql2b";
|
||||
url = mirror://sourceforge/project/omegat/OmegaT%20-%20Standard/OmegaT%204.3.0/OmegaT_4.3.0_Without_JRE.zip;
|
||||
sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip makeWrapper ];
|
||||
|
|
|
@ -0,0 +1,25 @@
|
|||
From bbd366348d1f0e334d4604d04e293a046070e666 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Fri, 23 Aug 2019 00:19:20 +0200
|
||||
Subject: [PATCH] Explicitly copy dbus files into the store dir
|
||||
|
||||
---
|
||||
shell_integration/libcloudproviders/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt
|
||||
index 1f35335..7f76951 100644
|
||||
--- a/shell_integration/libcloudproviders/CMakeLists.txt
|
||||
+++ b/shell_integration/libcloudproviders/CMakeLists.txt
|
||||
@@ -19,7 +19,7 @@ MACRO(PKGCONFIG_GETVAR _package _var _output_variable)
|
||||
ENDMACRO(PKGCONFIG_GETVAR _package _var _output_variable)
|
||||
|
||||
macro(dbus_add_activation_service _sources)
|
||||
- PKGCONFIG_GETVAR(dbus-1 session_bus_services_dir _install_dir)
|
||||
+ set(_install_dir "${CMAKE_INSTALL_PREFIX}/etc/dbus-1/service")
|
||||
foreach (_i ${_sources})
|
||||
get_filename_component(_service_file ${_i} ABSOLUTE)
|
||||
string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})
|
||||
--
|
||||
2.19.2
|
||||
|
|
@ -1,20 +1,24 @@
|
|||
{ stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite
|
||||
, inotify-tools, wrapQtAppsHook, openssl, pcre, qtwebengine, libsecret
|
||||
{ lib, mkDerivation, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite
|
||||
, inotify-tools, openssl, pcre, qtwebengine, libsecret
|
||||
, libcloudproviders
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
name = "nextcloud-client-${version}";
|
||||
version = "2.5.2";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://github.com/nextcloud/desktop.git";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "1brpxdgyy742dqw6cyyv2257d6ihwiqhbzfk2hb8zjgbi6p9lhsr";
|
||||
sha256 = "0fbw56bfbyk3cqv94iqfsxjf01dwy1ysjz89dri7qccs65rnjswj";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ];
|
||||
patches = [
|
||||
./0001-Explicitly-copy-dbus-files-into-the-store-dir.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
|
||||
buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl.out pcre inotify-tools libcloudproviders ];
|
||||
|
||||
|
@ -32,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
''--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libsecret ]}''
|
||||
''--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}''
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
@ -40,7 +44,7 @@ stdenv.mkDerivation rec {
|
|||
$out/share/applications/nextcloud.desktop
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Nextcloud themed desktop client";
|
||||
homepage = https://nextcloud.com;
|
||||
license = licenses.gpl2;
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools
|
||||
, seafile-shared, ccnet, makeWrapper
|
||||
{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools
|
||||
, seafile-shared, ccnet
|
||||
, withShibboleth ? true, qtwebengine }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
mkDerivation rec {
|
||||
version = "6.2.11";
|
||||
name = "seafile-client-${version}";
|
||||
|
||||
|
@ -15,17 +15,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1b8jqmr2qd3bpb3sr4p5w2a76x5zlknkj922sxrvw1rdwqhkb2pj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
buildInputs = [ qtbase qttools seafile-shared ]
|
||||
++ optional withShibboleth qtwebengine;
|
||||
|
||||
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]
|
||||
++ optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON";
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/seafile-applet \
|
||||
--suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}
|
||||
'';
|
||||
qtWrapperArgs = [
|
||||
"--suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/haiwen/seafile-client;
|
||||
|
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Tooling for Yosys-based verification flows";
|
||||
homepage = https://symbiyosys.readthedocs.io/;
|
||||
license = stdenv.lib.licenses.isc;
|
||||
maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ thoughtpolice emily ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -39,7 +39,7 @@ in {
|
|||
sha256 = "1j8i32dq6rrlv3kf2hnq81iqks06kczaxjks7nw3zyq1231winm9";
|
||||
};
|
||||
v5 = font-awesome {
|
||||
version = "5.10.1";
|
||||
sha256 = "1ckr7n0hlhvyl8nkhyjr7k6r07czpcfp0s2mnb48mvfgxd3j992p";
|
||||
version = "5.10.2";
|
||||
sha256 = "0bg28zn2lhrcyj7mbavphkvw3hrbnjsnn84305ax93nj3qd0d4hx";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osinfo-db";
|
||||
version = "20190726";
|
||||
version = "20190805";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
|
||||
sha256 = "0kcdq8g324a368bqvki718ms5kdcc3dzfmpgzyxwl0mkxbmhmirr";
|
||||
sha256 = "1la80kmh58nrra8aa4grv31gc7xbqbybl8q1m4yv0byb11slg93x";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];
|
||||
|
|
|
@ -2,58 +2,44 @@
|
|||
, boost, python3, eigen
|
||||
, icestorm, trellis
|
||||
|
||||
# TODO(thoughtpolice) Currently the GUI build seems broken at runtime on my
|
||||
# laptop (and over a remote X server on my server...), so mark it broken for
|
||||
# now, with intent to fix later.
|
||||
, enableGui ? false
|
||||
, qtbase, wrapQtAppsHook
|
||||
, enableGui ? true
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
}:
|
||||
|
||||
let
|
||||
boostPython = boost.override { python = python3; enablePython = true; };
|
||||
|
||||
# This is a massive hack. For now, Trellis doesn't really support
|
||||
# installation through an already-built package; you have to build it once to
|
||||
# get the tools, then reuse the build directory to build nextpnr -- the
|
||||
# 'install' phase doesn't install everything it needs. This will be fixed in
|
||||
# the future but for now we can do this horrific thing.
|
||||
trellisRoot = trellis.overrideAttrs (_: {
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp *.so ..
|
||||
cd ../../.. && cp -R trellis database $out/
|
||||
'';
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
with stdenv; mkDerivation rec {
|
||||
pname = "nextpnr";
|
||||
version = "2019.08.10";
|
||||
version = "2019.08.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yosyshq";
|
||||
repo = "nextpnr";
|
||||
rev = "3f26cf50767143e48d29ae691b2a0052c359eb15";
|
||||
sha256 = "1gv84svw56ass9idbzh17h3yxkk9ydr40ijf9w72gf72rbixszdr";
|
||||
rev = "c192ba261d77ad7f0a744fb90b01e4a5b63938c4";
|
||||
sha256 = "0g2ar1z89b31qw5vgqj2rrcv9rzncs94184dgcsrz19p866654mf";
|
||||
};
|
||||
|
||||
nativeBuildInputs
|
||||
= [ cmake ]
|
||||
++ (stdenv.lib.optional enableGui wrapQtAppsHook);
|
||||
++ (lib.optional enableGui wrapQtAppsHook);
|
||||
buildInputs
|
||||
= [ boostPython python3 eigen ]
|
||||
++ (stdenv.lib.optional enableGui qtbase);
|
||||
++ (lib.optional enableGui qtbase);
|
||||
|
||||
enableParallelBuilding = true;
|
||||
cmakeFlags =
|
||||
[ "-DARCH=generic;ice40;ecp5"
|
||||
"-DICEBOX_ROOT=${icestorm}/share/icebox"
|
||||
"-DTRELLIS_ROOT=${trellisRoot}/trellis"
|
||||
"-DTRELLIS_ROOT=${trellis}/share/trellis"
|
||||
"-DPYTRELLIS_LIBDIR=${trellis}/lib/trellis"
|
||||
"-DUSE_OPENMP=ON"
|
||||
# warning: high RAM usage
|
||||
"-DSERIALIZE_CHIPDB=OFF"
|
||||
# use PyPy for icestorm if enabled
|
||||
"-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}"
|
||||
] ++ (stdenv.lib.optional (!enableGui) "-DBUILD_GUI=OFF");
|
||||
] ++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF");
|
||||
|
||||
# Fix the version number. This is a bit stupid (and fragile) in practice
|
||||
# but works ok. We should probably make this overrideable upstream.
|
||||
|
@ -62,13 +48,18 @@ stdenv.mkDerivation rec {
|
|||
--replace 'git log -1 --format=%h' 'echo ${substring 0 11 src.rev}'
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
postFixup = lib.optionalString enableGui ''
|
||||
wrapQtApp $out/bin/nextpnr-generic
|
||||
wrapQtApp $out/bin/nextpnr-ice40
|
||||
wrapQtApp $out/bin/nextpnr-ecp5
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Place and route tool for FPGAs";
|
||||
homepage = https://github.com/yosyshq/nextpnr;
|
||||
license = licenses.isc;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ thoughtpolice ];
|
||||
|
||||
broken = enableGui;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ thoughtpolice emily ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -8,14 +8,14 @@ with builtins;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yosys";
|
||||
version = "2019.08.13";
|
||||
version = "2019.08.21";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
owner = "yosyshq";
|
||||
repo = "yosys";
|
||||
rev = "19d6b8846f55b4c7be705619f753bec86deadac8";
|
||||
sha256 = "185sbkxajx3k9j03n0cxq2qvzwfwdbcxp19h8vnk7ghd5y9gp602";
|
||||
rev = "fe1b2337fd7950e1d563be5b8ccbaa81688261e4";
|
||||
sha256 = "0z7sngc2z081yyhzh8c2kchg48sp2333hn1wa94q5vsgnyzlqrdw";
|
||||
name = "yosys";
|
||||
})
|
||||
|
||||
|
@ -40,10 +40,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patchPhase = ''
|
||||
substituteInPlace ../yosys-abc/Makefile \
|
||||
--replace 'CC := gcc' ""
|
||||
--replace 'CC := gcc' "" \
|
||||
--replace 'CXX := g++' ""
|
||||
substituteInPlace ./Makefile \
|
||||
--replace 'CXX = clang' "" \
|
||||
--replace 'ABCMKARGS = CC="$(CXX)"' 'ABCMKARGS =' \
|
||||
--replace 'LD = clang++' 'LD = $(CXX)' \
|
||||
--replace 'CXX = gcc' "" \
|
||||
--replace 'LD = gcc' 'LD = $(CXX)' \
|
||||
--replace 'ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"' 'ABCMKARGS =' \
|
||||
--replace 'echo UNKNOWN' 'echo ${substring 0 10 (elemAt srcs 0).rev}'
|
||||
'';
|
||||
|
||||
|
@ -71,7 +75,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = http://www.clifford.at/yosys/;
|
||||
license = stdenv.lib.licenses.isc;
|
||||
maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice emily ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -41,30 +41,9 @@ self: super: {
|
|||
unix = null;
|
||||
xhtml = null;
|
||||
|
||||
# Use the current git version of cabal-install.
|
||||
cabal-install = overrideCabal (super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal-git; })) (drv: {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "haskell";
|
||||
repo = "cabal";
|
||||
rev = "e98f6c26fa301b49921c2df67934bf9b0a4f3386";
|
||||
sha256 = "15nrkvckq2rw31z7grgbsg5f0gxfc09afsrqdfi4n471k630xd2i";
|
||||
};
|
||||
version = "20190510-git";
|
||||
editedCabalFile = null;
|
||||
postUnpack = "sourceRoot+=/cabal-install";
|
||||
jailbreak = true;
|
||||
});
|
||||
Cabal-git = overrideCabal super.Cabal_2_4_1_0 (drv: {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "haskell";
|
||||
repo = "cabal";
|
||||
rev = "e98f6c26fa301b49921c2df67934bf9b0a4f3386";
|
||||
sha256 = "15nrkvckq2rw31z7grgbsg5f0gxfc09afsrqdfi4n471k630xd2i";
|
||||
};
|
||||
version = "20190510-git";
|
||||
editedCabalFile = null;
|
||||
postUnpack = "sourceRoot+=/Cabal";
|
||||
});
|
||||
# Use the cabal-install 3.0.0.0 beta release.
|
||||
cabal-install = self.cabal-install-3;
|
||||
Cabal_3_0_0_0 = null; # Our compiler has this already.
|
||||
|
||||
# Ignore overly restrictive upper version bounds.
|
||||
async = doJailbreak super.async;
|
||||
|
|
|
@ -43,7 +43,7 @@ core-packages:
|
|||
- ghcjs-base-0
|
||||
|
||||
default-package-overrides:
|
||||
# LTS Haskell 14.1
|
||||
# LTS Haskell 14.2
|
||||
- abstract-deque ==0.3
|
||||
- abstract-deque-tests ==0.3
|
||||
- abstract-par ==0.3.3
|
||||
|
@ -143,7 +143,7 @@ default-package-overrides:
|
|||
- avwx ==0.3.0.2
|
||||
- aws-cloudfront-signed-cookies ==0.2.0.1
|
||||
- aws-lambda-haskell-runtime ==2.0.1
|
||||
- backprop ==0.2.6.2
|
||||
- backprop ==0.2.6.3
|
||||
- bank-holidays-england ==0.2.0.1
|
||||
- barbies ==1.1.3.0
|
||||
- barrier ==0.1.1
|
||||
|
@ -224,7 +224,7 @@ default-package-overrides:
|
|||
- boolean-like ==0.1.1.0
|
||||
- boolean-normal-forms ==0.0.1
|
||||
- boolsimplifier ==0.1.8
|
||||
- boots ==0.0.3
|
||||
- boots ==0.0.100
|
||||
- bordacount ==0.1.0.0
|
||||
- boring ==0.1.2
|
||||
- both ==0.1.1.0
|
||||
|
@ -309,7 +309,7 @@ default-package-overrides:
|
|||
- chimera ==0.2.0.0
|
||||
- choice ==0.2.2
|
||||
- chronologique ==0.3.1.1
|
||||
- chronos ==1.0.6
|
||||
- chronos ==1.0.7
|
||||
- chronos-bench ==0.2.0.2
|
||||
- chunked-data ==0.3.1
|
||||
- cipher-aes ==0.2.11
|
||||
|
@ -601,7 +601,7 @@ default-package-overrides:
|
|||
- ENIG ==0.0.1.0
|
||||
- entropy ==0.4.1.4
|
||||
- enummapset ==0.6.0.2
|
||||
- enumset ==0.0.4.1
|
||||
- enumset ==0.0.5
|
||||
- enum-subset-generate ==0.1.0.0
|
||||
- enum-text ==0.5.1.0
|
||||
- enum-text-rio ==1.2.0.0
|
||||
|
@ -646,7 +646,7 @@ default-package-overrides:
|
|||
- failable ==1.2.2.0
|
||||
- fakedata ==0.2.2
|
||||
- farmhash ==0.1.0.5
|
||||
- fast-builder ==0.1.0.1
|
||||
- fast-builder ==0.1.1.0
|
||||
- fast-digits ==0.2.1.0
|
||||
- fast-logger ==2.4.16
|
||||
- fast-math ==1.0.2
|
||||
|
@ -793,7 +793,7 @@ default-package-overrides:
|
|||
- gi-gtk-hs ==0.3.8.0
|
||||
- gi-gtksource ==3.0.22
|
||||
- gi-javascriptcore ==4.0.21
|
||||
- ginger ==0.9.0.0
|
||||
- ginger ==0.9.1.0
|
||||
- gingersnap ==0.3.1.0
|
||||
- gi-pango ==1.0.22
|
||||
- githash ==0.1.3.1
|
||||
|
@ -918,14 +918,14 @@ default-package-overrides:
|
|||
- hlibgit2 ==0.18.0.16
|
||||
- hlibsass ==0.1.8.0
|
||||
- hmatrix ==0.20.0.0
|
||||
- hmatrix-backprop ==0.1.2.5
|
||||
- hmatrix-backprop ==0.1.3.0
|
||||
- hmatrix-gsl ==0.19.0.1
|
||||
- hmatrix-gsl-stats ==0.4.1.8
|
||||
- hmatrix-morpheus ==0.1.1.2
|
||||
- hmatrix-vector-sized ==0.1.1.3
|
||||
- hmatrix-vector-sized ==0.1.2.0
|
||||
- hmm-lapack ==0.4
|
||||
- hmpfr ==0.4.4
|
||||
- hoauth2 ==1.8.8
|
||||
- hoauth2 ==1.8.9
|
||||
- Hoed ==0.5.1
|
||||
- hOpenPGP ==2.8
|
||||
- hopenpgp-tools ==0.21.3
|
||||
|
@ -1039,7 +1039,7 @@ default-package-overrides:
|
|||
- hw-hedgehog ==0.1.0.3
|
||||
- hw-hspec-hedgehog ==0.1.0.7
|
||||
- hw-int ==0.0.0.3
|
||||
- hw-ip ==2.3.1.2
|
||||
- hw-ip ==2.3.4.1
|
||||
- hw-json ==1.0.0.2
|
||||
- hw-json-simd ==0.1.0.2
|
||||
- hw-mquery ==0.2.0.1
|
||||
|
@ -1214,7 +1214,7 @@ default-package-overrides:
|
|||
- lens-regex-pcre ==0.3.1.0
|
||||
- lens-simple ==0.1.0.9
|
||||
- lens-typelevel ==0.1.1.0
|
||||
- lenz ==0.3.0.0
|
||||
- lenz ==0.3.1.0
|
||||
- leveldb-haskell ==0.6.5
|
||||
- libffi ==0.1
|
||||
- libgit ==0.3.1
|
||||
|
@ -1371,7 +1371,7 @@ default-package-overrides:
|
|||
- monoid-extras ==0.5
|
||||
- monoid-subclasses ==0.4.6.1
|
||||
- monoid-transformer ==0.0.4
|
||||
- mono-traversable ==1.0.11.0
|
||||
- mono-traversable ==1.0.12.0
|
||||
- mono-traversable-instances ==0.1.0.0
|
||||
- mono-traversable-keys ==0.1.0
|
||||
- more-containers ==0.2.1.2
|
||||
|
@ -1742,7 +1742,7 @@ default-package-overrides:
|
|||
- reflection ==2.1.4
|
||||
- RefSerialize ==0.4.0
|
||||
- regex ==1.0.2.0
|
||||
- regex-applicative ==0.3.3
|
||||
- regex-applicative ==0.3.3.1
|
||||
- regex-applicative-text ==0.1.0.1
|
||||
- regex-base ==0.93.2
|
||||
- regex-compat ==0.95.1
|
||||
|
@ -1808,9 +1808,9 @@ default-package-overrides:
|
|||
- safe-json ==0.1.0
|
||||
- safe-money ==0.9
|
||||
- SafeSemaphore ==0.10.1
|
||||
- salak ==0.3.3.1
|
||||
- salak-toml ==0.3.3
|
||||
- salak-yaml ==0.3.3
|
||||
- salak ==0.3.4.1
|
||||
- salak-toml ==0.3.4.1
|
||||
- salak-yaml ==0.3.4.1
|
||||
- saltine ==0.1.0.2
|
||||
- salve ==1.0.6
|
||||
- sample-frame ==0.0.3
|
||||
|
@ -2126,7 +2126,7 @@ default-package-overrides:
|
|||
- th-expand-syns ==0.4.4.0
|
||||
- th-extras ==0.0.0.4
|
||||
- th-lift ==0.8.0.1
|
||||
- th-lift-instances ==0.1.13
|
||||
- th-lift-instances ==0.1.14
|
||||
- th-nowq ==0.1.0.3
|
||||
- th-orphans ==0.13.7
|
||||
- th-printf ==0.6.0
|
||||
|
@ -2320,7 +2320,7 @@ default-package-overrides:
|
|||
- wai-cors ==0.2.7
|
||||
- wai-enforce-https ==0.0.1
|
||||
- wai-eventsource ==3.0.0
|
||||
- wai-extra ==3.0.27
|
||||
- wai-extra ==3.0.28
|
||||
- wai-handler-launch ==3.0.2.4
|
||||
- wai-logger ==2.3.5
|
||||
- wai-middleware-auth ==0.1.2.1
|
||||
|
@ -2428,7 +2428,7 @@ default-package-overrides:
|
|||
- yesod-auth-hashdb ==1.7.1.1
|
||||
- yesod-auth-oauth2 ==0.6.1.1
|
||||
- yesod-bin ==1.6.0.3
|
||||
- yesod-core ==1.6.14
|
||||
- yesod-core ==1.6.15
|
||||
- yesod-csp ==0.2.5.0
|
||||
- yesod-eventsource ==1.6.0
|
||||
- yesod-fb ==0.5.0
|
||||
|
@ -2442,7 +2442,7 @@ default-package-overrides:
|
|||
- yesod-recaptcha2 ==0.3.0
|
||||
- yesod-sitemap ==1.6.0
|
||||
- yesod-static ==1.6.0.1
|
||||
- yesod-test ==1.6.6.1
|
||||
- yesod-test ==1.6.6.2
|
||||
- yesod-text-markdown ==0.1.10
|
||||
- yesod-websockets ==0.3.0.2
|
||||
- yes-precure5-command ==5.5.3
|
||||
|
|
1843
pkgs/development/haskell-modules/hackage-packages.nix
generated
1843
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
@ -12,4 +12,44 @@ self: super: {
|
|||
|
||||
# https://github.com/channable/vaultenv/issues/1
|
||||
vaultenv = self.callPackage ../tools/haskell/vaultenv { };
|
||||
|
||||
cabal-install-3 = (self.callPackage
|
||||
({ mkDerivation, array, async, base, base16-bytestring, binary
|
||||
, bytestring, Cabal, containers, cryptohash-sha256, deepseq
|
||||
, directory, echo, edit-distance, filepath, hackage-security
|
||||
, hashable, HTTP, mtl, network, network-uri, parsec, pretty
|
||||
, process, random, resolv, stdenv, stm, tar, text, time, unix, zlib
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "cabal-install";
|
||||
version = "3.0.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "haskell";
|
||||
repo = "cabal";
|
||||
rev = "b0e52fa173573705e861b129d9675e59de891e46";
|
||||
sha256 = "1fbph6crsn9ji8ps1k8dsxvgqn38rp4ffvv6nia1y7rbrdv90ass";
|
||||
};
|
||||
postUnpack = "sourceRoot+=/cabal-install";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
setupHaskellDepends = [ base Cabal filepath process ];
|
||||
executableHaskellDepends = [
|
||||
array async base base16-bytestring binary bytestring Cabal
|
||||
containers cryptohash-sha256 deepseq directory echo edit-distance
|
||||
filepath hackage-security hashable HTTP mtl network network-uri
|
||||
parsec pretty process random resolv stm tar text time unix zlib
|
||||
];
|
||||
doCheck = false;
|
||||
postInstall = ''
|
||||
mkdir $out/etc
|
||||
mv bash-completion $out/etc/bash_completion.d
|
||||
'';
|
||||
homepage = "http://www.haskell.org/cabal/";
|
||||
description = "The command-line interface for Cabal and Hackage";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {}).overrideScope (self: super: {
|
||||
Cabal = self.Cabal_3_0_0_0;
|
||||
});
|
||||
|
||||
}
|
||||
|
|
|
@ -52,6 +52,7 @@
|
|||
, bzip2 ? null
|
||||
, celt ? null # CELT decoder
|
||||
#, crystalhd ? null # Broadcom CrystalHD hardware acceleration
|
||||
, dav1d ? null # AV1 decoder (focused on speed and correctness)
|
||||
#, decklinkExtlib ? false, blackmagic-design-desktop-video ? null # Blackmagic Design DeckLink I/O support
|
||||
, fdkaacExtlib ? false, fdk_aac ? null # Fraunhofer FDK AAC de/encoder
|
||||
#, flite ? null # Flite (voice synthesis) support
|
||||
|
@ -97,7 +98,7 @@
|
|||
, libXv ? null # Xlib support
|
||||
, libXext ? null # Xlib support
|
||||
, lzma ? null # xz-utils
|
||||
, nvenc ? !stdenv.isDarwin, nv-codec-headers ? null # NVIDIA NVENC support
|
||||
, nvenc ? !stdenv.isDarwin && !stdenv.isAarch64, nv-codec-headers ? null # NVIDIA NVENC support
|
||||
, openal ? null # OpenAL 1.1 capture support
|
||||
#, opencl ? null # OpenCL code
|
||||
, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
|
||||
|
@ -163,6 +164,9 @@
|
|||
* libvpx(stable 1.3.0) openal openjpeg pulseaudio rtmpdump samba vid-stab
|
||||
* wavpack x265 xavs
|
||||
*
|
||||
* Need fixes to support AArch64:
|
||||
* libmfx(intel-media-sdk) nvenc
|
||||
*
|
||||
* Not supported:
|
||||
* stagefright-h264(android only)
|
||||
*
|
||||
|
@ -175,7 +179,7 @@
|
|||
*/
|
||||
|
||||
let
|
||||
inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux;
|
||||
inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux isAarch64;
|
||||
inherit (stdenv.lib) optional optionals optionalString enableFeature;
|
||||
in
|
||||
|
||||
|
@ -234,17 +238,14 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ffmpeg-full-${version}";
|
||||
version = "4.1.4";
|
||||
version = "4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
|
||||
sha256 = "1qd7a10gs12ifcp31gramcgqjl77swskjfp7cijibgyg5yl4kw7i";
|
||||
sha256 = "1mgcxm7sqkajx35px05szsmn9mawwm03cfpmk3br7bcp3a1i0gq2";
|
||||
};
|
||||
patches = [(fetchpatch { # remove on update
|
||||
name = "fix-hardcoded-tables.diff";
|
||||
url = "http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/c8232e50074f";
|
||||
sha256 = "0jlksks4fjajby8fjk7rfp414gxfdgd6q9khq26i52xvf4kg2dw6";
|
||||
})];
|
||||
|
||||
patches = [ ./prefer-libdav1d-over-libaom.patch ];
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs .
|
||||
|
@ -327,6 +328,7 @@ stdenv.mkDerivation rec {
|
|||
(enableFeature (bzip2 != null) "bzlib")
|
||||
(enableFeature (celt != null) "libcelt")
|
||||
#(enableFeature crystalhd "crystalhd")
|
||||
(enableFeature (dav1d != null) "libdav1d")
|
||||
#(enableFeature decklinkExtlib "decklink")
|
||||
(enableFeature (fdkaacExtlib && gplLicensing) "libfdk-aac")
|
||||
#(enableFeature (flite != null) "libflite")
|
||||
|
@ -351,7 +353,7 @@ stdenv.mkDerivation rec {
|
|||
(enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394")
|
||||
(enableFeature (libiconv != null) "iconv")
|
||||
#(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883")
|
||||
(enableFeature (if isLinux then libmfx != null else false) "libmfx")
|
||||
(enableFeature (if isLinux && !isAarch64 then libmfx != null else false) "libmfx")
|
||||
(enableFeature (libmodplug != null) "libmodplug")
|
||||
(enableFeature (libmysofa != null) "libmysofa")
|
||||
#(enableFeature (libnut != null) "libnut")
|
||||
|
@ -414,7 +416,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ perl pkgconfig texinfo yasm ];
|
||||
|
||||
buildInputs = [
|
||||
bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
|
||||
bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
|
||||
libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa
|
||||
libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11
|
||||
libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr
|
||||
|
@ -424,7 +426,7 @@ stdenv.mkDerivation rec {
|
|||
++ optionals nonfreeLicensing [ fdk_aac openssl ]
|
||||
++ optional ((isLinux || isFreeBSD) && libva != null) libva
|
||||
++ optionals isLinux [ alsaLib libraw1394 libv4l ]
|
||||
++ optional (isLinux && libmfx != null) libmfx
|
||||
++ optional (isLinux && !isAarch64 && libmfx != null) libmfx
|
||||
++ optional nvenc nv-codec-headers
|
||||
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
|
||||
MediaToolbox VideoDecodeAcceleration
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
|
||||
index d2f9a39ce5..2342399a8e 100644
|
||||
--- a/libavcodec/allcodecs.c
|
||||
+++ b/libavcodec/allcodecs.c
|
||||
@@ -679,13 +679,13 @@ extern AVCodec ff_pcm_mulaw_at_encoder;
|
||||
extern AVCodec ff_pcm_mulaw_at_decoder;
|
||||
extern AVCodec ff_qdmc_at_decoder;
|
||||
extern AVCodec ff_qdm2_at_decoder;
|
||||
+extern AVCodec ff_libdav1d_decoder;
|
||||
extern AVCodec ff_libaom_av1_decoder;
|
||||
extern AVCodec ff_libaom_av1_encoder;
|
||||
extern AVCodec ff_libaribb24_decoder;
|
||||
extern AVCodec ff_libcelt_decoder;
|
||||
extern AVCodec ff_libcodec2_encoder;
|
||||
extern AVCodec ff_libcodec2_decoder;
|
||||
-extern AVCodec ff_libdav1d_decoder;
|
||||
extern AVCodec ff_libdavs2_decoder;
|
||||
extern AVCodec ff_libfdk_aac_encoder;
|
||||
extern AVCodec ff_libfdk_aac_decoder;
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.22.0";
|
||||
version = "1.23.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
|
||||
name = "grpc-${version}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
sha256 = "10wf9sakkxpcvc09n1h91x6slwwhxblghs4zn95klyc4m6py1gfg";
|
||||
sha256 = "14svfy7lvz8lf6b7zg1fbypj2n46n9gq0ldgnv85jm0ikv72cgv6";
|
||||
};
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
|
||||
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with stdenv.lib; {
|
||||
description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.lnl7 ];
|
||||
maintainers = [ maintainers.lnl7 maintainers.marsam ];
|
||||
homepage = https://grpc.io/;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,11 +1,14 @@
|
|||
{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk, darwin }:
|
||||
{ stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk, darwin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "itk-5.0.0";
|
||||
pname = "itk";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/itk/InsightToolkit-5.0.0.tar.xz;
|
||||
sha256 = "0bs63mk4q8jmx38f031jy5w5n9yy5ng9x8ijwinvjyvas8cichqi";
|
||||
src = fetchFromGitHub {
|
||||
owner = "InsightSoftwareConsortium";
|
||||
repo = "ITK";
|
||||
rev = "v${version}";
|
||||
sha256 = "0dcjsn5frjnrphfgw8alnd2ahrvicpx2a2ngb5ixaa9anaicz9z1";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{stdenv, fetchurl, libusb}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
with stdenv; mkDerivation rec {
|
||||
name = "libftdi-0.20";
|
||||
|
||||
src = fetchurl {
|
||||
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Hack to avoid TMPDIR in RPATHs.
|
||||
preFixup = ''rm -rf "$(pwd)" '';
|
||||
configureFlags = [ "--with-async-mode" ];
|
||||
configureFlags = lib.optional (!isDarwin) [ "--with-async-mode" ];
|
||||
|
||||
# allow async mode. from ubuntu. see:
|
||||
# https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff
|
||||
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "A library to talk to FTDI chips using libusb";
|
||||
homepage = https://www.intra2net.com/en/developer/libftdi/;
|
||||
license = stdenv.lib.licenses.lgpl21;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = lib.licenses.lgpl21;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,44 +1,32 @@
|
|||
{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobject-introspection, gtk-doc, docbook_xsl
|
||||
, glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null
|
||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, gobject-introspection, gtk-doc, docbook_xsl
|
||||
, glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, substituteAll
|
||||
, vala ? null
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libosinfo";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "12b0xj9fz9q91d1pz9xm6aqap5k1ip0m9m3qvqmwjy1lk1kjasdz";
|
||||
sha256 = "1iwh35mahch1ls3sgq7wz8kamxrxisrff5ciqzyh2qxlrqf5qf1w";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig vala intltool gobject-introspection gtk-doc docbook_xsl
|
||||
pkgconfig vala gettext gobject-introspection gtk-doc docbook_xsl
|
||||
];
|
||||
buildInputs = [ glib libsoup libxml2 libxslt ];
|
||||
checkInputs = [ check curl perl ];
|
||||
|
||||
patches = [
|
||||
./osinfo-db-data-dir.patch
|
||||
# https://nvd.nist.gov/vuln/detail/CVE-2019-13313
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/libosinfo/libosinfo/commit/3654abee6ead9f11f8bb9ba8fc71efd6fa4dabbc.patch";
|
||||
name = "CVE-2019-13313-1.patch";
|
||||
sha256 = "1lybywfj6b41zfjk33ap90bab5l84lf5y3kif7vd2b6wq5r91rcn";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/libosinfo/libosinfo/commit/08fb8316b4ac42fe74c1fa5ca0ac593222cdf81a.patch";
|
||||
name = "CVE-2019-13313-2.patch";
|
||||
sha256 = "1f6rhkrgy3j8nmidk97wnz6p35zs1dsd63d3np76q7qs7ra74w9z";
|
||||
(substituteAll {
|
||||
src = ./osinfo-db-data-dir.patch;
|
||||
osinfo_db_data_dir = "${osinfo-db}/share";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
substituteInPlace osinfo/osinfo_loader.c --subst-var-by OSINFO_DB_DATA_DIR "${osinfo-db}/share"
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-usb-ids-path=${hwdata}/share/hwdata/usb.ids"
|
||||
"--with-pci-ids-path=${hwdata}/share/hwdata/pci.ids"
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
path = g_getenv("OSINFO_SYSTEM_DIR");
|
||||
if (!path)
|
||||
- path = DATA_DIR "/osinfo";
|
||||
+ path = "@OSINFO_DB_DATA_DIR@/osinfo";
|
||||
+ path = "@osinfo_db_data_dir@/osinfo";
|
||||
|
||||
file = g_file_new_for_path(path);
|
||||
}
|
||||
|
|
|
@ -1,25 +1,65 @@
|
|||
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, libuuid, gobject-introspection, gtk-doc, shared-mime-info, python3, docbook_xsl, docbook_xml_dtd_43 }:
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, docbook_xml_dtd_43
|
||||
, docbook_xsl
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gtk-doc
|
||||
, libuuid
|
||||
, meson
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, python3
|
||||
, shared-mime-info
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libxmlb-${version}";
|
||||
version = "0.1.10";
|
||||
pname = "libxmlb";
|
||||
version = "0.1.11";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "devdoc" ];
|
||||
outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hughsie";
|
||||
repo = "libxmlb";
|
||||
rev = version;
|
||||
sha256 = "1ismh3bdwd0l1fjlhwycam89faxjmpb0wxqlbv58m0z6cxykp6rd";
|
||||
sha256 = "1503v76w7543snqyjxykiqa5va62zb0ccn3jlw0gpdx8973v80mr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja python3 pkgconfig gobject-introspection gtk-doc shared-mime-info docbook_xsl docbook_xml_dtd_43 ];
|
||||
patches = [
|
||||
# Fix installed tests
|
||||
# https://github.com/hughsie/libxmlb/pull/2
|
||||
(fetchpatch {
|
||||
url = "https://github.com/hughsie/libxmlb/commit/78850c8b0f644f729fa21e2bf9ebed0d9d6010f3.diff";
|
||||
sha256 = "0zw7c6vy8hscln7za7ijqd9svirach3zdskvbzyxxcsm3xcwxpjm";
|
||||
})
|
||||
|
||||
buildInputs = [ glib libuuid ];
|
||||
./installed-tests-path.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
docbook_xml_dtd_43
|
||||
docbook_xsl
|
||||
gobject-introspection
|
||||
gtk-doc
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
(python3.withPackages (pkgs: with pkgs; [ setuptools ]))
|
||||
shared-mime-info
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
libuuid
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"--libexecdir=${placeholder "out"}/libexec"
|
||||
"-Dgtkdoc=true"
|
||||
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
|
@ -28,6 +68,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
installed-tests = nixosTests.libxmlb;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A library to help create and query binary XML blobs";
|
||||
homepage = https://github.com/hughsie/libxmlb;
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
diff --git a/meson.build b/meson.build
|
||||
index b064cb8..1a470cf 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -103,8 +103,8 @@
|
||||
|
||||
libexecdir = join_paths(prefix, get_option('libexecdir'))
|
||||
datadir = join_paths(prefix, get_option('datadir'))
|
||||
-installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name())
|
||||
-installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name())
|
||||
+installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
|
||||
+installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())
|
||||
|
||||
gio = dependency('gio-2.0', version : '>= 2.45.8')
|
||||
uuid = dependency('uuid')
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 27e8cb6..74548ae 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -2,3 +2,4 @@
|
||||
option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data')
|
||||
option('tests', type : 'boolean', value : true, description : 'enable tests')
|
||||
option('stemmer', type : 'boolean', value : false, description : 'enable stemmer support')
|
||||
+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')
|
|
@ -1,12 +1,19 @@
|
|||
{ stdenv, fetchurl, fixDarwinDylibNames, oracle-instantclient, libaio }:
|
||||
{ stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "odpic-${version}";
|
||||
version = "3.1.0";
|
||||
let
|
||||
version = "3.2.1";
|
||||
libPath = stdenv.lib.makeLibraryPath [ oracle-instantclient.lib ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oracle/odpi/archive/v${version}.tar.gz";
|
||||
sha256 = "0m6g7lbvfir4amf2cnap9wz9fmqrihqpihd84igrd7fp076894c0";
|
||||
in stdenv.mkDerivation {
|
||||
inherit version;
|
||||
|
||||
pname = "odpic";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oracle";
|
||||
repo = "odpi";
|
||||
rev = "v${version}";
|
||||
sha256 = "1f9gznc7h73cgx32p55rkhzla6l7l9dg53ilwh6zdgdqlp7n018i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ];
|
||||
|
@ -14,15 +21,12 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ oracle-instantclient ]
|
||||
++ stdenv.lib.optionals stdenv.isLinux [ libaio ];
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath
|
||||
[ oracle-instantclient ];
|
||||
|
||||
dontPatchELF = true;
|
||||
makeFlags = [ "PREFIX=$(out)" "CC=cc" "LD=cc"];
|
||||
|
||||
postFixup = ''
|
||||
${stdenv.lib.optionalString (stdenv.isLinux) ''
|
||||
patchelf --set-rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary})" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
''}
|
||||
${stdenv.lib.optionalString (stdenv.isDarwin) ''
|
||||
install_name_tool -add_rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
|
|
|
@ -1,71 +1,126 @@
|
|||
{ stdenv, requireFile, autoPatchelfHook, fixDarwinDylibNames, unzip, libaio, makeWrapper, odbcSupport ? false, unixODBC }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, requireFile
|
||||
, autoPatchelfHook
|
||||
, fixDarwinDylibNames
|
||||
, unzip
|
||||
, libaio
|
||||
, makeWrapper
|
||||
, odbcSupport ? true
|
||||
, unixODBC
|
||||
}:
|
||||
|
||||
assert odbcSupport -> unixODBC != null;
|
||||
|
||||
let
|
||||
inherit (stdenv.lib) optional optionals optionalString;
|
||||
|
||||
baseVersion = "12.2";
|
||||
version = "${baseVersion}.0.1.0";
|
||||
|
||||
requireSource = component: arch: version: rel: hash: (requireFile rec {
|
||||
name = "instantclient-${component}-${arch}-${version}" + (optionalString (rel != "") "-${rel}") + ".zip";
|
||||
url = "http://www.oracle.com/technetwork/database/database-technologies/instant-client/downloads/index.html";
|
||||
sha256 = hash;
|
||||
});
|
||||
|
||||
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
||||
|
||||
# assemble list of components
|
||||
components = [ "basic" "sdk" "sqlplus" ] ++ optional odbcSupport "odbc";
|
||||
|
||||
# determine the version number, there might be different ones per architecture
|
||||
version = {
|
||||
"x86_64-linux" = "19.3.0.0.0";
|
||||
"x86_64-darwin" = "18.1.0.0.0";
|
||||
}."${stdenv.hostPlatform.system}" or throwSystem;
|
||||
|
||||
# hashes per component and architecture
|
||||
hashes = {
|
||||
"x86_64-linux" = {
|
||||
"basic" = "1yk4ng3a9ka1mzgfph9br6rwclagbgfvmg6kja11nl5dapxdzaxy";
|
||||
"sdk" = "115v1gqr0czy7dcf2idwxhc6ja5b0nind0mf1rn8iawgrw560l99";
|
||||
"sqlplus" = "0zj5h84ypv4n4678kfix6jih9yakb277l9hc0819iddc0a5slbi5";
|
||||
"odbc" = "1g1z6pdn76dp440fh49pm8ijfgjazx4cvxdi665fsr62h62xkvch";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
"basic" = "fac3cdaaee7526f6c50ff167edb4ba7ab68efb763de24f65f63fb48cc1ba44c0";
|
||||
"sdk" = "98e6d797f1ce11e59b042b232f62380cec29ec7d5387b88a9e074b741c13e63a";
|
||||
"sqlplus" = "02e66dc52398fced75e7efcb6b4372afcf617f7d88344fb7f0f4bb2bed371f3b";
|
||||
"odbc" = "5d0cdd7f9dd2e27affbc9b36ef9fc48e329713ecd36905fdd089366e365ae8a2";
|
||||
};
|
||||
}."${stdenv.hostPlatform.system}" or throwSystem;
|
||||
|
||||
# rels per component and architecture, optional
|
||||
rels = {
|
||||
"x86_64-darwin" = {
|
||||
"sdk" = "2";
|
||||
};
|
||||
}."${stdenv.hostPlatform.system}" or {};
|
||||
|
||||
# convert platform to oracle architecture names
|
||||
arch = {
|
||||
"x86_64-linux" = "linux.x64";
|
||||
"x86_64-darwin" = "macos.x64";
|
||||
}."${stdenv.hostPlatform.system}" or throwSystem;
|
||||
|
||||
srcs = {
|
||||
"x86_64-linux" = [
|
||||
(requireSource "basic" arch version "" "5015e3c9fba84e009f7519893f798a1622c37d1ae2c55104ff502c52a0fe5194")
|
||||
(requireSource "sdk" arch version "" "7f404c3573c062ce487a51ac4cfe650c878d7edf8e73b364ec852645ed1098cb")
|
||||
(requireSource "sqlplus" arch version "" "d49b2bd97376591ca07e7a836278933c3f251875c215044feac73ba9f451dfc2") ]
|
||||
++ optional odbcSupport (requireSource "odbc" arch version "2" "365a4ae32c7062d9fbc3fb41add748e7881f774484a175a4b41a2c294ce9095d");
|
||||
"x86_64-darwin" = [
|
||||
(requireSource "basic" arch version "2" "3ed3102e5a24f0da638694191edb34933309fb472eb1df21ad5c86eedac3ebb9")
|
||||
(requireSource "sdk" arch version "2" "e0befca9c4e71ebc9f444957ffa70f01aeeec5976ea27c40406471b04c34848b")
|
||||
(requireSource "sqlplus" arch version "2" "d147cbb5b2a954fdcb4b642df4f0bd1153fd56e0f56e7fa301601b4f7e2abe0e") ]
|
||||
++ optional odbcSupport (requireSource "odbc" arch version "2" "1805c1ab6c8c5e8df7bdcc35d7f2b94c329ecf4dff9bde55d5f9b159ecd8b64e");
|
||||
}."${stdenv.hostPlatform.system}" or throwSystem;
|
||||
# calculate the filename of a single zip file
|
||||
srcFilename = component: arch: version: rel:
|
||||
"instantclient-${component}-${arch}-${version}" +
|
||||
(optionalString (rel != "") "-${rel}") +
|
||||
(optionalString (arch == "linux.x64") "dbru") + # ¯\_(ツ)_/¯
|
||||
".zip";
|
||||
|
||||
# fetcher for the clickthrough artifacts (requiring manual download)
|
||||
fetchClickThrough = srcFilename: hash: (requireFile {
|
||||
name = srcFilename;
|
||||
url = "https://www.oracle.com/database/technologies/instant-client/downloads.html";
|
||||
sha256 = hash;
|
||||
});
|
||||
|
||||
# fetcher for the non clickthrough artifacts
|
||||
fetchSimple = srcFilename: hash: fetchurl {
|
||||
url = "https://download.oracle.com/otn_software/linux/instantclient/193000/${srcFilename}";
|
||||
sha256 = hash;
|
||||
};
|
||||
|
||||
# pick the appropriate fetcher depending on the platform
|
||||
fetcher = if stdenv.hostPlatform.system == "x86_64-linux" then fetchSimple else fetchClickThrough;
|
||||
|
||||
# assemble srcs
|
||||
srcs = map (component:
|
||||
(fetcher (srcFilename component arch version rels."${component}" or "") hashes."${component}" or ""))
|
||||
components;
|
||||
|
||||
pname = "oracle-instantclient";
|
||||
extLib = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit version srcs;
|
||||
name = "oracle-instantclient-${version}";
|
||||
in stdenv.mkDerivation {
|
||||
inherit pname version srcs;
|
||||
|
||||
buildInputs = [ stdenv.cc.cc.lib ]
|
||||
++ optionals (stdenv.isLinux) [ libaio ]
|
||||
++ optional stdenv.isLinux libaio
|
||||
++ optional odbcSupport unixODBC;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ]
|
||||
++ optional stdenv.isLinux autoPatchelfHook
|
||||
++ optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
outputs = [ "out" "dev" "lib"];
|
||||
|
||||
unpackCmd = "unzip $curSrc";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/"{bin,include,lib,"share/java","share/${name}/demo/"}
|
||||
install -Dm755 {sqlplus,adrci,genezi} $out/bin
|
||||
${optionalString stdenv.isDarwin ''
|
||||
for exe in "$out/bin/"* ; do
|
||||
install_name_tool -add_rpath "$out/lib" "$exe"
|
||||
done
|
||||
''}
|
||||
ln -sfn $out/bin/sqlplus $out/bin/sqlplus64
|
||||
install -Dm644 *${extLib}* $out/lib
|
||||
mkdir -p "$out/"{bin,include,lib,"share/java","share/${pname}-${version}/demo/"} $lib/lib
|
||||
install -Dm755 {adrci,genezi,uidrvci,sqlplus} $out/bin
|
||||
|
||||
# cp to preserve symlinks
|
||||
cp -P *${extLib}* $lib/lib
|
||||
|
||||
install -Dm644 *.jar $out/share/java
|
||||
install -Dm644 sdk/include/* $out/include
|
||||
install -Dm644 sdk/demo/* $out/share/${name}/demo
|
||||
install -Dm644 sdk/demo/* $out/share/${pname}-${version}/demo
|
||||
|
||||
# PECL::oci8 will not build without this
|
||||
# this symlink only exists in dist zipfiles for some platforms
|
||||
ln -sfn $out/lib/libclntsh${extLib}.12.1 $out/lib/libclntsh${extLib}
|
||||
# provide alias
|
||||
ln -sfn $out/bin/sqlplus $out/bin/sqlplus64
|
||||
'';
|
||||
|
||||
postFixup = optionalString stdenv.isDarwin ''
|
||||
for exe in "$out/bin/"* ; do
|
||||
if [ ! -L "$exe" ]; then
|
||||
install_name_tool -add_rpath "$lib/lib" "$exe"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
@ -1,13 +1,14 @@
|
|||
{ stdenv, fetchurl, cmake, git, swig, lua, itk }:
|
||||
{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk, tcl, tk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simpleitk";
|
||||
version = "1.2.0";
|
||||
name = "${pname}-${version}";
|
||||
pname = "simpleitk";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sourceforge.net/projects/${pname}/files/SimpleITK/${version}/Source/SimpleITK-${version}.tar.gz";
|
||||
sha256 = "10lxsr0144li6bmfgs646cvczczqkgmvvs3ndds66q8lg9zwbnky";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SimpleITK";
|
||||
repo = "SimpleITK";
|
||||
rev = "v${version}";
|
||||
sha256 = "1cgq9cxxplv6bkm2zfvcc0lgyh5zw1hbry30k1429n9737wnadaw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake git swig ];
|
||||
|
@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://www.simpleitk.org;
|
||||
description = "Simplified interface to ITK";
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,16 +1,20 @@
|
|||
{ fetchurl, buildPerlPackage, DBI, TestNoWarnings, oracle-instantclient }:
|
||||
{ stdenv, fetchurl, buildPerlPackage, DBI, TestNoWarnings, oracle-instantclient }:
|
||||
|
||||
buildPerlPackage {
|
||||
pname = "DBD-Oracle";
|
||||
version = "1.76";
|
||||
version = "1.80";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/Z/ZA/ZARQUON/DBD-Oracle-1.76.tar.gz;
|
||||
sha256 = "b6db7f43c6252179274cfe99c1950b93e248f8f0fe35b07e50388c85d814d5f3";
|
||||
sha256 = "1wym2kc8b31qa1zb0dgyy3w4iqlk1faw36gy9hkpj895qr1pznxn";
|
||||
};
|
||||
|
||||
ORACLE_HOME = "${oracle-instantclient}/lib";
|
||||
ORACLE_HOME = "${oracle-instantclient.lib}/lib";
|
||||
|
||||
buildInputs = [ TestNoWarnings oracle-instantclient ] ;
|
||||
propagatedBuildInputs = [ DBI ];
|
||||
|
||||
postBuild = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -add_rpath "${oracle-instantclient.lib}/lib" blib/arch/auto/DBD/Oracle/Oracle.bundle
|
||||
'';
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cx_Oracle";
|
||||
version = "7.1.3";
|
||||
version = "7.2.2";
|
||||
|
||||
buildInputs = [ odpic ];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4f26b7418e2796112f8b36338a2f9a7c07dd08df53d857e3478bb53f61dd52e4";
|
||||
sha256 = "1kp6fgyln0jkdbjm20h6rhybsmvqjj847frhsndyfvkf38m32ss0";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpcio-tools";
|
||||
version = "1.22.0";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b5c0fe51a155625c9d1132ab8deb56b3015e111a6961e48aeb9dd89bd7c670ab";
|
||||
sha256 = "cbc35031ec2b29af36947d085a7fbbcd8b79b84d563adf6156103d82565f78db";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpcio";
|
||||
version = "1.22.0";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "093w8mgvl8ylqlqnfz06ijkmlnkxcjszf9zg6k5ybjw7dwal0jhz";
|
||||
sha256 = "18hf794frncqvq3n4j5n8kip0gp6ch4pf5b3n6809q0c1paf6rp5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython pkgconfig ]
|
||||
|
|
|
@ -38,7 +38,10 @@ buildPythonPackage rec {
|
|||
checkPhase = ''
|
||||
pytest tests -k "not test_ssl_in_static_libs \
|
||||
and not test_keyfunction \
|
||||
and not test_keyfunction_bogus_return"
|
||||
and not test_keyfunction_bogus_return \
|
||||
and not test_libcurl_ssl_gnutls \
|
||||
and not test_libcurl_ssl_nss \
|
||||
and not test_libcurl_ssl_openssl"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy27
|
||||
, graphviz
|
||||
, mock
|
||||
, pyparsing
|
||||
, pytest
|
||||
, unittest2
|
||||
, pkgs
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -16,19 +15,22 @@ buildPythonPackage rec {
|
|||
sha256 = "8c8073b97aa7030c28118961e2c6c92f046e4cb57aeba7df87146f7baa6530c5";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest unittest2 ];
|
||||
propagatedBuildInputs = [ pkgs.graphviz pyparsing ];
|
||||
propagatedBuildInputs = [ graphviz pyparsing ];
|
||||
|
||||
checkInputs = [
|
||||
graphviz
|
||||
mock
|
||||
pytest
|
||||
] ++ lib.optionals isPy27 [ unittest2];
|
||||
|
||||
checkPhase = ''
|
||||
mkdir test/my_tests
|
||||
py.test test
|
||||
pytest
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://pypi.python.org/pypi/pydot-ng";
|
||||
description = "Python 3-compatible update of pydot, a Python interface to Graphviz's Dot";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.bcdarwin ];
|
||||
maintainers = with maintainers; [ bcdarwin jonringer ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.105.2";
|
||||
version = "0.106.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "1zvg4yz9rpibvai66lb781qivgx9gr8222z3dix673dns06rd4nf";
|
||||
sha256 = "0da32j8s3avxa84g2gn9sr4nakibllz1kq5i3bgqbndrgcgsdvgw";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tflint";
|
||||
version = "0.9.3";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wata727";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "10saljrman41pjmjhbzan8jw8jbz069yhcf6vvzxmw763x5s3n85";
|
||||
sha256 = "0x9kh0bvbil6z09v41gzk5sdiprqg288jfcjw1n2x809sj7c6vhf";
|
||||
};
|
||||
|
||||
modSha256 = "0zfgyv1m7iay3brkqmh35gw1giyr3i3ja56dh4kgm6ai4z1jmvgc";
|
||||
modSha256 = "0wig41m81kmy7l6sj6kk4ryc3m1b18n2vlf80x0bbhn46kyfnbgr";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
|
||||
|
||||
let
|
||||
version = "12.1.0";
|
||||
version = "12.2.0";
|
||||
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
|
||||
docker_x86_64 = fetchurl {
|
||||
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
|
||||
sha256 = "1yx530h5rz7wmd012962f9dfj0hvj1m7zab5vchndna4svzzycch";
|
||||
sha256 = "0r0jy571dxcspsl0q31wyw4017rfq7i4rxsgf83jqdjqaigas8dk";
|
||||
};
|
||||
|
||||
docker_arm = fetchurl {
|
||||
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
|
||||
sha256 = "0zsin76qiq46w675wdkaz3ng1i9szad3hzmk5dngdnr59gq5mqhk";
|
||||
sha256 = "1pbzyfvfgwp9r67a148nr4gh2p9lrmnn4hxap37abb5q5209pjir";
|
||||
};
|
||||
in
|
||||
buildGoPackage rec {
|
||||
|
@ -29,7 +29,7 @@ buildGoPackage rec {
|
|||
owner = "gitlab-org";
|
||||
repo = "gitlab-runner";
|
||||
rev = "v${version}";
|
||||
sha256 = "0npjgarbwih8j2ih1mshwyp4nj9h15phvg61kifh63p9mf4r63nn";
|
||||
sha256 = "0id0ivysn0396dwi357iig28d4xr2wd7q05r6ksgml8xyfijdgd3";
|
||||
};
|
||||
|
||||
patches = [ ./fix-shell-path.patch ];
|
||||
|
|
|
@ -1,12 +1,18 @@
|
|||
{ stdenv, fetchurl, makeWrapper, jre }:
|
||||
|
||||
let
|
||||
zshCompletion = version: fetchurl {
|
||||
url = "https://raw.githubusercontent.com/coursier/coursier/v${version}/modules/cli/src/main/resources/completions/zsh";
|
||||
sha256 = "0gfr1q66crh6si4682xbxnj41igws83qj710npgm2bvq90xa8m49";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "coursier-${version}";
|
||||
version = "1.1.0-M14-6";
|
||||
version = "2.0.0-RC3-3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
|
||||
sha256 = "01q0gz4qnwvnd7mprcm5aj77hrxyr6ax8jp4d9jkqfkg272znaj7";
|
||||
sha256 = "1qrybajwk46h6d1yp6n4zxdvrfl19lqhjsqxbm48vk3wbvj31vyl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -15,6 +21,9 @@ stdenv.mkDerivation rec {
|
|||
install -Dm555 $src $out/bin/coursier
|
||||
patchShebangs $out/bin/coursier
|
||||
wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin
|
||||
|
||||
# copy zsh completion
|
||||
install -Dm755 ${zshCompletion version} $out/share/zsh/site-functions/_coursier
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
@ -4,14 +4,14 @@
|
|||
, lib }:
|
||||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
version = "1.1.1";
|
||||
version = "1.1.4";
|
||||
pname = "fdroidserver";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "fdroid";
|
||||
repo = "fdroidserver";
|
||||
rev = version;
|
||||
sha256 = "0m618rvjh8h8hnbafrxsdkw8m5r2wnkz7whqnh60jh91h3yr0kzs";
|
||||
sha256 = "020b6w2vhqgkpbrc1d08zh6mkh704mqhqqly14hir2bvay9rr9li";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
@ -6,12 +6,12 @@
|
|||
# and IceStorm isn't intended to be used as a library other than by the
|
||||
# nextpnr build process (which is also sped up by using PyPy), so we
|
||||
# use it by default. See 18839e1 for more details.
|
||||
, usePyPy ? stdenv.isx86_64 /* pypy3 seems broken on i686 */
|
||||
, usePyPy ? stdenv.hostPlatform.system == "x86_64-linux"
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "icestorm";
|
||||
version = "2019.08.08";
|
||||
version = "2019.08.15";
|
||||
|
||||
pythonPkg = if usePyPy then pypy3 else python3;
|
||||
pythonInterp = pythonPkg.interpreter;
|
||||
|
@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "cliffordwolf";
|
||||
repo = "icestorm";
|
||||
rev = "2ccae0d3864fd7268118287a85963c0116745cff";
|
||||
sha256 = "1vlk5k7x6c1bjp19niyl0shljj8il94q2brjmda1rwhqxz81g9s7";
|
||||
rev = "95949315364f8d9b0c693386aefadf44b28e2cf6";
|
||||
sha256 = "05q1vxlf9l5z9mam8jbv58jqj7nsd8v7ssy753sharpgzzgdc8a2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = http://www.clifford.at/icestorm/;
|
||||
license = stdenv.lib.licenses.isc;
|
||||
maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice emily ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,17 +1,25 @@
|
|||
{ fetchurl, stdenv }:
|
||||
{ fetchurl, stdenv, texinfo, help2man }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gengetopt-2.22.6";
|
||||
pname = "gengetopt";
|
||||
version = "2.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gengetopt/${name}.tar.gz";
|
||||
sha256 = "1xq1kcfs6hri101ss4dhym0jn96z4v6jdvx288mfywadc245mc1h";
|
||||
url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1b44fn0apsgawyqa4alx2qj5hls334mhbszxsy6rfr0q074swhdr";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ texinfo help2man ];
|
||||
|
||||
#Fix, see #28255
|
||||
postPatch = ''
|
||||
sed -e 's/set -o posix/set +o posix/' -i configure
|
||||
substituteInPlace configure --replace \
|
||||
'set -o posix' \
|
||||
'set +o posix'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mkcert";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FiloSottile";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1aadnsx5pfmryf8mgxg9g0i083dm1pmrc6v4ln2mm3n89wwqc9b7";
|
||||
sha256 = "0xcmvzh5lq8vs3b0f1zw645fxdr8471v7prl1656q02v38f58ly7";
|
||||
};
|
||||
|
||||
modSha256 = "0snvvwhyfq01nwgjz55dgd5skpg7z0dzix7sdag90cslbrr983i1";
|
||||
modSha256 = "0an12l15a82mks6gipczdpcf2vklk14wjjnk0ccl3kdjwiw7f4wd";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://github.com/FiloSottile/mkcert;
|
||||
|
|
|
@ -6,10 +6,10 @@ else
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dune";
|
||||
version = "1.11.1";
|
||||
version = "1.11.3";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-build-info-${version}.tbz";
|
||||
sha256 = "0hizfaidl1bxl614i65yvyfhsjbp93y7y9qy1a8zw448w1js5bsp";
|
||||
sha256 = "1lmvsis6dk8mccbwpypz9qdxr134gjhdwshxw6q12mi4x3kn6fn8";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ];
|
||||
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
homepage = "https://dune.build/";
|
||||
description = "A composable build system";
|
||||
maintainers = [ stdenv.lib.maintainers.vbgl ];
|
||||
maintainers = [ stdenv.lib.maintainers.vbgl stdenv.lib.maintainers.marsam ];
|
||||
license = stdenv.lib.licenses.mit;
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
baseName = "scalafmt";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${baseName}-deps-${version}";
|
||||
buildCommand = ''
|
||||
|
@ -13,7 +13,7 @@ let
|
|||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "18mf23ssy4lwvsi4pg6m4b003paz5yds5vs7nhl0bfcq57xg6qj1";
|
||||
outputHash = "1k5qn0w6hqql8yqhlma67ilp8hf0xwxwkzvwg8bkky1jvsapjsl5";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
{ stdenv, fetchFromGitLab, cmake, luajit,
|
||||
{ lib, mkDerivation, fetchFromGitLab, cmake, luajit,
|
||||
SDL2, SDL2_image, SDL2_ttf, physfs,
|
||||
openal, libmodplug, libvorbis, solarus,
|
||||
qtbase, qttools, glm }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "solarus-quest-editor-${version}";
|
||||
version = "1.6.0";
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "solarus-quest-editor";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "solarus-games";
|
||||
repo = "solarus-quest-editor";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1a7816kaljfh9ynzy9g36mqzzv2p800nnbrja73q6vjfrsv3vq4c";
|
||||
sha256 = "0dq94iw9ldl4p83dqcwjs5ilpkvz5jgdk8rbls8pf8b7afpg36rz";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake luajit SDL2
|
||||
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
openal libmodplug libvorbis
|
||||
solarus qtbase qttools glm ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "The editor for the Zelda-like ARPG game engine, Solarus";
|
||||
longDescription = ''
|
||||
Solarus is a game engine for Zelda-like ARPG games written in lua.
|
||||
|
|
|
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = https://github.com/symbiflow/prjtrellis;
|
||||
license = stdenv.lib.licenses.isc;
|
||||
maintainers = with maintainers; [ q3k thoughtpolice ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = with maintainers; [ q3k thoughtpolice emily ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
{ stdenv, fetchFromGitLab, cmake, luajit,
|
||||
{ lib, mkDerivation, fetchFromGitLab, cmake, luajit,
|
||||
SDL2, SDL2_image, SDL2_ttf, physfs,
|
||||
openal, libmodplug, libvorbis,
|
||||
qtbase, qttools }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "solarus-${version}";
|
||||
version = "1.6.0";
|
||||
mkDerivation rec {
|
||||
pname = "solarus";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "solarus-games";
|
||||
repo = "solarus";
|
||||
rev = "v1.6.0";
|
||||
sha256 = "0mlpa1ijaxy84f7xjgs2kjnpm035b8q9ckva6lg14q49gzy10fr2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0d0xfjbmamz84aajxfc0fwrj8862xxbxz6n4xnc05r1m4g7gba77";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake luajit SDL2
|
||||
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "A Zelda-like ARPG game engine";
|
||||
longDescription = ''
|
||||
Solarus is a game engine for Zelda-like ARPG games written in lua.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib, libGLU_combined
|
||||
, gettext, libpthreadstubs, libXrandr, libXext, readline, openal
|
||||
, libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev
|
||||
{ stdenv, lib, fetchpatch, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib
|
||||
, libGLU_combined , gettext, libpthreadstubs, libXrandr, libXext, readline
|
||||
, openal , libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev
|
||||
, wxGTK30, soundtouch, miniupnpc, mbedtls, curl, lzo, sfml
|
||||
, libpulseaudio ? null }:
|
||||
|
||||
|
@ -15,17 +15,26 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "07mlfnh0hwvk6xarcg315x7z2j0qbg9g7cm040df9c8psiahc3g6";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with soundtouch 2.1.2
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/dolphin-emu/raw/a1b91fdf94981e12c8889a02cba0ec2267d0f303/f/dolphin-emu-5.0-soundtouch-exception-fix.patch";
|
||||
name = "dolphin-emu-5.0-soundtouch-exception-fix.patch";
|
||||
sha256 = "0yd3l46nja5qiknnl30ryad98f3v8911jwnr67hn61dzx2kwbbaw";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Source/Core/VideoBackends/OGL/RasterFont.cpp \
|
||||
--replace " CHAR_WIDTH " " CHARWIDTH "
|
||||
'';
|
||||
|
||||
cmakeFlags = ''
|
||||
-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
|
||||
-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include
|
||||
-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0
|
||||
-DENABLE_LTO=True
|
||||
'';
|
||||
cmakeFlags = [
|
||||
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
|
||||
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
|
||||
"-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0"
|
||||
"-DENABLE_LTO=True"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
@ -36,11 +45,11 @@ stdenv.mkDerivation rec {
|
|||
libevdev libXdmcp portaudio libusb libpulseaudio
|
||||
wxGTK30 soundtouch miniupnpc mbedtls curl lzo sfml ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = https://dolphin-emu.org/;
|
||||
description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
maintainers = with stdenv.lib.maintainers; [ MP2E ];
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ MP2E ashkitten ];
|
||||
# x86_32 is an unsupported platform.
|
||||
# Enable generic build if you really want a JIT-less binary.
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
{ stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, pkgconfig, cmake, qt5
|
||||
, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext, libXrandr, libusb, lzo
|
||||
, libpthreadstubs, libXext, libXxf86vm, libXinerama, libSM, libXdmcp, readline
|
||||
, openal, udev, libevdev, portaudio, curl, alsaLib, miniupnpc, enet, mbedtls
|
||||
, soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null
|
||||
{ lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake
|
||||
, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU_combined, pcre, gettext
|
||||
, libXrandr, libusb, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama
|
||||
, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib
|
||||
, miniupnpc, enet, mbedtls, soundtouch, sfml
|
||||
, vulkan-loader ? null, libpulseaudio ? null
|
||||
|
||||
# - Inputs used for Darwin
|
||||
, CoreBluetooth, ForceFeedback, IOKit, OpenGL, libpng, hidapi }:
|
||||
|
@ -20,27 +21,27 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "dolphin-emu-${version}";
|
||||
version = "5.0-10751";
|
||||
version = "5.0-10879";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolphin-emu";
|
||||
repo = "dolphin";
|
||||
rev = "64c0ff576c6d3ea2ee35e6b6d7ea8c814442d53f";
|
||||
sha256 = "19351j3gys9kgxpdjv1dckaiv74dylcdh1kx0z9qz8llv9s1r0s3";
|
||||
rev = "c7fc9126aaf447a014af4aed195b17aa593dd49b";
|
||||
sha256 = "1pf4mxacxhrkvvh9j49ackm8hahl8x0ligmann1pafsb4lw0xbnj";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
nativeBuildInputs = [ cmake pkgconfig ]
|
||||
++ stdenv.lib.optionals stdenv.isLinux [ makeWrapper ];
|
||||
++ lib.optional stdenv.isLinux wrapQtAppsHook;
|
||||
|
||||
buildInputs = [
|
||||
curl ffmpeg libao libGLU_combined pcre gettext libpthreadstubs libpulseaudio
|
||||
libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo
|
||||
portaudio libusb libpng hidapi miniupnpc enet mbedtls soundtouch sfml
|
||||
qt5.qtbase
|
||||
] ++ stdenv.lib.optionals stdenv.isLinux [
|
||||
qtbase
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
bluez udev libevdev alsaLib vulkan-loader
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreBluetooth OpenGL ForceFeedback IOKit
|
||||
];
|
||||
|
||||
|
@ -50,14 +51,18 @@ in stdenv.mkDerivation rec {
|
|||
"-DDOLPHIN_WC_REVISION=${src.rev}"
|
||||
"-DDOLPHIN_WC_DESCRIBE=${version}"
|
||||
"-DDOLPHIN_WC_BRANCH=master"
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-DOSX_USE_DEFAULT_SEARCH_PATH=True"
|
||||
];
|
||||
|
||||
qtWrapperArgs = lib.optionals stdenv.isLinux [
|
||||
"--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib"
|
||||
];
|
||||
|
||||
# - Allow Dolphin to use nix-provided libraries instead of building them
|
||||
preConfigure = ''
|
||||
postPatch = ''
|
||||
sed -i -e 's,DISTRIBUTOR "None",DISTRIBUTOR "NixOS",g' CMakeLists.txt
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt
|
||||
sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' \
|
||||
CMakeLists.txt
|
||||
|
@ -66,18 +71,13 @@ in stdenv.mkDerivation rec {
|
|||
postInstall = ''
|
||||
cp -r ${desktopItem}/share/applications $out/share
|
||||
ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-master
|
||||
'' + stdenv.lib.optionalString stdenv.isLinux ''
|
||||
wrapProgram $out/bin/dolphin-emu-nogui \
|
||||
--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
|
||||
wrapProgram $out/bin/dolphin-emu \
|
||||
--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://dolphin-emu.org";
|
||||
description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ MP2E ];
|
||||
maintainers = with maintainers; [ MP2E ashkitten ];
|
||||
branch = "master";
|
||||
# x86_32 is an unsupported platform.
|
||||
# Enable generic build if you really want a JIT-less binary.
|
||||
|
|
56
pkgs/misc/scream-receivers/default.nix
Normal file
56
pkgs/misc/scream-receivers/default.nix
Normal file
|
@ -0,0 +1,56 @@
|
|||
{ stdenv, lib, fetchFromGitHub, alsaLib
|
||||
, pulseSupport ? false, libpulseaudio ? null
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "scream-receivers";
|
||||
version = "3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "duncanthrax";
|
||||
repo = "scream";
|
||||
rev = "${version}";
|
||||
sha256 = "1iqhs7m0fv3vfld7h288j5j0jc5xdihaghd0jd9qrk68mj2g6g9w";
|
||||
};
|
||||
|
||||
buildInputs = [ alsaLib ] ++ lib.optional pulseSupport libpulseaudio;
|
||||
|
||||
buildPhase = ''
|
||||
(cd Receivers/alsa && make)
|
||||
(cd Receivers/alsa-ivshmem && make)
|
||||
'' + lib.optionalString pulseSupport ''
|
||||
(cd Receivers/pulseaudio && make)
|
||||
(cd Receivers/pulseaudio-ivshmem && make)
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mv ./Receivers/alsa/scream-alsa $out/bin/
|
||||
mv ./Receivers/alsa-ivshmem/scream-ivshmem-alsa $out/bin/
|
||||
'' + lib.optionalString pulseSupport ''
|
||||
mv ./Receivers/pulseaudio/scream-pulse $out/bin/
|
||||
mv ./Receivers/pulseaudio-ivshmem/scream-ivshmem-pulse $out/bin/
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
export PATH=$PATH:$out/bin
|
||||
set -o verbose
|
||||
set +o pipefail
|
||||
|
||||
# Programs exit with code 1 when testing help, so grep for a string
|
||||
scream-alsa -h 2>&1 | grep -q Usage:
|
||||
scream-ivshmem-alsa 2>&1 | grep -q Usage:
|
||||
'' + lib.optionalString pulseSupport ''
|
||||
scream-pulse -h 2>&1 | grep -q Usage:
|
||||
scream-ivshmem-pulse 2>&1 | grep -q Usage:
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Audio receivers for the Scream virtual network sound card";
|
||||
homepage = "https://github.com/duncanthrax/scream";
|
||||
license = licenses.mspl;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.ivan ];
|
||||
};
|
||||
}
|
|
@ -125,12 +125,12 @@ self: super: {
|
|||
# Only official releases contains the required index.js file
|
||||
coc-nvim = buildVimPluginFrom2Nix rec {
|
||||
pname = "coc-nvim";
|
||||
version = "0.0.73";
|
||||
version = "0.0.74";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc.nvim";
|
||||
rev = "v${version}";
|
||||
sha256 = "1z7573rbh806nmkh75hr1kbhxr4jysv6k9x01fcyjfwricpa3cf7";
|
||||
sha256 = "1s4nib2mnhagd0ymx254vf7l1iijwrh2xdqn3bdm4f1jnip81r10";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -1,8 +1,11 @@
|
|||
{
|
||||
stdenv, fetchurl, lib,
|
||||
libxslt, pandoc, asciidoctor, pkgconfig,
|
||||
dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, qtbase, qttools, qtsvg,
|
||||
audit,
|
||||
pkgconfig, libxml2, libxslt,
|
||||
dbus-glib, libcap_ng, libqb, libseccomp, polkit, protobuf, audit,
|
||||
withGui ? true,
|
||||
qtbase ? null,
|
||||
qttools ? null,
|
||||
qtsvg ? null,
|
||||
libgcrypt ? null,
|
||||
libsodium ? null
|
||||
}:
|
||||
|
@ -23,10 +26,9 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
libxslt
|
||||
asciidoctor
|
||||
pandoc # for rendering documentation
|
||||
pkgconfig
|
||||
libxslt # xsltproc
|
||||
libxml2 # xmllint
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -37,23 +39,20 @@ stdenv.mkDerivation rec {
|
|||
polkit
|
||||
protobuf
|
||||
audit
|
||||
|
||||
qtbase
|
||||
qtsvg
|
||||
qttools
|
||||
]
|
||||
++ (lib.optional (libgcrypt != null) libgcrypt)
|
||||
++ (lib.optional (libsodium != null) libsodium);
|
||||
++ (lib.optional (libsodium != null) libsodium)
|
||||
++ (lib.optionals withGui [ qtbase qtsvg qttools ]);
|
||||
|
||||
configureFlags = [
|
||||
"--with-bundled-catch"
|
||||
"--with-bundled-pegtl"
|
||||
"--with-dbus"
|
||||
"--with-gui-qt=qt5"
|
||||
"--with-polkit"
|
||||
]
|
||||
++ (lib.optional (libgcrypt != null) "--with-crypto-library=gcrypt")
|
||||
++ (lib.optional (libsodium != null) "--with-crypto-library=sodium");
|
||||
++ (lib.optional (libsodium != null) "--with-crypto-library=sodium")
|
||||
++ (lib.optional withGui "--with-gui-qt=qt5");
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
name = "alertmanager-${version}";
|
||||
version = "0.16.2";
|
||||
version = "0.18.0";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/prometheus/alertmanager";
|
||||
|
@ -11,7 +11,7 @@ buildGoPackage rec {
|
|||
inherit rev;
|
||||
owner = "prometheus";
|
||||
repo = "alertmanager";
|
||||
sha256 = "0zjyr9964qxv5fsb17qhmxa1v4z0c7va60n05p9w6j2ah4dmcd8q";
|
||||
sha256 = "17f3a4fiwycpd031k1d9irhd96cklbh2ygs35j5r6hgw2130sy4p";
|
||||
};
|
||||
|
||||
buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in ''
|
||||
|
|
|
@ -48,7 +48,7 @@ in rec {
|
|||
};
|
||||
|
||||
prometheus_2 = buildPrometheus {
|
||||
version = "2.11.1";
|
||||
sha256 = "1d4kiv88v1p74cm1wg6wk1cs963xg2rlhkxw86slf9hmldlgww2l";
|
||||
version = "2.12.0";
|
||||
sha256 = "1ci9dc512c1hry1b8jqif0mrnks6w3yagwm3jf69ihcwilr2n7vs";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
name = "mysqld_exporter-${version}";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/prometheus/mysqld_exporter";
|
||||
|
@ -11,7 +11,7 @@ buildGoPackage rec {
|
|||
inherit rev;
|
||||
owner = "prometheus";
|
||||
repo = "mysqld_exporter";
|
||||
sha256 = "1133bgyp5vljz2qvfh0qzq8h8bkc8vci3jnmbr633bh3jpaqm2py";
|
||||
sha256 = "1684jf96dy5bs0y0689vlcw82lqw8kw2phlnp6pq1cq56fcwdxjn";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
name = "node_exporter-${version}";
|
||||
version = "0.17.0";
|
||||
version = "0.18.1";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/prometheus/node_exporter";
|
||||
|
@ -11,12 +11,18 @@ buildGoPackage rec {
|
|||
inherit rev;
|
||||
owner = "prometheus";
|
||||
repo = "node_exporter";
|
||||
sha256 = "08g4dg6zcr95j88apsxp828jfyx4vq271w1mgkf77c46c16d2nh0";
|
||||
sha256 = "0s3sp1gj86p7npxl38hkgs6ymd3wjjmc5hydyg1b5wh0x3yvpx07";
|
||||
};
|
||||
|
||||
# FIXME: tests fail due to read-only nix store
|
||||
doCheck = false;
|
||||
|
||||
buildFlagsArray = ''
|
||||
-ldflags=
|
||||
-X ${goPackagePath}/vendor/github.com/prometheus/common/version.Version=${version}
|
||||
-X ${goPackagePath}/vendor/github.com/prometheus/common/version.Revision=${rev}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Prometheus exporter for machine metrics";
|
||||
homepage = https://github.com/prometheus/node_exporter;
|
||||
|
|
|
@ -24,12 +24,12 @@ let
|
|||
ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "19.05";
|
||||
name = "ejabberd-${version}";
|
||||
version = "19.08";
|
||||
pname = "ejabberd";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
|
||||
sha256 = "1lczck2760bcsl7vqc5xv4rizps0scdmss2zc4b1l59wzlmnfg7h";
|
||||
url = "https://www.process-one.net/downloads/ejabberd/${version}/${pname}-${version}.tgz";
|
||||
sha256 = "0ivkw31civcznv9k645hvrzn1yc6a4qsrsywjrakniwaaxlsnj8w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ fakegit ];
|
||||
|
@ -75,7 +75,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "1bdghq8vsr8y4rka4c8vbcmazw1avs2nlcp5id1cihvnscmyjbc3";
|
||||
outputHash = "0h1amqp2x6ir29bdh9x8bm0abj67k81nmkqi8gidwccsa5z94s2c";
|
||||
};
|
||||
|
||||
configureFlags =
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "eksctl";
|
||||
version = "0.3.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaveworks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1xinkr9xnbfbr58ci7hprabqv0p292x016knbb7fqxzb8043f9lh";
|
||||
sha256 = "0vyz02yli2lnzzzzy8dv9y5g69ljr671p1lgx84z8ys2ihwj3yc3";
|
||||
};
|
||||
|
||||
modSha256 = "1y0pkd588wsqhqywlv1yd5mlr4limybfpdj2g3pbxw09hv18ysa4";
|
||||
modSha256 = "17bb1k18x1xfq9bi9qbm8pln6h6pkhaqzy07qdvnhinmspll1695";
|
||||
|
||||
subPackages = [ "cmd/eksctl" ];
|
||||
|
||||
|
|
|
@ -1,26 +1,19 @@
|
|||
{ stdenv, fetchurl, fetchzip, giblib, xlibsWrapper }:
|
||||
{ stdenv, fetchFromGitHub, giblib, xlibsWrapper, autoreconfHook
|
||||
, autoconf-archive, libXfixes, libXcursor }:
|
||||
|
||||
let
|
||||
debPatch = fetchzip {
|
||||
url = mirror://debian/pool/main/s/scrot/scrot_0.8-18.debian.tar.xz;
|
||||
sha256 = "1m8m8ad0idf3nzw0k57f6rfbw8n7dza69a7iikriqgbrpyvxqybx";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "scrot-0.8-18";
|
||||
pname = "scrot";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://linuxbrit.co.uk/downloads/${name}.tar.gz";
|
||||
sha256 = "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "resurrecting-open-source-projects";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "08gkdby0ysx2mki57z81zlm7vfnq9c1gq692xw67cg5vv2p3320w";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
for patch in $(cat ${debPatch}/patches/series); do
|
||||
patch -p1 < "${debPatch}/patches/$patch"
|
||||
done
|
||||
'';
|
||||
|
||||
buildInputs = [ giblib xlibsWrapper ];
|
||||
nativeBuildInputs = [ autoreconfHook autoconf-archive ];
|
||||
buildInputs = [ giblib xlibsWrapper libXfixes libXcursor ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://linuxbrit.co.uk/scrot/;
|
||||
|
|
|
@ -1,18 +1,18 @@
|
|||
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2
|
||||
, libxslt, libarchive, bzip2, lzma, json-glib
|
||||
{ stdenv, fetchurl, pkgconfig, gettext, glib, libxml2, perl
|
||||
, libxslt, libarchive, bzip2, lzma, json-glib, libsoup
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osinfo-db-tools";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.gz";
|
||||
sha256 = "1pihjwajmahldxi3isnq6wcsbwj0hsnq8z5kp3w4j615ygrn0cgl";
|
||||
sha256 = "0x155d4hqz7mabgqvgydqjm9d8aabc78vr0v0pnsp9vkdlcv3mfh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma ];
|
||||
nativeBuildInputs = [ pkgconfig gettext perl ];
|
||||
buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma libsoup ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Tools for managing the osinfo database";
|
||||
|
|
|
@ -2,19 +2,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "starship";
|
||||
version = "0.10.1";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "starship";
|
||||
repo = "starship";
|
||||
rev = "v${version}";
|
||||
sha256 = "045lq4nsrdssmqbcj0551f2c5qd2rcvhs8gr4p4iniv7s89yz1xl";
|
||||
sha256 = "0zq99ll0vyafr2piffazprhvbs3sxb6863cp2qw596ilqg7ffi04";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
cargoSha256 = "126y8q19qr37wrj6x4hqh0v7nqr9yfrycwqfgdlaw6i33gb0qam9";
|
||||
cargoSha256 = "0qlgng5j6l1r9j5vn3wnq25qr6f4nh10x90awiqyzz8jypb0ng2c";
|
||||
checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A minimal, blazing fast, and extremely customizable prompt for any shell";
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -2,20 +2,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "httplz";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thecoshman";
|
||||
repo = "http";
|
||||
rev = "v${version}";
|
||||
sha256 = "00w8sy0m92by6lby1zb8hh36dnsrvwyyl56p6p7a1mf3iiq84r1y";
|
||||
sha256 = "0q9ng8vf01k65zmcm7bbkqyrkj5hs86zdxwrfj98f4xqxrm75rf6";
|
||||
};
|
||||
|
||||
buildInputs = with pkgs; [ openssl pkgconfig ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
|
||||
|
||||
cargoBuildFlags = [ "--bin httplz" ];
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
cargoSha256 = "1axf15ma7fkbphjc6hjrbcj9rbd1x5i4kyz7fjrlqjgdsmvaqc93";
|
||||
cargoSha256 = "18qr3sy4zj4lwbzrz98d82kwagfbzkmrxk5sxl7w9vhdzy2diskw";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A basic http server for hosting a folder fast and simply";
|
||||
|
|
21
pkgs/tools/nix/nixpkgs-fmt/default.nix
Normal file
21
pkgs/tools/nix/nixpkgs-fmt/default.nix
Normal file
|
@ -0,0 +1,21 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nixpkgs-fmt";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0sa0263pkpi423f1rdyg90axw9sdmgj8ma1mza0v46qzkwynwgh3";
|
||||
};
|
||||
|
||||
cargoSha256 = "0p3qa1asdvw2npav4281lzndjczrzac6fr8z4y61m7rbn363s8sa";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Nix code formatter for nixpkgs";
|
||||
homepage = "https://nix-community.github.io/nixpkgs-fmt";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ zimbatm ];
|
||||
};
|
||||
}
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "clamav-${version}";
|
||||
version = "0.101.3";
|
||||
version = "0.101.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.clamav.net/downloads/production/${name}.tar.gz";
|
||||
sha256 = "0f034sqqgngj3ry71f7j73g66n6mqfisjcw5529y5gcw9an2mm38";
|
||||
sha256 = "1kdw0b49hbvja6xn589v4f0q334wav16pmi1hibql5cxj7q99w0b";
|
||||
};
|
||||
|
||||
# don't install sample config files into the absolute sysconfdir folder
|
||||
|
|
|
@ -2669,7 +2669,7 @@ in
|
|||
dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
|
||||
|
||||
dolphinEmu = callPackage ../misc/emulators/dolphin-emu { };
|
||||
dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix {
|
||||
dolphinEmuMaster = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL;
|
||||
};
|
||||
|
||||
|
@ -5958,6 +5958,10 @@ in
|
|||
|
||||
scdoc = callPackage ../tools/typesetting/scdoc { };
|
||||
|
||||
scream-receivers = callPackage ../misc/scream-receivers {
|
||||
pulseSupport = config.pulseaudio or false;
|
||||
};
|
||||
|
||||
screen = callPackage ../tools/misc/screen {
|
||||
inherit (darwin.apple_sdk.libs) utmp;
|
||||
};
|
||||
|
@ -8203,11 +8207,7 @@ in
|
|||
|
||||
neko = callPackage ../development/compilers/neko { };
|
||||
|
||||
nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr {
|
||||
# QT 5.12 has a weird regression involving the floorplanning window having
|
||||
# a 'blank' or 'transparent' background, so fall back to 5.11 for now.
|
||||
qtbase = qt511.qtbase;
|
||||
};
|
||||
nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { };
|
||||
|
||||
nasm = callPackage ../development/compilers/nasm { };
|
||||
|
||||
|
@ -16443,6 +16443,10 @@ in
|
|||
libgcrypt = null;
|
||||
};
|
||||
|
||||
usbguard-nox = usbguard.override {
|
||||
withGui = false;
|
||||
};
|
||||
|
||||
usbutils = callPackage ../os-specific/linux/usbutils { };
|
||||
|
||||
usermount = callPackage ../os-specific/linux/usermount { };
|
||||
|
@ -24086,6 +24090,8 @@ in
|
|||
|
||||
nix-serve = callPackage ../tools/package-management/nix-serve { };
|
||||
|
||||
nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { };
|
||||
|
||||
nixos-artwork = callPackage ../data/misc/nixos-artwork { };
|
||||
nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { };
|
||||
nixos-grub2-theme = callPackage ../data/misc/nixos-artwork/grub2-theme.nix { };
|
||||
|
|
|
@ -237,9 +237,12 @@ let
|
|||
pname = "oci8";
|
||||
|
||||
sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd";
|
||||
|
||||
buildInputs = [ pkgs.oracle-instantclient ];
|
||||
configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient}/lib" ];
|
||||
configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient.lib}/lib" ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4
|
||||
'';
|
||||
};
|
||||
|
||||
pcs = buildPecl rec {
|
||||
|
|
|
@ -4311,7 +4311,7 @@ in {
|
|||
inherit (pkgs) graphviz;
|
||||
};
|
||||
|
||||
pydot_ng = callPackage ../development/python-modules/pydot_ng { };
|
||||
pydot_ng = callPackage ../development/python-modules/pydot_ng { graphviz = pkgs.graphviz; };
|
||||
|
||||
pyelftools = callPackage ../development/python-modules/pyelftools { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue