Merge branch 'staging-next' into staging
This commit is contained in:
Jan Tojnar
commit
594a885912
|
|
@ -428,6 +428,12 @@
|
|||
githubId = 782180;
|
||||
name = "Alex Vorobiev";
|
||||
};
|
||||
alex-eyre = {
|
||||
email = "A.Eyre@sms.ed.ac.uk";
|
||||
github = "alex-eyre";
|
||||
githubId = 38869148;
|
||||
name = "Alex Eyre";
|
||||
};
|
||||
algorith = {
|
||||
email = "dries_van_daele@telenet.be";
|
||||
name = "Dries Van Daele";
|
||||
|
|
@ -7249,6 +7255,12 @@
|
|||
githubId = 40049608;
|
||||
name = "Andy Chun";
|
||||
};
|
||||
noreferences = {
|
||||
email = "norkus@norkus.net";
|
||||
github = "noreferences";
|
||||
githubId = 13085275;
|
||||
name = "Juozas Norkus";
|
||||
};
|
||||
norfair = {
|
||||
email = "syd@cs-syd.eu";
|
||||
github = "NorfairKing";
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ let
|
|||
in
|
||||
pkgs.stdenv.mkDerivation {
|
||||
name = "nixpkgs-update-script";
|
||||
buildInputs = [ pkgs.hydra-check ];
|
||||
buildCommand = ''
|
||||
echo ""
|
||||
echo "----------------------------------------------------------------"
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable git nix -I nixpkgs=.
|
||||
|
||||
# This script is used to regenerate nixpkgs' Haskell package set, using a tool
|
||||
# called hackage2nix. hackage2nix looks at the config files in
|
||||
# pkgs/development/haskell-modules/configuration-hackage2nix and generates
|
||||
# a Nix expression for package version specified there, using the Cabal files
|
||||
# from the Hackage database (available under all-cabal-hashes) and its
|
||||
# companion tool cabal2nix.
|
||||
# This script is used to regenerate nixpkgs' Haskell package set, using the
|
||||
# tool hackage2nix from the nixos/cabal2nix repo. hackage2nix looks at the
|
||||
# config files in pkgs/development/haskell-modules/configuration-hackage2nix
|
||||
# and generates a Nix expression for package version specified there, using the
|
||||
# Cabal files from the Hackage database (available under all-cabal-hashes) and
|
||||
# its companion tool cabal2nix.
|
||||
#
|
||||
# Related scripts are update-hackage.sh, for updating the snapshot of the
|
||||
# Hackage database used by hackage2nix, and update-cabal2nix-unstable.sh,
|
||||
|
|
@ -14,10 +14,15 @@
|
|||
|
||||
set -euo pipefail
|
||||
|
||||
# To prevent hackage2nix fails because of encoding.
|
||||
# See: https://github.com/NixOS/nixpkgs/pull/122023
|
||||
export LC_ALL=C.UTF-8
|
||||
|
||||
extraction_derivation='with import ./. {}; runCommand "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"'
|
||||
unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)"
|
||||
config_dir=pkgs/development/haskell-modules/configuration-hackage2nix
|
||||
|
||||
echo "Starting hackage2nix to regenerate pkgs/development/haskell-modules/hackage-packages.nix ..."
|
||||
hackage2nix \
|
||||
--hackage "$unpacked_hackage" \
|
||||
--preferred-versions <(for n in "$unpacked_hackage"/*/preferred-versions; do cat "$n"; echo; done) \
|
||||
|
|
@ -35,3 +40,5 @@ hackage-packages.nix: Regenerate based on current config
|
|||
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
|
||||
EOF
|
||||
fi
|
||||
|
||||
echo "Regeneration of hackage-packages.nix finished."
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ sed -r \
|
|||
< "${tmpfile}.new" >> $stackage_config
|
||||
|
||||
if [[ "${1:-}" == "--do-commit" ]]; then
|
||||
git add $config_file
|
||||
git add $stackage_config
|
||||
git commit -F - << EOF
|
||||
Stackage Nightly: $old_version -> $version
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,14 @@ rec {
|
|||
|
||||
preferLocalBuild = true;
|
||||
|
||||
buildPhase = ''
|
||||
python <<EOF
|
||||
from pydoc import importfile
|
||||
with open('driver-exports', 'w') as fp:
|
||||
fp.write(','.join(dir(importfile('${testDriverScript}'))))
|
||||
EOF
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
mypy --disallow-untyped-defs \
|
||||
|
|
@ -50,6 +58,8 @@ rec {
|
|||
|
||||
wrapProgram $out/bin/nixos-test-driver \
|
||||
--prefix PATH : "${lib.makeBinPath [ qemu_pkg vde2 netpbm coreutils ]}" \
|
||||
|
||||
install -m 0644 -vD driver-exports $out/nix-support/driver-exports
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -73,7 +83,9 @@ rec {
|
|||
LOGFILE=/dev/null tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver
|
||||
'';
|
||||
|
||||
passthru = driver.passthru;
|
||||
passthru = driver.passthru // {
|
||||
inherit driver;
|
||||
};
|
||||
|
||||
inherit pos;
|
||||
};
|
||||
|
|
@ -146,7 +158,7 @@ rec {
|
|||
in
|
||||
lib.warnIf skipLint "Linting is disabled" (runCommand testDriverName
|
||||
{
|
||||
buildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
testScript = testScript';
|
||||
preferLocalBuild = true;
|
||||
testName = name;
|
||||
|
|
@ -159,7 +171,10 @@ rec {
|
|||
|
||||
echo -n "$testScript" > $out/test-script
|
||||
${lib.optionalString (!skipLint) ''
|
||||
${python3Packages.black}/bin/black --check --diff $out/test-script
|
||||
PYFLAKES_BUILTINS="$(
|
||||
echo -n ${lib.escapeShellArg (lib.concatStringsSep "," nodeHostNames)},
|
||||
< ${lib.escapeShellArg "${testDriver}/nix-support/driver-exports"}
|
||||
)" ${python3Packages.pyflakes}/bin/pyflakes $out/test-script
|
||||
''}
|
||||
|
||||
ln -s ${testDriver}/bin/nixos-test-driver $out/bin/
|
||||
|
|
@ -193,6 +208,8 @@ rec {
|
|||
(node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null)
|
||||
nodeNames;
|
||||
|
||||
nodeHostNames = map (c: c.config.system.name) (lib.attrValues driver.nodes);
|
||||
|
||||
in
|
||||
if lib.length invalidNodeNames > 0 then
|
||||
throw ''
|
||||
|
|
|
|||
|
|
@ -61,6 +61,17 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
security.sudo.execWheelOnly = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Only allow members of the <code>wheel</code> group to execute sudo by
|
||||
setting the executable's permissions accordingly.
|
||||
This prevents users that are not members of <code>wheel</code> from
|
||||
exploiting vulnerabilities in sudo such as CVE-2021-3156.
|
||||
'';
|
||||
};
|
||||
|
||||
security.sudo.configFile = mkOption {
|
||||
type = types.lines;
|
||||
# Note: if syntax errors are detected in this file, the NixOS
|
||||
|
|
@ -216,9 +227,20 @@ in
|
|||
${cfg.extraConfig}
|
||||
'';
|
||||
|
||||
security.wrappers = {
|
||||
sudo.source = "${cfg.package.out}/bin/sudo";
|
||||
sudoedit.source = "${cfg.package.out}/bin/sudoedit";
|
||||
security.wrappers = let
|
||||
owner = "root";
|
||||
group = if cfg.execWheelOnly then "wheel" else "root";
|
||||
setuid = true;
|
||||
permissions = if cfg.execWheelOnly then "u+rx,g+x" else "u+rx,g+x,o+x";
|
||||
in {
|
||||
sudo = {
|
||||
source = "${cfg.package.out}/bin/sudo";
|
||||
inherit owner group setuid permissions;
|
||||
};
|
||||
sudoedit = {
|
||||
source = "${cfg.package.out}/bin/sudoedit";
|
||||
inherit owner group setuid permissions;
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [ sudo ];
|
||||
|
|
|
|||
|
|
@ -44,19 +44,10 @@ let
|
|||
|
||||
preStart = ''
|
||||
${optionalString (suppl.configFile.path!=null) ''
|
||||
touch -a ${suppl.configFile.path}
|
||||
chmod 600 ${suppl.configFile.path}
|
||||
(umask 077 && touch -a "${suppl.configFile.path}")
|
||||
''}
|
||||
${optionalString suppl.userControlled.enable ''
|
||||
if ! test -e ${suppl.userControlled.socketDir}; then
|
||||
mkdir -m 0770 -p ${suppl.userControlled.socketDir}
|
||||
chgrp ${suppl.userControlled.group} ${suppl.userControlled.socketDir}
|
||||
fi
|
||||
|
||||
if test "$(stat --printf '%G' ${suppl.userControlled.socketDir})" != "${suppl.userControlled.group}"; then
|
||||
echo "ERROR: bad ownership on ${suppl.userControlled.socketDir}" >&2
|
||||
exit 1
|
||||
fi
|
||||
install -dm770 -g "${suppl.userControlled.group}" "${suppl.userControlled.socketDir}"
|
||||
''}
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -102,8 +102,8 @@ in {
|
|||
freeformType = let
|
||||
validSettingsPrimitiveTypes = oneOf [ int str bool float ];
|
||||
validSettingsTypes = oneOf [ validSettingsPrimitiveTypes (listOf validSettingsPrimitiveTypes) ];
|
||||
settingsType = (attrsOf validSettingsTypes);
|
||||
in attrsOf (oneOf [ string settingsType (listOf settingsType) ])
|
||||
settingsType = oneOf [ str (attrsOf validSettingsTypes) ];
|
||||
in attrsOf (oneOf [ settingsType (listOf settingsType) ])
|
||||
// { description = ''
|
||||
unbound.conf configuration type. The format consist of an attribute
|
||||
set of settings. Each settings can be either one value, a list of
|
||||
|
|
|
|||
|
|
@ -150,6 +150,10 @@ in
|
|||
|
||||
config = mkIf cfg.enable (mkMerge [{
|
||||
boot.kernelModules = [ "bridge" "veth" ];
|
||||
boot.kernel.sysctl = {
|
||||
"net.ipv4.conf.all.forwarding" = mkOverride 99 true;
|
||||
"net.ipv4.conf.default.forwarding" = mkOverride 99 true;
|
||||
};
|
||||
environment.systemPackages = [ cfg.package ]
|
||||
++ optional cfg.enableNvidia pkgs.nvidia-docker;
|
||||
users.groups.docker.gid = config.ids.gids.docker;
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@ in import ./make-test-python.nix ({ lib, ... }: {
|
|||
)
|
||||
for line in subject_data.lower().split("\n"):
|
||||
if "subject" in line:
|
||||
print(f"First subject in fullchain.pem: ", line)
|
||||
print(f"First subject in fullchain.pem: {line}")
|
||||
assert cert_name.lower() in line
|
||||
return
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,8 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
|
|||
in "${pkgs.xdotool}/bin/xdotool ${xdoScript}";
|
||||
in ''
|
||||
import shlex
|
||||
from contextlib import contextmanager, _GeneratorContextManager
|
||||
import re
|
||||
from contextlib import contextmanager
|
||||
|
||||
|
||||
# Run as user alice
|
||||
|
|
|
|||
|
|
@ -30,5 +30,5 @@ in {
|
|||
};
|
||||
|
||||
# This test only consists of evaluating the test machine
|
||||
testScript = "";
|
||||
testScript = "pass";
|
||||
})
|
||||
|
|
|
|||
|
|
@ -162,6 +162,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
machine.fail(
|
||||
"nixos-container create b0rk --config-file ${brokenCfg}"
|
||||
)
|
||||
machine.succeed(f"test ! -e /var/lib/containers/b0rk")
|
||||
machine.succeed("test ! -e /var/lib/containers/b0rk")
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -112,6 +112,7 @@ in
|
|||
};
|
||||
|
||||
testScript = ''
|
||||
from typing import Tuple
|
||||
def execute_as(user: str, cmd: str) -> Tuple[int, str]:
|
||||
"""
|
||||
Run a shell command as a specific user.
|
||||
|
|
|
|||
|
|
@ -73,7 +73,4 @@ in {
|
|||
"docker rmi ${hello2.imageName}",
|
||||
)
|
||||
'';
|
||||
|
||||
# Remove when the formatter has been removed and a linter has been added
|
||||
skipLint = true;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -30,7 +30,4 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
# drw------- 99 0 0 100 Apr 14 11:36 /nix/store
|
||||
docker.succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version")
|
||||
'';
|
||||
|
||||
# Remove when the formatter has been removed and a linter has been added
|
||||
skipLint = true;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -365,7 +365,4 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
"docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'"
|
||||
)
|
||||
'';
|
||||
|
||||
# Remove when the formatter has been removed and a linter has been added
|
||||
skipLint = true;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -45,5 +45,8 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
|||
|
||||
# Must match version 4 times to ensure client and server git commits and versions are correct
|
||||
docker.succeed('[ $(docker version | grep ${pkgs.docker.version} | wc -l) = "4" ]')
|
||||
docker.succeed("systemctl restart systemd-sysctl")
|
||||
docker.succeed("grep 1 /proc/sys/net/ipv4/conf/all/forwarding")
|
||||
docker.succeed("grep 1 /proc/sys/net/ipv4/conf/default/forwarding")
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
|
|||
in
|
||||
''
|
||||
import json
|
||||
import time
|
||||
from urllib.parse import urlencode
|
||||
|
||||
machine.wait_for_unit("jellyfin.service")
|
||||
|
|
@ -101,7 +100,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
|
|||
|
||||
|
||||
def is_refreshed(_):
|
||||
folders = machine.succeed(api_get(f"/Library/VirtualFolders"))
|
||||
folders = machine.succeed(api_get("/Library/VirtualFolders"))
|
||||
folders = json.loads(folders)
|
||||
print(folders)
|
||||
return all(folder["RefreshStatus"] == "Idle" for folder in folders)
|
||||
|
|
@ -141,7 +140,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
|
|||
"ffmpeg"
|
||||
+ f" -headers 'X-Emby-Authorization:{auth_header}'"
|
||||
+ f" -i http://localhost:8096/Videos/{video}/master.m3u8?mediaSourceId={media_source_id}"
|
||||
+ f" /tmp/test.mkv"
|
||||
+ " /tmp/test.mkv"
|
||||
)
|
||||
|
||||
duration = machine.succeed(
|
||||
|
|
|
|||
|
|
@ -511,7 +511,7 @@ let
|
|||
machine.sleep(10)
|
||||
residue = machine.succeed("ip tuntap list")
|
||||
assert (
|
||||
residue is ""
|
||||
residue == ""
|
||||
), "Some virtual interface has not been properly cleaned:\n{}".format(residue)
|
||||
'';
|
||||
};
|
||||
|
|
@ -665,10 +665,10 @@ let
|
|||
ipv4Residue = machine.succeed("ip -4 route list dev eth0 | head -n-3").strip()
|
||||
ipv6Residue = machine.succeed("ip -6 route list dev eth0 | head -n-3").strip()
|
||||
assert (
|
||||
ipv4Residue is ""
|
||||
ipv4Residue == ""
|
||||
), "The IPv4 routing table has not been properly cleaned:\n{}".format(ipv4Residue)
|
||||
assert (
|
||||
ipv6Residue is ""
|
||||
ipv6Residue == ""
|
||||
), "The IPv6 routing table has not been properly cleaned:\n{}".format(ipv6Residue)
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -88,8 +88,8 @@ in
|
|||
"kdb5_util create -s -r NFS.TEST -P master_key",
|
||||
"systemctl restart kadmind.service kdc.service",
|
||||
)
|
||||
server.wait_for_unit(f"kadmind.service")
|
||||
server.wait_for_unit(f"kdc.service")
|
||||
server.wait_for_unit("kadmind.service")
|
||||
server.wait_for_unit("kdc.service")
|
||||
|
||||
# create principals
|
||||
server.succeed(
|
||||
|
|
@ -102,8 +102,8 @@ in
|
|||
# add principals to server keytab
|
||||
server.succeed("kadmin.local ktadd nfs/server.nfs.test")
|
||||
server.succeed("systemctl start rpc-gssd.service rpc-svcgssd.service")
|
||||
server.wait_for_unit(f"rpc-gssd.service")
|
||||
server.wait_for_unit(f"rpc-svcgssd.service")
|
||||
server.wait_for_unit("rpc-gssd.service")
|
||||
server.wait_for_unit("rpc-svcgssd.service")
|
||||
|
||||
client.wait_for_unit("network-online.target")
|
||||
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@ in {
|
|||
testScript = ''
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
|
||||
start_all()
|
||||
|
||||
|
|
|
|||
|
|
@ -36,9 +36,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
|
||||
with subtest("Normal login"):
|
||||
shadow.send_key("alt-f2")
|
||||
shadow.wait_until_succeeds(f"[ $(fgconsole) = 2 ]")
|
||||
shadow.wait_for_unit(f"getty@tty2.service")
|
||||
shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty2'")
|
||||
shadow.wait_until_succeeds("[ $(fgconsole) = 2 ]")
|
||||
shadow.wait_for_unit("getty@tty2.service")
|
||||
shadow.wait_until_succeeds("pgrep -f 'agetty.*tty2'")
|
||||
shadow.wait_until_tty_matches(2, "login: ")
|
||||
shadow.send_chars("emma\n")
|
||||
shadow.wait_until_tty_matches(2, "login: emma")
|
||||
|
|
@ -60,9 +60,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
|
||||
with subtest("Change password"):
|
||||
shadow.send_key("alt-f3")
|
||||
shadow.wait_until_succeeds(f"[ $(fgconsole) = 3 ]")
|
||||
shadow.wait_for_unit(f"getty@tty3.service")
|
||||
shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty3'")
|
||||
shadow.wait_until_succeeds("[ $(fgconsole) = 3 ]")
|
||||
shadow.wait_for_unit("getty@tty3.service")
|
||||
shadow.wait_until_succeeds("pgrep -f 'agetty.*tty3'")
|
||||
shadow.wait_until_tty_matches(3, "login: ")
|
||||
shadow.send_chars("emma\n")
|
||||
shadow.wait_until_tty_matches(3, "login: emma")
|
||||
|
|
@ -78,9 +78,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
shadow.send_chars("${password3}\n")
|
||||
shadow.sleep(2)
|
||||
shadow.send_key("alt-f4")
|
||||
shadow.wait_until_succeeds(f"[ $(fgconsole) = 4 ]")
|
||||
shadow.wait_for_unit(f"getty@tty4.service")
|
||||
shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty4'")
|
||||
shadow.wait_until_succeeds("[ $(fgconsole) = 4 ]")
|
||||
shadow.wait_for_unit("getty@tty4.service")
|
||||
shadow.wait_until_succeeds("pgrep -f 'agetty.*tty4'")
|
||||
shadow.wait_until_tty_matches(4, "login: ")
|
||||
shadow.send_chars("emma\n")
|
||||
shadow.wait_until_tty_matches(4, "login: emma")
|
||||
|
|
@ -106,9 +106,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
|
||||
with subtest("nologin shell"):
|
||||
shadow.send_key("alt-f5")
|
||||
shadow.wait_until_succeeds(f"[ $(fgconsole) = 5 ]")
|
||||
shadow.wait_for_unit(f"getty@tty5.service")
|
||||
shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty5'")
|
||||
shadow.wait_until_succeeds("[ $(fgconsole) = 5 ]")
|
||||
shadow.wait_for_unit("getty@tty5.service")
|
||||
shadow.wait_until_succeeds("pgrep -f 'agetty.*tty5'")
|
||||
shadow.wait_until_tty_matches(5, "login: ")
|
||||
shadow.send_chars("layla\n")
|
||||
shadow.wait_until_tty_matches(5, "login: layla")
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ in
|
|||
maintainers = [ lschuermann ];
|
||||
};
|
||||
|
||||
machine =
|
||||
nodes.machine =
|
||||
{ lib, ... }:
|
||||
with lib;
|
||||
{
|
||||
|
|
@ -48,6 +48,19 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
nodes.strict = { ... }: {
|
||||
users.users = {
|
||||
admin = { isNormalUser = true; extraGroups = [ "wheel" ]; };
|
||||
noadmin = { isNormalUser = true; };
|
||||
};
|
||||
|
||||
security.sudo = {
|
||||
enable = true;
|
||||
wheelNeedsPassword = false;
|
||||
execWheelOnly = true;
|
||||
};
|
||||
};
|
||||
|
||||
testScript =
|
||||
''
|
||||
with subtest("users in wheel group should have passwordless sudo"):
|
||||
|
|
@ -79,5 +92,11 @@ in
|
|||
|
||||
with subtest("users in group 'barfoo' should not be able to keep their environment"):
|
||||
machine.fail("sudo -u test3 sudo -n -E -u root true")
|
||||
|
||||
with subtest("users in wheel should be able to run sudo despite execWheelOnly"):
|
||||
strict.succeed('su - admin -c "sudo -u root true"')
|
||||
|
||||
with subtest("non-wheel users should be unable to run sudo thanks to execWheelOnly"):
|
||||
strict.fail('su - noadmin -c "sudo --help"')
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: {
|
|||
networking.firewall.enable = false;
|
||||
virtualisation.vlans = [ 1 ];
|
||||
environment.systemPackages = with pkgs; [ wireguard-tools ];
|
||||
boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ];
|
||||
systemd.network = {
|
||||
enable = true;
|
||||
netdevs = {
|
||||
|
|
|
|||
|
|
@ -192,7 +192,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
|||
|
||||
testScript = { nodes, ... }: ''
|
||||
import typing
|
||||
import json
|
||||
|
||||
zone = "example.local."
|
||||
records = [("AAAA", "abcd::eeff"), ("A", "1.2.3.4")]
|
||||
|
|
|
|||
|
|
@ -226,18 +226,16 @@ let
|
|||
|
||||
|
||||
def create_vm_${name}():
|
||||
# fmt: off
|
||||
vbm(f"createvm --name ${name} ${createFlags}")
|
||||
vbm(f"modifyvm ${name} ${vmFlags}")
|
||||
vbm(f"setextradata ${name} VBoxInternal/PDM/HaltOnReset 1")
|
||||
vbm(f"storagectl ${name} ${controllerFlags}")
|
||||
vbm(f"storageattach ${name} ${diskFlags}")
|
||||
vbm(f"sharedfolder add ${name} ${sharedFlags}")
|
||||
vbm(f"sharedfolder add ${name} ${nixstoreFlags}")
|
||||
vbm("createvm --name ${name} ${createFlags}")
|
||||
vbm("modifyvm ${name} ${vmFlags}")
|
||||
vbm("setextradata ${name} VBoxInternal/PDM/HaltOnReset 1")
|
||||
vbm("storagectl ${name} ${controllerFlags}")
|
||||
vbm("storageattach ${name} ${diskFlags}")
|
||||
vbm("sharedfolder add ${name} ${sharedFlags}")
|
||||
vbm("sharedfolder add ${name} ${nixstoreFlags}")
|
||||
cleanup_${name}()
|
||||
|
||||
${mkLog "$HOME/VirtualBox VMs/${name}/Logs/VBox.log" "HOST-${name}"}
|
||||
# fmt: on
|
||||
|
||||
|
||||
def destroy_vm_${name}():
|
||||
|
|
@ -259,9 +257,7 @@ let
|
|||
|
||||
def wait_for_ip_${name}(interface):
|
||||
property = f"/VirtualBox/GuestInfo/Net/{interface}/V4/IP"
|
||||
# fmt: off
|
||||
getip = f"VBoxManage guestproperty get ${name} {property} | sed -n -e 's/^Value: //p'"
|
||||
# fmt: on
|
||||
|
||||
ip = machine.succeed(
|
||||
ru(
|
||||
|
|
@ -394,9 +390,7 @@ let
|
|||
|
||||
machine.wait_for_x()
|
||||
|
||||
# fmt: off
|
||||
${mkLog "$HOME/.config/VirtualBox/VBoxSVC.log" "HOST-SVC"}
|
||||
# fmt: on
|
||||
|
||||
${testScript}
|
||||
# (keep black happy)
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ in {
|
|||
};
|
||||
users = {
|
||||
users.testuser = {
|
||||
isNormalUser = false;
|
||||
isSystemUser = true;
|
||||
uid = 1074;
|
||||
group = "testgroup";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : {
|
|||
# If Alice can talk to Carol, then Bob's outbound peering and Carol's
|
||||
# local peering have succeeded and everybody is connected.
|
||||
alice.wait_until_succeeds(f"ping -c 1 {carol_ip6}")
|
||||
alice.succeed(f"ping -c 1 ${bobIp6}")
|
||||
alice.succeed("ping -c 1 ${bobIp6}")
|
||||
|
||||
bob.succeed("ping -c 1 ${aliceIp6}")
|
||||
bob.succeed(f"ping -c 1 {carol_ip6}")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk-pixbuf
|
||||
, wrapGAppsHook, gtk2, gtk3, harfbuzz, jdk, lib, xorg
|
||||
, libbsd, libjack2, libpng, ffmpeg_3
|
||||
, libbsd, libjack2, libpng, ffmpeg
|
||||
, libxkbcommon
|
||||
, makeWrapper, pixman, autoPatchelfHook
|
||||
, xdg-utils, zenity, zlib }:
|
||||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
binPath = lib.makeBinPath [
|
||||
xdg-utils zenity ffmpeg_3
|
||||
xdg-utils zenity ffmpeg
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchurl, alsaLib, cairo, dpkg, freetype
|
||||
, gdk-pixbuf, glib, gtk3, lib, xorg
|
||||
, libglvnd, libjack2, ffmpeg_3
|
||||
, libglvnd, libjack2, ffmpeg
|
||||
, libxkbcommon, xdg-utils, zlib, pulseaudio
|
||||
, wrapGAppsHook, makeWrapper }:
|
||||
|
||||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
binPath = lib.makeBinPath [
|
||||
xdg-utils ffmpeg_3
|
||||
xdg-utils ffmpeg
|
||||
];
|
||||
|
||||
ldLibraryPath = lib.strings.makeLibraryPath buildInputs;
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dragonfly-reverb";
|
||||
version = "3.2.1";
|
||||
version = "3.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "michaelwillis";
|
||||
repo = "dragonfly-reverb";
|
||||
rev = version;
|
||||
sha256 = "0vfm2510shah67k87mdyar4wr4vqwii59y9lqfhwm6blxparkrqa";
|
||||
sha256 = "14kia9wjs0nqfx4psnr3vf4x6hihkf80gb0mjzmdnnnk4cnrdydm";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
patchShebangs dpf/utils/generate-ttl.sh
|
||||
'';
|
||||
|
||||
|
|
@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/lib/lv2/
|
||||
mkdir -p $out/lib/vst/
|
||||
|
|
@ -31,13 +32,14 @@ stdenv.mkDerivation rec {
|
|||
cp -a $bin-vst.so $out/lib/vst/
|
||||
cp -a $bin.lv2/ $out/lib/lv2/ ;
|
||||
done
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/michaelwillis/dragonfly-reverb";
|
||||
description = "A hall-style reverb based on freeverb3 algorithms";
|
||||
maintainers = [ maintainers.magnetophon ];
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = ["x86_64-linux"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, xxd
|
||||
, cairo
|
||||
, fluidsynth
|
||||
, libX11
|
||||
|
|
@ -13,17 +14,17 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mamba";
|
||||
version = "1.8";
|
||||
version = "2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brummer10";
|
||||
repo = "Mamba";
|
||||
rev = "v${version}";
|
||||
sha256 = "049gvdvvv3hkh1b47h0bia02g1p71agwh6g7q0n4yxz4d81b8kha";
|
||||
sha256 = "1885qxyfkpslzk0aaaaws0x73b10h9nbr04jkk7xhkya25gf280m";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config xxd ];
|
||||
buildInputs = [ cairo fluidsynth libX11 libjack2 alsaLib liblo libsigcxx libsmf ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, alsaLib, flac, libmad, libvorbis, mpg123
|
||||
, dsdSupport ? true
|
||||
, faad2Support ? true, faad2
|
||||
, ffmpegSupport ? true, ffmpeg_3
|
||||
, ffmpegSupport ? true, ffmpeg
|
||||
, opusSupport ? true, opusfile
|
||||
, resampleSupport ? true, soxr
|
||||
, sslSupport ? true, openssl
|
||||
|
|
@ -35,7 +35,7 @@ in stdenv.mkDerivation {
|
|||
|
||||
buildInputs = [ alsaLib flac libmad libvorbis mpg123 ]
|
||||
++ optional faad2Support faad2
|
||||
++ optional ffmpegSupport ffmpeg_3
|
||||
++ optional ffmpegSupport ffmpeg
|
||||
++ optional opusSupport opusfile
|
||||
++ optional resampleSupport soxr
|
||||
++ optional sslSupport openssl;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, fetchFromGitHub
|
||||
, openssl
|
||||
, boost
|
||||
, libb2
|
||||
, libevent
|
||||
, autoreconfHook
|
||||
, db4
|
||||
|
|
@ -21,13 +22,13 @@ with lib;
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold";
|
||||
version = "0.15.2";
|
||||
version = "0.17.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BTCGPU";
|
||||
repo = "BTCGPU";
|
||||
rev = "v${version}";
|
||||
sha256 = "0grd1cd8d2nsrxl27la85kcan09z73fn70ncr9km4iccaj5pg12h";
|
||||
sha256 = "sha256-1tFoUNsCPJkHSmNRl5gE3n2EQD6RZSry1zIM5hiTzEI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
|
|||
db4
|
||||
zeromq
|
||||
libsodium
|
||||
libb2
|
||||
] ++ optionals withGui [
|
||||
qtbase
|
||||
qttools
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
, python3
|
||||
, qrencode
|
||||
, libevent
|
||||
, nixosTests
|
||||
, withGui
|
||||
, withWallet ? true
|
||||
}:
|
||||
|
|
@ -81,6 +82,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests = {
|
||||
smoke-test = nixosTests.bitcoind;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Peer-to-peer electronic cash system";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ergo";
|
||||
version = "4.0.8";
|
||||
version = "4.0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
|
||||
sha256 = "sha256-swU4CnX2BxL3ILH/sXux8ZHMo5nAPLQOIiWmr4C8BOQ=";
|
||||
sha256 = "sha256-FstAKUZVKW9U6QTqqCEDybvbBl+0H9qVHqFMPubdDpk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -5,20 +5,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "emacs";
|
||||
version = "27.1";
|
||||
version = "27.2";
|
||||
|
||||
emacsName = "emacs-${version}";
|
||||
macportVersion = "8.0";
|
||||
macportVersion = "8.2";
|
||||
name = "emacs-mac-${version}-${macportVersion}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/emacs/${emacsName}.tar.xz";
|
||||
sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a";
|
||||
sha256 = "1ff182gjw9wqsbx1kj5gl2r5pbqhp4ar54g04j33fgz6g17cr9xl";
|
||||
};
|
||||
|
||||
macportSrc = fetchurl {
|
||||
url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
|
||||
sha256 = "0rjk82k9qp1g701pfd4f0q2myzvsnp9q8xzphlxwi5yzwbs91kjq";
|
||||
sha256 = "1bgm2g3ky7rkj1l27wnmyzqsqxzjng7y9bf72ym37wiyhyi2a9za";
|
||||
};
|
||||
|
||||
hiresSrc = fetchurl {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "ghostwriter";
|
||||
version = "2.0.0-rc5";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wereturtle";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Gc0/AHxxJd5Cq3dBQ0Xy2TF78CBmQFYUzm4s7q1aHEE=";
|
||||
sha256 = "sha256-5O2W7ZQeDkNzwi6t9MfNbv4fmNvak1AcMnzJTE1F9L8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config qttools ];
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "feh";
|
||||
version = "3.6.3";
|
||||
version = "3.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-Q3Qg838RYU4AjQZuKjve/Px4FEyCEpmLK6zdXSHqI7Q=";
|
||||
sha256 = "0hdvlrlpjxvmhnjvr32nxgpsw0366higg0gh9h37fxrvdh3v3k87";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config
|
||||
, ffmpeg_3, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler
|
||||
, ffmpeg, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
|
|
@ -14,14 +14,14 @@ stdenv.mkDerivation (rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ ffmpeg_3 gtk3 imagemagick libarchive libspectre libwebp poppler ];
|
||||
buildInputs = [ ffmpeg gtk3 imagemagick libarchive libspectre libwebp poppler ];
|
||||
|
||||
prePatch = "patchShebangs .";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Powerful image viewer with minimal UI";
|
||||
homepage = "http://www.pberndt.com/Programme/Linux/pqiv";
|
||||
license = licenses.gpl3;
|
||||
homepage = "https://www.pberndt.com/Programme/Linux/pqiv";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper python3Packages.wrapPython ]
|
||||
nativeBuildInputs = [ cmake makeWrapper python3Packages.wrapPython llvmPackages.llvm.dev ]
|
||||
++ optionals cudaSupport [ addOpenGLRunpath ];
|
||||
buildInputs =
|
||||
[ boost ffmpeg gettext glew ilmbase
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec{
|
||||
pname = "corectrl";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "corectrl";
|
||||
repo = "corectrl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YQDrxPqCa3OzNKd3UiAffqqvOrgbXmDFJGjYPetolyY=";
|
||||
sha256 = "sha256-hKYZkKQOvNu2qDSOq1cjoiLwwOvEqdJfqGG5p3Vhkhs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "flavours";
|
||||
|
|
@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "sha256-rDy859jg+F8XC4sJogIgdn1FoT8cf7S+KORt+7kboAc=";
|
||||
};
|
||||
|
||||
buildInputs = [ ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
cargoSha256 = "sha256-I8ZH35L2CVLy6ypmdOPd8VEG/sQeGaHyT1HWNdwyZVo=";
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "gallery_dl";
|
||||
version = "1.17.1";
|
||||
version = "1.17.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1cfaa3a617d5d222d4b9b41634b1bdede2673a8620d6b0e62fb755ae224ca2ac";
|
||||
sha256 = "5da10d931c371841575d988b4e91e9d4ce55c8c3c99aa6d4efa5abca34c75ec8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "heimer";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juzzlin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-5cepT9Tfr/3nYbxRAMqKSUDB+suEyojnexWxZ0i7GBw=";
|
||||
sha256 = "sha256-CY7n9eq/FtQ6srZ9L31nJi0b9rOQq60kNOY3iTFws/E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moonlight-qt";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moonlight-stream";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "e7fwb76zzidtF1COqrQ6gSF7bCX20j/CGjPu1Cb4HGc=";
|
||||
sha256 = "1bz4wjl8zydw46bh2mdbrsx8prh2fw0cmzqliy912fdz5aal2b74";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, setuptools, boto3, requests, click, pyyaml, pydantic, buildPythonApplication
|
||||
, pythonOlder, fetchFromGitHub, awscli }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "nimbo";
|
||||
version = "0.2.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nimbo-sh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1fs28s9ynfxrb4rzba6cmik0kl0q0vkpb4zdappsq62jqf960k24";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ setuptools boto3 awscli requests click pyyaml pydantic ];
|
||||
|
||||
# nimbo tests require an AWS instance
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "nimbo" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Run machine learning jobs on AWS with a single command";
|
||||
homepage = "https://github.com/nimbo-sh/nimbo";
|
||||
license = licenses.bsl11;
|
||||
maintainers = with maintainers; [ alex-eyre noreferences ];
|
||||
};
|
||||
}
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonApplication rec {
|
|||
|
||||
checkInputs = [ coverage coveralls docopt mock pylint pytest vcrpy ];
|
||||
|
||||
propagatedBuildInputs = [ beautifulsoup4 decorator kitchen requests ];
|
||||
propagatedBuildInputs = [ beautifulsoup4 decorator kitchen requests six ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Browse Reddit from your Terminal (fork of rtv)";
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
}:
|
||||
buildPythonApplication rec {
|
||||
pname = "visidata";
|
||||
version = "2.2.1";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "saulpw";
|
||||
repo = "visidata";
|
||||
rev = "v${version}";
|
||||
sha256 = "1gkvnywjg0n3n7d855ivclsj3d8mzihhkgv9a18srcszkmyix903";
|
||||
sha256 = "0mvf2603d9b0s6rh7sl7mg4ipbh0nk05xgh1078mwvx31qjsmq1i";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
name = "xplr";
|
||||
version = "0.5.12";
|
||||
pname = "xplr";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sayanarijit";
|
||||
repo = name;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0dmqa56sxyvrq03rpf9yczp75zk44s79ilz6kbykdghp0d9lyldf";
|
||||
sha256 = "1mqxnahhbf394niyc8i6gk2y3i7lj9cj71k460r58cmir5fch82m";
|
||||
};
|
||||
|
||||
cargoSha256 = "1mb1rfax91cbi2wvshl8jsfykx9kfwff8fkqa7rc4plqxnz0qxkx";
|
||||
cargoSha256 = "1dfcmkfclkq5b103jl98yalcl3mnvsq8xpkdasf72d3wgzarih16";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A hackable, minimal, fast TUI file explorer";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, coreutils }:
|
||||
{ lib, stdenv, fetchFromGitHub, coreutils, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "3proxy";
|
||||
|
|
@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
|
|||
"DESTDIR=${placeholder "out"}"
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
smoke-test = nixosTests._3proxy;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tiny free proxy server";
|
||||
homepage = "https://github.com/z3APA3A/3proxy";
|
||||
|
|
|
|||
|
|
@ -142,6 +142,8 @@ stdenv.mkDerivation rec {
|
|||
ac_add_options --enable-jemalloc
|
||||
ac_add_options --enable-strip
|
||||
ac_add_options --enable-devtools
|
||||
# Missing from build instructions, https://forum.palemoon.org/viewtopic.php?f=5&t=25843#p214767
|
||||
ac_add_options --enable-av1
|
||||
|
||||
ac_add_options --disable-eme
|
||||
ac_add_options --disable-webrtc
|
||||
|
|
@ -159,8 +161,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]}
|
||||
|
||||
export MOZ_PKG_SPECIAL=gtk$_GTK_VERSION
|
||||
|
||||
#
|
||||
# NixOS-specific adjustments
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, glib
|
||||
, gtk3
|
||||
|
|
@ -22,14 +23,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.3.2";
|
||||
version = "1.4.1";
|
||||
pname = "cawbird";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IBBoard";
|
||||
repo = "cawbird";
|
||||
rev = "v${version}";
|
||||
sha256 = "1baw3h5wq2ib4bnphazq7n9c9wc94g0n6v4y5kg71n1dir0c3jkh";
|
||||
sha256 = "0lmrgcj1ky1vhzynl36k6ba3ws089x4qdrnkjk3lbr334kicx9na";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -69,11 +70,18 @@ stdenv.mkDerivation rec {
|
|||
patchShebangs data/meson_post_install.py
|
||||
'';
|
||||
|
||||
# supply Twitter API keys
|
||||
# use default keys supplied by upstream, see https://github.com/IBBoard/cawbird/blob/master/README.md#preparation
|
||||
mesonFlags = [
|
||||
"-Dconsumer_key_base64=VmY5dG9yRFcyWk93MzJEZmhVdEk5Y3NMOA=="
|
||||
"-Dconsumer_secret_base64=MThCRXIxbWRESDQ2Y0podzVtVU13SGUyVGlCRXhPb3BFRHhGYlB6ZkpybG5GdXZaSjI="
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Native GTK Twitter client for the Linux desktop";
|
||||
longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird.";
|
||||
homepage = "https://ibboard.co.uk/cawbird/";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ jonafato schmittlauch ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "0.13.2";
|
||||
version = "0.13.3";
|
||||
|
||||
manifests = fetchzip {
|
||||
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
||||
|
|
@ -19,10 +19,10 @@ buildGoModule rec {
|
|||
owner = "fluxcd";
|
||||
repo = "flux2";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yWcoHUHEiRp4YxTDxi+inJkpb8dnTVTwSO3MgFyhvps=";
|
||||
sha256 = "sha256-RaQOefVqDPHvTF1qMtgAFNpA1Gx7Vo2JKiwteePsGyo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-hSnTM89s3R7UDn1gLlb1gu6rhTPqVKJpWKCz1SDyfmg=";
|
||||
vendorSha256 = "sha256-GR40BgNMHi3TXVQVN1FaPNVi0HXYVm3vbg4NTXfYBes=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "helmfile";
|
||||
version = "0.138.7";
|
||||
version = "0.139.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roboll";
|
||||
repo = "helmfile";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LFNsSd+S+mQiTk7bCnSD/Kp/D0Jefxo80eRsGkStBhs=";
|
||||
sha256 = "sha256-bwhiua+KQdt9fyvM4TeS6Mm7EQB9K2L04FPhGS380xI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-WlV6moJymQ7VyZXXuViCNN1WP4NzBUszavxpKjQR8to=";
|
||||
vendorSha256 = "sha256-Qpou4e1My/obIHL/4/IEUml0F82atIwPGZX5+vpvk0k=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "helmsman";
|
||||
version = "3.6.6";
|
||||
version = "3.6.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Praqma";
|
||||
repo = "helmsman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SGVch7mMtHi5GYFOrSss4dk29aRTQmBzkPYOetPdF88=";
|
||||
sha256 = "sha256-6w2CV6Uj1b8b3vwB933eNHPe1rK+TRyUL++Vy38cKqo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-mktq5Dnk1mBO2yy5SeMDxa/akXdO5i2WafMTGtH53H8=";
|
||||
vendorSha256 = "sha256-icX8mOc8g+DhfAjD1pzneLWTXY17lXyAjdPOWAxkHwI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "istioctl";
|
||||
version = "1.9.3";
|
||||
version = "1.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "istio";
|
||||
repo = "istio";
|
||||
rev = version;
|
||||
sha256 = "sha256-gCI4LRUjsE6V7fomWaQsseX1Xi2f+2ZgtvWBDarpXvw=";
|
||||
sha256 = "sha256-QyiGDk9lA9Y49VpRNRGNbir/ql/Vzp6wsZ1LGodGTks=";
|
||||
};
|
||||
vendorSha256 = "sha256-yJHYyRPl1V1WNV0nJoR3bRTTGRTQaT/tG4TSQeL5U88=";
|
||||
vendorSha256 = "sha256-N+7xajNkxuaC1yDTkPCg80bl2gRy2+Sa4Qq1A8zSGD8=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub, ... }:
|
||||
|
||||
let version = "0.19.0"; in
|
||||
let version = "0.19.1"; in
|
||||
|
||||
buildGoPackage {
|
||||
pname = "kubecfg";
|
||||
|
|
@ -10,7 +10,7 @@ buildGoPackage {
|
|||
owner = "bitnami";
|
||||
repo = "kubecfg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-G3yLpo/6hv6t3i6b/KMgoZqltyGDddg/SsNPF8hNeUg=";
|
||||
sha256 = "sha256-makRYWBtOjvuv7dAY1vNh1Nxv+nETVlaFh1C3oiojUo=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/bitnami/kubecfg";
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kubernetes";
|
||||
version = "1.20.5";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RDaD7tlTtAucW8ido9FumKb5E9n6F9H8HwxQ9TPyOLk=";
|
||||
sha256 = "sha256-5IUcKVbHxL5qb7M087sZSsd50t5zSaeWATnyLHkVsRU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "FlexGet";
|
||||
version = "3.1.116";
|
||||
version = "3.1.121";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6372b36495ae023bd64ce28ca649feba54b060ed8f0a5f606a4845974e834493";
|
||||
sha256 = "91270a51ed29e4a578c7549ebd01665f4bcf49bf7773a15db27f4ccb13659e00";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -35,6 +35,7 @@ python3Packages.buildPythonApplication rec {
|
|||
flask-restful
|
||||
flask-restx
|
||||
flask
|
||||
greenlet
|
||||
guessit
|
||||
html5lib
|
||||
jinja2
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hydroxide";
|
||||
version = "0.2.17";
|
||||
version = "0.2.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emersion";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gNMLVh5ntVCxiIKLshRvYXi5dYLZ8qiZFwZxbNPVFTk=";
|
||||
sha256 = "sha256-s8EmoVZUUeaKTaINXvKO5tSdPUS3MlhEucwnmTTC3Wk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-f/1Vxuc87eQie/j1b14q/1lAAzRk+ZDkBaTmHtCy7go=";
|
||||
vendorSha256 = "sha256-jkiTpDsJN628YKkFZcng9P05hmNUc3UeFsanLf+QtJY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder,
|
||||
attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus,
|
||||
prompt_toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3,
|
||||
setuptools,
|
||||
setuptools, fetchpatch,
|
||||
|
||||
pytest, faker, pytest-aiohttp, aioresponses,
|
||||
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "pantalaimon";
|
||||
version = "0.8.0";
|
||||
version = "0.9.2";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -19,9 +19,17 @@ buildPythonApplication rec {
|
|||
owner = "matrix-org";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0n86cdpw85qzlcr1ynvar0f0zbphmdz1jia9r75lmj07iw4r5hk9";
|
||||
sha256 = "11dfv5b2slqybisq6npmrqxrzslh4bjs4093vrc05s94046d9d9n";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# accept newer matrix-nio versions
|
||||
(fetchpatch {
|
||||
url = "https://github.com/matrix-org/pantalaimon/commit/73f68c76fb05037bd7fe71688ce39eb1f526a385.patch";
|
||||
sha256 = "0wvqcfan8yp67p6khsqkynbkifksp2422b9jy511mvhpy51sqykl";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
appdirs
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "himalaya";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "soywod";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:0m95gjdzh94vsbs7cdxlczk29m536acwlg4y55j7rz9cdcjfvzkj";
|
||||
sha256 = "sha256-wiasnkoIU4l1yyhUSTahOJMCOyhpz2w4WJzi/UBmiHE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256:0bz91vs5i3qb8rd9yfajavb4lyp24cxmxalzkg2chii4ckr8d3ph";
|
||||
cargoSha256 = "sha256-VXSJLDpT0s+sh6buOP63QSiUp34H6G/FWibemtNU9wQ=";
|
||||
|
||||
# use --lib flag to avoid test with imap server
|
||||
# https://github.com/soywod/himalaya/issues/145
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchgit, libowfat, zlib }:
|
||||
{ lib, stdenv, fetchgit, libowfat, zlib, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "opentracker-2018-05-26";
|
||||
|
|
@ -23,6 +23,10 @@ stdenv.mkDerivation {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
bittorrent-integration = nixosTests.bittorrent;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://erdgeist.org/arts/software/opentracker/";
|
||||
license = licenses.beerware;
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
, wrapGAppsHook
|
||||
, enableQt ? false
|
||||
, qt5
|
||||
, nixosTests
|
||||
, enableSystemd ? stdenv.isLinux
|
||||
, enableDaemon ? true
|
||||
, enableCli ? true
|
||||
|
|
@ -101,6 +102,10 @@ in stdenv.mkDerivation {
|
|||
EOF
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
smoke-test = nixosTests.bittorrent;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A fast, easy and free BitTorrent client";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
, which
|
||||
, gettext
|
||||
, gobject-introspection
|
||||
, gdk-pixbuf
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
|
|
@ -60,6 +61,7 @@ python3Packages.buildPythonApplication rec {
|
|||
gobject-introspection
|
||||
(lib.getBin gettext)
|
||||
which
|
||||
gdk-pixbuf # for the setup hook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,89 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, python3
|
||||
, gettext
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "timeline";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/thetimelineproj/${pname}-${version}.zip";
|
||||
sha256 = "1pa0whqci6c2p20xf7gbndrrpr1xg42ixhql595ibdd4p3l37v23";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ];
|
||||
|
||||
pythonPath = with python3.pkgs; [
|
||||
wxPython_4_0 # not compatible with wxPython_4_1. reported upstream https://github.com/wxWidgets/Phoenix/issues/1956
|
||||
humblewx
|
||||
icalendar
|
||||
markdown
|
||||
pysvg-py3
|
||||
pillow
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
gettext
|
||||
python3.pkgs.mock
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
desktopName = "Timeline";
|
||||
name = "timeline";
|
||||
comment = "Display and navigate information on a timeline";
|
||||
icon = "timeline";
|
||||
terminal = false;
|
||||
exec = "timeline";
|
||||
categories = "Office;Calendar;";
|
||||
})
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
doCheck = false;
|
||||
|
||||
patchPhase = ''
|
||||
sed -i "s|_ROOT =.*|_ROOT = \"$out/usr/share/timeline/\"|" source/timelinelib/config/paths.py
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
site_packages=$out/${python3.pkgs.python.sitePackages}
|
||||
install -D -m755 source/timeline.py $out/bin/timeline
|
||||
mkdir -p $site_packages
|
||||
cp -r source/timelinelib $site_packages/
|
||||
|
||||
mkdir -p $out/usr/share/timeline/locale
|
||||
cp -r icons $out/usr/share/timeline/
|
||||
cp -r translations/ $out/usr/share/timeline/
|
||||
|
||||
mkdir -p $out/share/icons/hicolor/{48x48,32x32,16x16}/apps
|
||||
cp icons/48.png $out/share/icons/hicolor/48x48/apps/timeline.png
|
||||
cp icons/32.png $out/share/icons/hicolor/32x32/apps/timeline.png
|
||||
cp icons/16.png $out/share/icons/hicolor/16x16/apps/timeline.png
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# tests fail because they need an x server
|
||||
# Unable to access the X Display, is $DISPLAY set properly?
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${python3.interpreter} tools/execute-specs.py
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://thetimelineproj.sourceforge.net/";
|
||||
changelog = "http://thetimelineproj.sourceforge.net/changelog.html";
|
||||
description = "Display and navigate information on a timeline";
|
||||
license = with licenses; [ gpl3Only cc-by-sa-30 ];
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ davidak ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,20 +1,17 @@
|
|||
{ lib, stdenv, fetchgit, ocaml }:
|
||||
{ lib, stdenv, fetchFromGitHub, ocaml }:
|
||||
|
||||
let
|
||||
version = "20170720";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "coq2html";
|
||||
inherit version;
|
||||
version = "1.2";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/xavierleroy/coq2html";
|
||||
rev = "e2b94093c6b9a877717f181765e30577de22439e";
|
||||
sha256 = "1x466j0pyjggyz0870pdllv9f5vpnfrgkd0w7ajvm9rkwyp3f610";
|
||||
src = fetchFromGitHub {
|
||||
owner = "xavierleroy";
|
||||
repo = "coq2html";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ty/6A3wivjDCrmlZAcZyaIwQQ+vPBJm9MhtW6nZcV3s=";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml ];
|
||||
nativeBuildInputs = [ ocaml ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
|
|
@ -32,8 +29,8 @@ stdenv.mkDerivation {
|
|||
"Proof" keyword.
|
||||
'';
|
||||
homepage = "https://github.com/xavierleroy/coq2html";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ jwiegley ];
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ jwiegley siraben ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libpoly";
|
||||
version = "0.1.8";
|
||||
version = "0.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SRI-CSL";
|
||||
repo = "libpoly";
|
||||
# they've pushed to the release branch, use explicit tag
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "1n3gijksnl2ybznq4lkwm2428f82423sxq18gnb2g1kiwqlzdaa3";
|
||||
sha256 = "sha256-E2lHo8Bt4ujoGQ623fjkQbqRnDYJYilXdRt4lnF4wJk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gretl";
|
||||
version = "2021a";
|
||||
version = "2021b";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-BDaTv6PORiBnsEaU7uXJIKuxTqIgpY44vUmSViyME0A=";
|
||||
sha256 = "sha256-3KSAA0UPx3cqMXf/G5nrlCfLjWcDiGtzvJe/syRyE6c=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
, withpcre2 ? true
|
||||
, sendEmailSupport
|
||||
, darwin
|
||||
, nixosTests
|
||||
, withLibsecret ? false
|
||||
, pkg-config, glib, libsecret
|
||||
, gzip # needed at runtime by gitweb.cgi
|
||||
|
|
@ -334,6 +335,9 @@ stdenv.mkDerivation {
|
|||
|
||||
stripDebugList = [ "lib" "libexec" "bin" "share/git/contrib/credential/libsecret" ];
|
||||
|
||||
passthru.tests = {
|
||||
buildbot-integration = nixosTests.buildbot;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://git-scm.com/";
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-repo";
|
||||
version = "2.13.1";
|
||||
version = "2.14.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "android";
|
||||
repo = "tools_repo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-D6gh14XOZ6Fjypfhg9l5ozPhyf6u6M0Wc8HdagdPM/Q=";
|
||||
sha256 = "sha256-3FSkWpHda1jVhy/633B+ippWcbKd83IlQcJYS9Qx5wQ=";
|
||||
};
|
||||
|
||||
patches = [ ./import-ssl-module.patch ];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, boost, zlib, botan, libidn
|
||||
, lua, pcre, sqlite, perl, pkg-config, expect
|
||||
{ lib, stdenv, fetchurl, fetchFromGitHub, boost, zlib, botan2, libidn
|
||||
, lua, pcre, sqlite, perl, pkg-config, expect, less
|
||||
, bzip2, gmp, openssl
|
||||
, autoreconfHook, texinfo
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.1";
|
||||
version = "1.1-unstable-2021-05-01";
|
||||
perlVersion = lib.getVersion perl;
|
||||
in
|
||||
|
||||
|
|
@ -14,22 +15,41 @@ stdenv.mkDerivation rec {
|
|||
pname = "monotone";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2";
|
||||
sha256 = "124cwgi2q86hagslbk5idxbs9j896rfjzryhr6z63r6l485gcp7r";
|
||||
# src = fetchurl {
|
||||
# url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2";
|
||||
# sha256 = "124cwgi2q86hagslbk5idxbs9j896rfjzryhr6z63r6l485gcp7r";
|
||||
# };
|
||||
|
||||
# My mirror of upstream Monotone repository
|
||||
# Could fetchmtn, but circular dependency; snapshot requested
|
||||
# https://lists.nongnu.org/archive/html/monotone-devel/2021-05/msg00000.html
|
||||
src = fetchFromGitHub {
|
||||
owner = "7c6f434c";
|
||||
repo = "monotone-mirror";
|
||||
rev = "b30b0e1c16def043d2dad57d1467d5bfdecdb070";
|
||||
hash = "sha256:1hfy8vaap3184cd7h3qhz0da7c992idkc6q2nz9frhma45c5vgmd";
|
||||
};
|
||||
|
||||
patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ boost zlib botan libidn lua pcre sqlite expect
|
||||
openssl gmp bzip2 ];
|
||||
postPatch = ''
|
||||
sed -e 's@/usr/bin/less@${less}/bin/less@' -i src/unix/terminal.cc
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook texinfo ];
|
||||
buildInputs = [ boost zlib botan2 libidn lua pcre sqlite expect
|
||||
openssl gmp bzip2 perl ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/${pname}-${version}
|
||||
cp -rv contrib/ $out/share/${pname}-${version}/contrib
|
||||
mkdir -p $out/${perl.libPrefix}/${perlVersion}
|
||||
cp -v contrib/Monotone.pm $out/${perl.libPrefix}/${perlVersion}
|
||||
|
||||
patchShebangs "$out/share/monotone"
|
||||
patchShebangs "$out/share/${pname}-${version}"
|
||||
|
||||
find "$out"/share/{doc/monotone,${pname}-${version}}/contrib/ -type f | xargs sed -e 's@! */usr/bin/@!/usr/bin/env @; s@! */bin/bash@!/usr/bin/env bash@' -i
|
||||
'';
|
||||
|
||||
#doCheck = true; # some tests fail (and they take VERY long)
|
||||
|
|
@ -38,6 +58,6 @@ stdenv.mkDerivation rec {
|
|||
description = "A free distributed version control system";
|
||||
maintainers = [ maintainers.raskin ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "droidcam";
|
||||
version = "1.7.2";
|
||||
version = "1.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aramg";
|
||||
repo = "droidcam";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ny/PJu+ifs9hQRDUv1pONBb6fKJzoiNtjPOFc4veU8c=";
|
||||
sha256 = "sha256-Ok8FJweSzmewjYzfBJQ28xGHKK/Y32ng1hOCPVwc8eU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
|
|||
version = "4.9.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
|
||||
sha256 = "sha256-xgdCjo2RLp+EtUTfSiys7PURhnC00R9IOLPtz3427pA=";
|
||||
url = "https://web.archive.org/web/20210326102451/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
|
||||
sha256 = "sha256-T+y8k757/qFCVOCc/SNc7a+KmyscPlowubNQYzMr8jY=";
|
||||
};
|
||||
|
||||
unpackPhase = "tar xvf $src";
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jftui";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aanok";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0riwqfh5lyjg7as75kyx7jw6zq4gikbglhv8s05y7pzgsc9xy75j";
|
||||
sha256 = "sha256-KyiLZuzQ0kCReUEPBf0YbmdXhw9nBfghBBsXiy9+N0E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
buildKodiAddon rec {
|
||||
pname = "netflix";
|
||||
namespace = "plugin.video.netflix";
|
||||
version = "1.15.0";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CastagnaIT";
|
||||
repo = namespace;
|
||||
rev = "v${version}";
|
||||
sha256 = "1jibzzm8viqpanby6lqxpb95gw5hw3lfsw4jasjskiinbf8n469k";
|
||||
sha256 = "0c5cdi6s76vg2gyxzf0ylisxai1ii8vi6h4q4mznpfmplfdp667v";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "kooha";
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SeaDve";
|
||||
repo = "Kooha";
|
||||
rev = "v${version}";
|
||||
sha256 = "0jr55b39py9c8dc9rihn7ffx2yh71qqdk6pfn3c2ciiajjs74l17";
|
||||
sha256 = "14lrx6wplvlk3cg3wij88h4ydp3m69pw7lvvzrq3j9qnh431bs36";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
{ stdenv, lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "prism";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "muesli";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0q7q7aj3fm45bnx6hgl9c1ll8na16x6p7qapr0c4a6dhxwd7n511";
|
||||
};
|
||||
|
||||
vendorSha256 = "1mkd1s9zgzy9agy2rjjk8wfdga7nzv9cmwgiarfi4xrqzj4mbaxq";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An RTMP stream recaster/splitter";
|
||||
homepage = "https://github.com/muesli/prism";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ paperdigits ];
|
||||
};
|
||||
}
|
||||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "containerd";
|
||||
version = "1.4.4";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
sha256 = "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb";
|
||||
sha256 = "sha256-dUn9lvDLoljq5JPFvUdJ8te0VHkCs9Y9Em2mcq5mHvY=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/containerd/containerd";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,115 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchurl
|
||||
, fetchgit
|
||||
, ffmpeg
|
||||
, libGL
|
||||
, libX11
|
||||
, libcap
|
||||
, libdrm
|
||||
, libinput
|
||||
, libpng
|
||||
, libxcb
|
||||
, libxkbcommon
|
||||
, mesa
|
||||
, meson
|
||||
, ninja
|
||||
, pixman
|
||||
, pkg-config
|
||||
, unzip
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, xcbutilerrors
|
||||
, xcbutilimage
|
||||
, xcbutilwm
|
||||
}:
|
||||
|
||||
let
|
||||
# cereal.wrap
|
||||
cereal-wrap = fetchurl {
|
||||
name = "cereal-1.3.0.tar.gz";
|
||||
url = "https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz";
|
||||
hash = "sha256-Mp6j4xMLAmwDpKzFDhaOfa/05uZhvGp9/sDXe1cIUdU=";
|
||||
};
|
||||
cereal-wrapdb = fetchurl {
|
||||
name = "cereal-1.3.0-1-wrap.zip";
|
||||
url = "https://wrapdb.mesonbuild.com/v1/projects/cereal/1.3.0/1/get_zip";
|
||||
hash = "sha256-QYck5UT7fPLqtLDb1iOSX4Hnnns48Jj23Ae/LCfLSKY=";
|
||||
};
|
||||
|
||||
# expected.wrap
|
||||
expected-wrap = fetchgit {
|
||||
name = "expected";
|
||||
url = "https://gitlab.com/cardboardwm/expected";
|
||||
rev = "0ee13cb2b058809aa9708c45ca18d494e72a759e";
|
||||
sha256 = "sha256-gYr4/pjuLlr3k6Jcrg2/SzJLtbgyA+ZN2oMHkHXANDo=";
|
||||
};
|
||||
|
||||
# wlroots.wrap
|
||||
wlroots-wrap = fetchgit {
|
||||
name = "wlroots";
|
||||
url = "https://github.com/swaywm/wlroots";
|
||||
rev = "0.12.0";
|
||||
sha256 = "sha256-1rE3D+kQprjcjobc95/mQkUa5y1noY0MdoYJ/SpFQwY=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cardboard";
|
||||
version = "0.0.0-unstable=2021-01-21";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cardboardwm";
|
||||
repo = pname;
|
||||
rev = "f2ef2ff076ddbbd23994553b8eff131f9bd0207f";
|
||||
hash = "sha256-43aqAWk4QoIP0BpRyPRDWFtVh/1UbrBoEeTDEF2gZX4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
unzip
|
||||
];
|
||||
buildInputs = [
|
||||
ffmpeg
|
||||
libGL
|
||||
libX11
|
||||
libcap
|
||||
libdrm
|
||||
libinput
|
||||
libpng
|
||||
libxcb
|
||||
libxkbcommon
|
||||
mesa
|
||||
pixman
|
||||
wayland
|
||||
wayland-protocols
|
||||
xcbutilerrors
|
||||
xcbutilimage
|
||||
xcbutilwm
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
(cd subprojects
|
||||
tar xvf ${cereal-wrap}
|
||||
unzip ${cereal-wrapdb}
|
||||
cp -r ${expected-wrap} ${expected-wrap.name}
|
||||
cp -r ${wlroots-wrap} ${wlroots-wrap.name}
|
||||
)
|
||||
'';
|
||||
|
||||
# "Inherited" from Nixpkgs expression for wlroots
|
||||
mesonFlags = [
|
||||
"-Dwlroots:logind-provider=systemd"
|
||||
"-Dwlroots:libseat=disabled"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.com/cardboardwm/cardboard";
|
||||
description = "A scrollable, tiling Wayland compositor inspired on PaperWM";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "i3status-rust";
|
||||
version = "0.14.7";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greshake";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ndqh4bzwim32n8psgsgdd47xmlb45rhvcwla1wm506byb21nk4c";
|
||||
sha256 = "sha256-rio+3S3bA8KfosKAE9Txzftr/q2PVyd8Z9crz1O/ysc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1kwd76i4lbpxdvan5nzl7dhslh45cipnsdgvssdqd9k34hap05p5";
|
||||
cargoSha256 = "sha256-17bIeK/mPE+rAO/c65IWvMGqAU6sOClJQC8z+O36cmU=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
|
|
@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoBuildFlags = [
|
||||
"--features=notmuch"
|
||||
"--features=maildir"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
|
|
|||
|
|
@ -20,4 +20,15 @@ in {
|
|||
# Fix broken symlinks in the Xfce background directory.
|
||||
patches = [ ./f33-fix-xfce-path.patch ];
|
||||
};
|
||||
|
||||
f34 = fedoraBackground rec {
|
||||
version = "34.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz";
|
||||
hash = "sha256-0gotgQ4N0yE8WZbsu7B3jmUIZrycbqjEMxZl01JcJj4=";
|
||||
};
|
||||
# Fix broken symlinks in the Xfce background directory.
|
||||
patches = [ ./f34-fix-xfce-path.patch ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/default/Makefile b/default/Makefile
|
||||
index 172d5d9..540a1c0 100644
|
||||
--- a/default/Makefile
|
||||
+++ b/default/Makefile
|
||||
@@ -1,7 +1,7 @@
|
||||
WP_NAME=f34
|
||||
WP_BIGNAME=F34
|
||||
WP_DIR=$(DESTDIR)/usr/share/backgrounds/$(WP_NAME)
|
||||
-WP_DIR_LN=/usr/share/backgrounds/$(WP_NAME)
|
||||
+WP_DIR_LN=$(DESTDIR)/usr/share/backgrounds/$(WP_NAME)
|
||||
GNOME_BG_DIR=$(DESTDIR)/usr/share/gnome-background-properties
|
||||
KDE_BG_DIR=$(DESTDIR)/usr/share/wallpapers
|
||||
MATE_BG_DIR=$(DESTDIR)/usr/share/mate-background-properties
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"commit": "95e79fb1492c7f34c2454dcb783ac8b46c0f5c8c",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/95e79fb1492c7f34c2454dcb783ac8b46c0f5c8c.tar.gz",
|
||||
"sha256": "1wp7m8j6z2j6h8z14cnzg223jmkcgpsafraxiirbih3h4wqq2nhr",
|
||||
"msg": "Update from Hackage at 2021-05-03T20:39:01Z"
|
||||
"commit": "3d54acea35f6f709fa96c87696b845b3044dcab5",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3d54acea35f6f709fa96c87696b845b3044dcab5.tar.gz",
|
||||
"sha256": "1zlkjs9d8r5k803wbsz5fmsrs76150chcnz2jaapmq32riyvm21g",
|
||||
"msg": "Update from Hackage at 2021-05-07T19:29:19Z"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plano-theme";
|
||||
version = "3.36-2";
|
||||
version = "3.38-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lassekongo83";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "01dkjck9rlrf8wa30ad7kfv0gbpdf3l05rw7nxrvb1gh5d2vxig9";
|
||||
sha256 = "0g2mwvzc04z3dsdfhwqgw9s7987406pv22s9rbazfvprk4ddc5b6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-disable-unredirect";
|
||||
version = "unstable-2021-01-17";
|
||||
version = "unstable-2021-04-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kazysmaster";
|
||||
repo = "gnome-shell-extension-disable-unredirect";
|
||||
rev = "2ecb2f489ea3316b77d04f03a0c885f322c67e79";
|
||||
sha256 = "1rjyrg8qya0asndxr7189a9npww0rcxk02wkxrxjy7fdp5m89p7y";
|
||||
rev = "2a4c0e6a7a7a5f1aad9907ee2cf43d0725e10c19";
|
||||
sha256 = "06hbyy20xz0bvzg0vs5w4092nyfpg372c86cdm1akcjm72m5sim9";
|
||||
};
|
||||
|
||||
uuid = "unredirect@vaina.lt";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gleam";
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gleam-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sB+QTokH/ngcED40+vw+okFLFt+JSJQ/CbOgzlt/YmE=";
|
||||
sha256 = "sha256-vBxVGIgg2BpVvEYjmX99YSf1zy9aWOHr6ftaYxJWkzY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ openssl ] ++
|
||||
lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
|
||||
cargoSha256 = "sha256-C/OAzg24kulIvIZwV9L5hwvf/BkF05spJPskr2maqrM=";
|
||||
cargoSha256 = "sha256-2zHc7xk5MuEUO9YGifSWbgRTi51ZUk84QLro94LsBtQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A statically typed language for the Erlang VM";
|
||||
|
|
|
|||
|
|
@ -28,10 +28,9 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake which m4 bison flex python3 ];
|
||||
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.llvm.dev ];
|
||||
buildInputs = with llvmPackages; [
|
||||
# we need to link against libclang, so we need the unwrapped
|
||||
llvm llvmPackages.clang-unwrapped
|
||||
llvm llvmPackages.libclang
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -66,6 +65,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DLLVM_CONFIG_EXECUTABLE=${llvmPackages.llvm.dev}/bin/llvm-config"
|
||||
"-DCLANG_EXECUTABLE=${llvmPackages.clang}/bin/clang"
|
||||
"-DCLANGPP_EXECUTABLE=${llvmPackages.clang}/bin/clang++"
|
||||
"-DISPC_INCLUDE_EXAMPLES=OFF"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation ( rec {
|
||||
pname = "corral";
|
||||
version = "0.4.1";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ponylang";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-YJZ1jGMOeZKGZaTrWO2mtR94F0voC2DXaghi0LytF7I=";
|
||||
sha256 = "sha256-mQ/SxnppChZ+6PKVo5VM+QiNn94F4qJT1kQSrwXTa7k=";
|
||||
};
|
||||
|
||||
buildInputs = [ ponyc ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
|
||||
, lit
|
||||
, llvm_8
|
||||
|
|
@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0hxalc3fkliqs61hpr97phbm3qsx4b8vgnlg30aimzr6aas403r5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ pkg-config cmake llvm_8.dev ];
|
||||
|
||||
buildInputs = [ llvm_8 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ llvmPackages.stdenv.mkDerivation rec {
|
|||
sha256 = "1z6c4ym9jmga46cw2arn7zv2drcpmrf3vw139gscxp27n7q2z5md";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake llvmPackages.llvm.dev ];
|
||||
buildInputs = [
|
||||
llvmPackages.clang-unwrapped
|
||||
llvmPackages.libclang
|
||||
llvmPackages.llvm
|
||||
llvmPackages.lld
|
||||
libxml2
|
||||
|
|
|
|||
|
|
@ -0,0 +1,71 @@
|
|||
# ARM-SPECIFIC OVERRIDES FOR THE HASKELL PACKAGE SET IN NIXPKGS
|
||||
#
|
||||
# This extension is applied to all haskell package sets in nixpkgs
|
||||
# if `stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64`
|
||||
# to apply arm specific workarounds or fixes.
|
||||
#
|
||||
# The file is split into three parts:
|
||||
#
|
||||
# * Overrides that are applied for all arm platforms
|
||||
# * Overrides for aarch32 platforms
|
||||
# * Overrides for aarch64 platforms
|
||||
#
|
||||
# This may be extended in the future to also include compiler-
|
||||
# specific sections as compiler and linker related bugs may
|
||||
# get fixed subsequently.
|
||||
#
|
||||
# When adding new overrides, try to research which section they
|
||||
# belong into. Most likely we'll be favouring aarch64 overrides
|
||||
# in practice since that is the only platform we can test on
|
||||
# Hydra. Also take care to group overrides by the issue they
|
||||
# solve, so refactors and updates to this file are less tedious.
|
||||
{ pkgs, haskellLib }:
|
||||
|
||||
let
|
||||
inherit (pkgs) lib;
|
||||
in
|
||||
|
||||
with haskellLib;
|
||||
|
||||
self: super: {
|
||||
# COMMON ARM OVERRIDES
|
||||
|
||||
# moved here from configuration-common.nix, no reason given.
|
||||
servant-docs = dontCheck super.servant-docs;
|
||||
swagger2 = dontHaddock (dontCheck super.swagger2);
|
||||
|
||||
# Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
|
||||
happy = dontCheck super.happy;
|
||||
|
||||
} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 {
|
||||
# AARCH64-SPECIFIC OVERRIDES
|
||||
|
||||
# Doctests fail on aarch64 due to a GHCi linking bug
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295437
|
||||
# TODO: figure out if needed on aarch32 as well
|
||||
language-nix = dontCheck super.language-nix;
|
||||
trifecta = dontCheck super.trifecta;
|
||||
ad = dontCheck super.ad;
|
||||
vinyl = dontCheck super.vinyl;
|
||||
BNFC = dontCheck super.BNFC;
|
||||
C-structs = dontCheck super.C-structs;
|
||||
accelerate = dontCheck super.accelerate;
|
||||
focuslist = dontCheck super.focuslist;
|
||||
flight-kml = dontCheck super.flight-kml;
|
||||
exact-real = dontCheck super.exact-real;
|
||||
autoapply = dontCheck super.autoapply;
|
||||
hint = dontCheck super.hint;
|
||||
hgeometry = dontCheck super.hgeometry;
|
||||
headroom = dontCheck super.headroom;
|
||||
haskell-time-range = dontCheck super.haskell-time-range;
|
||||
hsakamai = dontCheck super.hsakamai;
|
||||
hsemail-ns = dontCheck super.hsemail-ns;
|
||||
openapi3 = dontCheck super.openapi3;
|
||||
|
||||
# https://github.com/ekmett/half/issues/35
|
||||
half = dontCheck super.half;
|
||||
|
||||
} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch32 {
|
||||
# AARCH32-SPECIFIC OVERRIDES
|
||||
|
||||
}
|
||||
|
|
@ -75,10 +75,6 @@ self: super: {
|
|||
# Fix test trying to access /home directory
|
||||
shell-conduit = overrideCabal super.shell-conduit (drv: {
|
||||
postPatch = "sed -i s/home/tmp/ test/Spec.hs";
|
||||
|
||||
# the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo
|
||||
# see: https://github.com/psibi/shell-conduit/issues/12
|
||||
doCheck = !pkgs.stdenv.isDarwin;
|
||||
});
|
||||
|
||||
# https://github.com/froozen/kademlia/issues/2
|
||||
|
|
@ -117,15 +113,6 @@ self: super: {
|
|||
# Jailbreak is necessary for QuickCheck dependency.
|
||||
vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector);
|
||||
|
||||
conduit-extra = if pkgs.stdenv.isDarwin
|
||||
then super.conduit-extra.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; })
|
||||
else super.conduit-extra;
|
||||
|
||||
# Fix Darwin build.
|
||||
halive = if pkgs.stdenv.isDarwin
|
||||
then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit
|
||||
else super.halive;
|
||||
|
||||
# Test suite fails due golden tests checking text representation
|
||||
# of normalized dhall expressions, and newer dhall versions format
|
||||
# differently.
|
||||
|
|
@ -134,19 +121,6 @@ self: super: {
|
|||
then throw "Drop dontCheck override for hpack-dhall > 0.5.2"
|
||||
else dontCheck super.hpack-dhall;
|
||||
|
||||
barbly = addBuildDepend super.barbly pkgs.darwin.apple_sdk.frameworks.AppKit;
|
||||
|
||||
# Hakyll's tests are broken on Darwin (3 failures); and they require util-linux
|
||||
hakyll = if pkgs.stdenv.isDarwin
|
||||
then dontCheck (overrideCabal super.hakyll (drv: {
|
||||
testToolDepends = [];
|
||||
}))
|
||||
else super.hakyll;
|
||||
|
||||
double-conversion = if !pkgs.stdenv.isDarwin
|
||||
then super.double-conversion
|
||||
else addExtraLibrary super.double-conversion pkgs.libcxx;
|
||||
|
||||
inline-c-cpp = overrideCabal super.inline-c-cpp (drv: {
|
||||
postPatch = (drv.postPatch or "") + ''
|
||||
substituteInPlace inline-c-cpp.cabal --replace "-optc-std=c++11" ""
|
||||
|
|
@ -307,23 +281,16 @@ self: super: {
|
|||
integer-roots = dontCheck super.integer-roots; # requires an old version of smallcheck, will be fixed in > 1.0
|
||||
itanium-abi = dontCheck super.itanium-abi;
|
||||
katt = dontCheck super.katt;
|
||||
language-nix = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.hostPlatform.isi686) then dontCheck super.language-nix else super.language-nix; # aarch64: https://ghc.haskell.org/trac/ghc/ticket/15275
|
||||
language-slice = dontCheck super.language-slice;
|
||||
ldap-client = dontCheck super.ldap-client;
|
||||
lensref = dontCheck super.lensref;
|
||||
lvmrun = disableHardening (dontCheck super.lvmrun) ["format"];
|
||||
math-functions = if pkgs.stdenv.isDarwin
|
||||
then dontCheck super.math-functions # "erf table" test fails on Darwin https://github.com/bos/math-functions/issues/63
|
||||
else super.math-functions;
|
||||
matplotlib = dontCheck super.matplotlib;
|
||||
# https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage
|
||||
matterhorn = doJailbreak super.matterhorn; # this is needed until the end of time :')
|
||||
memcache = dontCheck super.memcache;
|
||||
metrics = dontCheck super.metrics;
|
||||
milena = dontCheck super.milena;
|
||||
mockery = if pkgs.stdenv.isDarwin
|
||||
then overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; }) # darwin doesn't have sub-second resolution https://github.com/hspec/mockery/issues/11
|
||||
else super.mockery;
|
||||
modular-arithmetic = dontCheck super.modular-arithmetic; # tests require a very old Glob (0.7.*)
|
||||
nats-queue = dontCheck super.nats-queue;
|
||||
netpbm = dontCheck super.netpbm;
|
||||
|
|
@ -464,9 +431,8 @@ self: super: {
|
|||
# https://github.com/andrewthad/haskell-ip/issues/67
|
||||
ip = dontCheck super.ip;
|
||||
|
||||
# https://github.com/ndmitchell/shake/issues/206
|
||||
# https://github.com/ndmitchell/shake/issues/267
|
||||
shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin && false; });
|
||||
# https://github.com/ndmitchell/shake/issues/804
|
||||
shake = dontCheck super.shake;
|
||||
|
||||
# https://github.com/nushio3/doctest-prop/issues/1
|
||||
doctest-prop = dontCheck super.doctest-prop;
|
||||
|
|
@ -841,7 +807,6 @@ self: super: {
|
|||
# With ghc-8.2.x haddock would time out for unknown reason
|
||||
# See https://github.com/haskell/haddock/issues/679
|
||||
language-puppet = dontHaddock super.language-puppet;
|
||||
filecache = overrideCabal super.filecache (drv: { doCheck = !pkgs.stdenv.isDarwin; });
|
||||
|
||||
# https://github.com/alphaHeavy/protobuf/issues/34
|
||||
protobuf = dontCheck super.protobuf;
|
||||
|
|
@ -852,17 +817,9 @@ self: super: {
|
|||
configureFlags = ["--ghc-option=-DU_DEFINE_FALSE_AND_TRUE=1"]; # https://github.com/haskell/text-icu/issues/49
|
||||
});
|
||||
|
||||
# aarch64 and armv7l fixes.
|
||||
happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
|
||||
hashable = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95
|
||||
servant-docs =
|
||||
let
|
||||
f = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64)
|
||||
then dontCheck
|
||||
else pkgs.lib.id;
|
||||
in doJailbreak (f super.servant-docs); # jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage.
|
||||
# jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage.
|
||||
servant-docs = doJailbreak super.servant-docs;
|
||||
snap-templates = doJailbreak super.snap-templates; # https://github.com/snapframework/snap-templates/issues/22
|
||||
swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2;
|
||||
|
||||
# hledger-lib requires the latest version of pretty-simple
|
||||
hledger-lib = appendPatch super.hledger-lib
|
||||
|
|
@ -1164,11 +1121,6 @@ self: super: {
|
|||
'';
|
||||
});
|
||||
|
||||
# gtk/gtk3 needs to be told on Darwin to use the Quartz
|
||||
# rather than X11 backend (see eg https://github.com/gtk2hs/gtk2hs/issues/249).
|
||||
gtk3 = appendConfigureFlags super.gtk3 (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk");
|
||||
gtk = appendConfigureFlags super.gtk (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk");
|
||||
|
||||
# Chart-tests needs and compiles some modules from Chart itself
|
||||
Chart-tests = (addExtraLibrary super.Chart-tests self.QuickCheck).overrideAttrs (old: {
|
||||
preCheck = old.postPatch or "" + ''
|
||||
|
|
@ -1438,6 +1390,12 @@ self: super: {
|
|||
# https://github.com/haskell/haskell-language-server/issues/611
|
||||
haskell-language-server = dontCheck super.haskell-language-server;
|
||||
|
||||
# 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1808
|
||||
hls-splice-plugin = dontCheck super.hls-splice-plugin;
|
||||
|
||||
# 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809
|
||||
hls-eval-plugin = dontCheck super.hls-eval-plugin;
|
||||
|
||||
# 2021-03-19: Too restrictive upper bound on optparse-applicative
|
||||
stylish-haskell = doJailbreak super.stylish-haskell;
|
||||
|
||||
|
|
@ -1466,7 +1424,7 @@ self: super: {
|
|||
});
|
||||
|
||||
# 2021-03-09: Overrides because nightly is to old for hls 1.0.0
|
||||
lsp-test = doDistribute (dontCheck self.lsp-test_0_13_0_0);
|
||||
lsp-test = doDistribute (dontCheck self.lsp-test_0_14_0_0);
|
||||
|
||||
# 2021-03-21 Test hangs
|
||||
# https://github.com/haskell/haskell-language-server/issues/1562
|
||||
|
|
@ -1521,11 +1479,6 @@ self: super: {
|
|||
# Due to tests restricting base in 0.8.0.0 release
|
||||
http-media = doJailbreak super.http-media;
|
||||
|
||||
# https://github.com/ekmett/half/issues/35
|
||||
half = if pkgs.stdenv.isAarch64
|
||||
then dontCheck super.half
|
||||
else super.half;
|
||||
|
||||
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124
|
||||
heist = doJailbreak super.heist;
|
||||
|
||||
|
|
@ -1580,10 +1533,6 @@ self: super: {
|
|||
# https://github.com/yesodweb/yesod/issues/1714
|
||||
yesod-core = dontCheck super.yesod-core;
|
||||
|
||||
# Add ApplicationServices on darwin
|
||||
apecs-physics = addPkgconfigDepends super.apecs-physics
|
||||
(pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.ApplicationServices);
|
||||
|
||||
# Break out of overspecified constraint on QuickCheck.
|
||||
algebraic-graphs = dontCheck super.algebraic-graphs;
|
||||
attoparsec = doJailbreak super.attoparsec; # https://github.com/haskell/attoparsec/pull/168
|
||||
|
|
@ -1871,16 +1820,6 @@ self: super: {
|
|||
'' + (drv.postPatch or "");
|
||||
});
|
||||
|
||||
# Doctests fail on aarch64 due to a GHCi linking bug
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295437
|
||||
ad = overrideCabal super.ad {
|
||||
doCheck = !pkgs.stdenv.hostPlatform.isAarch64;
|
||||
};
|
||||
trifecta = if pkgs.stdenv.hostPlatform.isAarch64 then dontCheck super.trifecta else super.trifecta;
|
||||
vinyl = overrideCabal super.vinyl {
|
||||
doCheck = !pkgs.stdenv.hostPlatform.isAarch64;
|
||||
};
|
||||
|
||||
# Tests need to lookup target triple x86_64-unknown-linux
|
||||
# https://github.com/llvm-hs/llvm-hs/issues/334
|
||||
llvm-hs = overrideCabal super.llvm-hs {
|
||||
|
|
@ -1895,10 +1834,34 @@ self: super: {
|
|||
sha256 = "10npa8nh2413n6p6qld795qfkbld08icm02bspmk93y0kabpgmgm";
|
||||
});
|
||||
|
||||
# Too strict bounds on ref-tf
|
||||
# https://github.com/travitch/haggle/issues/4
|
||||
haggle = doJailbreak super.haggle;
|
||||
# Too strict bounds on dimensional
|
||||
# https://github.com/enomsg/science-constants-dimensional/pull/1
|
||||
science-constants-dimensional = doJailbreak super.science-constants-dimensional;
|
||||
|
||||
# Tests are flaky on busy machines
|
||||
# https://github.com/merijn/paramtree/issues/4
|
||||
paramtree = dontCheck super.paramtree;
|
||||
|
||||
# Too strict version bounds on haskell-gi
|
||||
# https://github.com/owickstrom/gi-gtk-declarative/issues/100
|
||||
gi-gtk-declarative = doJailbreak super.gi-gtk-declarative;
|
||||
gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple;
|
||||
|
||||
# Test assets missing from sdist
|
||||
# https://github.com/hadolint/language-docker/issues/63
|
||||
language-docker = overrideSrc super.language-docker {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "hadolint";
|
||||
repo = "language-docker";
|
||||
rev = "refs/tags/${super.language-docker.version}";
|
||||
sha256 = "06263jy538ni31vms5pzggmh64fyk62cv3lxnvkc6gylb94kljb8";
|
||||
name = "language-docker-${super.language-docker.version}-source";
|
||||
};
|
||||
};
|
||||
|
||||
phonetic-languages-phonetics-basics = appendPatch super.phonetic-languages-phonetics-basics ./patches/phonetic-languages-phonetics-basics-haddock.patch;
|
||||
|
||||
# 2021-05-09: Restrictive bound on hspec-golden. Dep removed in newer versions.
|
||||
tomland = assert super.tomland.version == "1.3.2.0"; doJailbreak super.tomland;
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
|
|
|||
|
|
@ -0,0 +1,164 @@
|
|||
# DARWIN-SPECIFIC OVERRIDES FOR THE HASKELL PACKAGE SET IN NIXPKGS
|
||||
|
||||
{ pkgs, haskellLib }:
|
||||
|
||||
let
|
||||
inherit (pkgs) lib darwin;
|
||||
in
|
||||
|
||||
with haskellLib;
|
||||
|
||||
self: super: {
|
||||
|
||||
# the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo
|
||||
# see: https://github.com/psibi/shell-conduit/issues/12
|
||||
shell-conduit = dontCheck super.shell-conduit;
|
||||
|
||||
conduit-extra = super.conduit-extra.overrideAttrs (drv: {
|
||||
__darwinAllowLocalNetworking = true;
|
||||
});
|
||||
|
||||
halive = addBuildDepend super.halive darwin.apple_sdk.frameworks.AppKit;
|
||||
|
||||
# Hakyll's tests are broken on Darwin (3 failures); and they require util-linux
|
||||
hakyll = overrideCabal super.hakyll {
|
||||
testToolDepends = [];
|
||||
doCheck = false;
|
||||
};
|
||||
|
||||
barbly = addBuildDepend super.barbly darwin.apple_sdk.frameworks.AppKit;
|
||||
|
||||
double-conversion = addExtraLibrary super.double-conversion pkgs.libcxx;
|
||||
|
||||
apecs-physics = addPkgconfigDepends super.apecs-physics [
|
||||
darwin.apple_sdk.frameworks.ApplicationServices
|
||||
];
|
||||
|
||||
# "erf table" test fails on Darwin
|
||||
# https://github.com/bos/math-functions/issues/63
|
||||
math-functions = dontCheck super.math-functions;
|
||||
|
||||
# darwin doesn't have sub-second resolution
|
||||
# https://github.com/hspec/mockery/issues/11
|
||||
mockery = overrideCabal super.mockery (drv: {
|
||||
preCheck = ''
|
||||
export TRAVIS=true
|
||||
'' + (drv.preCheck or "");
|
||||
});
|
||||
|
||||
# https://github.com/ndmitchell/shake/issues/206
|
||||
shake = dontCheck super.shake;
|
||||
|
||||
filecache = dontCheck super.filecache;
|
||||
|
||||
# gtk/gtk3 needs to be told on Darwin to use the Quartz
|
||||
# rather than X11 backend (see eg https://github.com/gtk2hs/gtk2hs/issues/249).
|
||||
gtk3 = appendConfigureFlag super.gtk3 "-f have-quartz-gtk";
|
||||
gtk = appendConfigureFlag super.gtk "-f have-quartz-gtk";
|
||||
|
||||
OpenAL = addExtraLibrary super.OpenAL darwin.apple_sdk.frameworks.OpenAL;
|
||||
|
||||
proteaaudio = addExtraLibrary super.proteaaudio darwin.apple_sdk.frameworks.AudioToolbox;
|
||||
|
||||
# the system-fileio tests use canonicalizePath, which fails in the sandbox
|
||||
system-fileio = dontCheck super.system-fileio;
|
||||
|
||||
# Prevents needing to add `security_tool` as a run-time dependency for
|
||||
# everything using x509-system to give access to the `security` executable.
|
||||
#
|
||||
# darwin.security_tool is broken in Mojave (#45042)
|
||||
#
|
||||
# We will use the system provided security for now.
|
||||
# Beware this WILL break in sandboxes!
|
||||
#
|
||||
# TODO(matthewbauer): If someone really needs this to work in sandboxes,
|
||||
# I think we can add a propagatedImpureHost dep here, but I’m hoping to
|
||||
# get a proper fix available soonish.
|
||||
x509-system = overrideCabal super.x509-system (drv:
|
||||
lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) {
|
||||
postPatch = ''
|
||||
substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
|
||||
'' + (drv.postPatch or "");
|
||||
});
|
||||
|
||||
# https://github.com/haskell-foundation/foundation/pull/412
|
||||
foundation = dontCheck super.foundation;
|
||||
|
||||
llvm-hs = overrideCabal super.llvm-hs (oldAttrs: {
|
||||
# One test fails on darwin.
|
||||
doCheck = false;
|
||||
# llvm-hs's Setup.hs file tries to add the lib/ directory from LLVM8 to
|
||||
# the DYLD_LIBRARY_PATH environment variable. This messes up clang
|
||||
# when called from GHC, probably because clang is version 7, but we are
|
||||
# using LLVM8.
|
||||
preCompileBuildDriver = ''
|
||||
substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()"
|
||||
'' + (oldAttrs.preCompileBuildDriver or "");
|
||||
});
|
||||
|
||||
yesod-bin = addBuildDepend super.yesod-bin darwin.apple_sdk.frameworks.Cocoa;
|
||||
|
||||
hmatrix = addBuildDepend super.hmatrix darwin.apple_sdk.frameworks.Accelerate;
|
||||
|
||||
# Ensure the necessary frameworks are propagatedBuildInputs on darwin
|
||||
OpenGLRaw = overrideCabal super.OpenGLRaw (drv: {
|
||||
librarySystemDepends = [];
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [
|
||||
darwin.apple_sdk.frameworks.OpenGL
|
||||
];
|
||||
preConfigure = ''
|
||||
frameworkPaths=($(for i in $nativeBuildInputs; do if [ -d "$i"/Library/Frameworks ]; then echo "-F$i/Library/Frameworks"; fi done))
|
||||
frameworkPaths=$(IFS=, ; echo "''${frameworkPaths[@]}")
|
||||
configureFlags+=$(if [ -n "$frameworkPaths" ]; then echo -n "--ghc-options=-optl=$frameworkPaths"; fi)
|
||||
'' + (drv.preConfigure or "");
|
||||
});
|
||||
GLURaw = overrideCabal super.GLURaw (drv: {
|
||||
librarySystemDepends = [];
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [
|
||||
darwin.apple_sdk.frameworks.OpenGL
|
||||
];
|
||||
});
|
||||
bindings-GLFW = overrideCabal super.bindings-GLFW (drv: {
|
||||
librarySystemDepends = [];
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [
|
||||
darwin.apple_sdk.frameworks.AGL
|
||||
darwin.apple_sdk.frameworks.Cocoa
|
||||
darwin.apple_sdk.frameworks.OpenGL
|
||||
darwin.apple_sdk.frameworks.IOKit
|
||||
darwin.apple_sdk.frameworks.Kernel
|
||||
darwin.apple_sdk.frameworks.CoreVideo
|
||||
darwin.CF
|
||||
];
|
||||
});
|
||||
OpenCL = overrideCabal super.OpenCL (drv: {
|
||||
librarySystemDepends = [];
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [
|
||||
darwin.apple_sdk.frameworks.OpenCL
|
||||
];
|
||||
});
|
||||
|
||||
# cabal2nix likes to generate dependencies on hinotify when hfsevents is
|
||||
# really required on darwin: https://github.com/NixOS/cabal2nix/issues/146.
|
||||
hinotify = self.hfsevents;
|
||||
|
||||
# FSEvents API is very buggy and tests are unreliable. See
|
||||
# http://openradar.appspot.com/10207999 and similar issues.
|
||||
fsnotify = addBuildDepend (dontCheck super.fsnotify)
|
||||
darwin.apple_sdk.frameworks.Cocoa;
|
||||
|
||||
FractalArt = overrideCabal super.FractalArt (drv: {
|
||||
librarySystemDepends = [
|
||||
darwin.libobjc
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
] ++ (drv.librarySystemDepends or []);
|
||||
});
|
||||
|
||||
arbtt = overrideCabal super.arbtt (drv: {
|
||||
librarySystemDepends = [
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
darwin.apple_sdk.frameworks.Carbon
|
||||
darwin.apple_sdk.frameworks.IOKit
|
||||
] ++ (drv.librarySystemDepends or []);
|
||||
});
|
||||
|
||||
}
|
||||
|
|
@ -77,13 +77,6 @@ default-package-overrides:
|
|||
- gi-javascriptcore < 4.0.23 #
|
||||
- gi-soup < 2.4.24 #
|
||||
- gi-webkit2 < 4.0.27 #
|
||||
# To stay hls 1.0 compatible
|
||||
- ghcide < 1.1
|
||||
- hls-retrie-plugin < 1.0.0.1
|
||||
- lsp < 1.2
|
||||
- lsp-types < 1.2
|
||||
- hls-plugin-api < 1.1.0.0
|
||||
- hls-explicit-imports-plugin < 1.0.0.1
|
||||
|
||||
extra-packages:
|
||||
- base16-bytestring < 1 # required for cabal-install etc.
|
||||
|
|
@ -102,7 +95,6 @@ extra-packages:
|
|||
- hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
|
||||
- hlint < 3.3 # We don‘t have ghc-lib-parser 9.0.X yet.
|
||||
- immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20
|
||||
- lsp-test < 0.14 # needed for hls 1.0.0
|
||||
- mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls
|
||||
- network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15
|
||||
- optparse-applicative < 0.16 # needed for niv-0.2.19
|
||||
|
|
@ -259,7 +251,6 @@ unsupported-platforms:
|
|||
gnome-keyring: [ x86_64-darwin ]
|
||||
gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
|
||||
gtk-sni-tray: [ x86_64-darwin ]
|
||||
gtk-sni-tray: [ x86_64-darwin ]
|
||||
haskell-snake: [ x86_64-darwin ]
|
||||
hcwiid: [ x86_64-darwin ]
|
||||
HFuse: [ x86_64-darwin ]
|
||||
|
|
@ -269,7 +260,6 @@ unsupported-platforms:
|
|||
iwlib: [ x86_64-darwin ]
|
||||
libmodbus: [ x86_64-darwin ]
|
||||
libsystemd-journal: [ x86_64-darwin ]
|
||||
libsystemd-journal: [ x86_64-darwin ]
|
||||
libtelnet: [ x86_64-darwin ]
|
||||
libzfs: [ x86_64-darwin ]
|
||||
linearEqSolver: [ aarch64-linux ]
|
||||
|
|
@ -302,8 +292,7 @@ unsupported-platforms:
|
|||
udev: [ x86_64-darwin ]
|
||||
vrpn: [ x86_64-darwin ]
|
||||
vulkan: [ i686-linux, armv7l-linux, x86_64-darwin ]
|
||||
VulkanMemoryAllocator: [ i686-linux, armv7l-linux ]
|
||||
VulkanMemoryAllocator: [ x86_64-darwin ]
|
||||
VulkanMemoryAllocator: [ i686-linux, armv7l-linux, x86_64-darwin ]
|
||||
vulkan-utils: [ x86_64-darwin ]
|
||||
webkit2gtk3-javascriptcore: [ x86_64-darwin ]
|
||||
Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
# Stackage Nightly 2021-05-07
|
||||
# This file is auto-generated by
|
||||
# maintainers/scripts/haskell/update-stackage.sh
|
||||
default-package-overrides:
|
||||
# Stackage Nightly 2021-05-03
|
||||
- abstract-deque ==0.3
|
||||
- abstract-par ==0.3.3
|
||||
- AC-Angle ==1.0
|
||||
|
|
@ -479,7 +481,7 @@ default-package-overrides:
|
|||
- convertible ==1.1.1.0
|
||||
- cookie ==0.4.5
|
||||
- core-data ==0.2.1.9
|
||||
- core-program ==0.2.6.0
|
||||
- core-program ==0.2.7.1
|
||||
- core-text ==0.3.0.0
|
||||
- countable ==1.0
|
||||
- country ==0.2.1
|
||||
|
|
@ -882,7 +884,7 @@ default-package-overrides:
|
|||
- ghc-byteorder ==4.11.0.0.10
|
||||
- ghc-check ==0.5.0.4
|
||||
- ghc-core ==0.5.6
|
||||
- ghc-events ==0.16.0
|
||||
- ghc-events ==0.17.0
|
||||
- ghc-exactprint ==0.6.4
|
||||
- ghcid ==0.8.7
|
||||
- ghci-hexcalc ==0.1.1.0
|
||||
|
|
@ -1104,7 +1106,7 @@ default-package-overrides:
|
|||
- hspec-expectations-json ==1.0.0.3
|
||||
- hspec-expectations-lifted ==0.10.0
|
||||
- hspec-expectations-pretty-diff ==0.7.2.5
|
||||
- hspec-golden ==0.1.0.3
|
||||
- hspec-golden ==0.2.0.0
|
||||
- hspec-golden-aeson ==0.7.0.0
|
||||
- hspec-hedgehog ==0.0.1.2
|
||||
- hspec-junit-formatter ==1.0.0.2
|
||||
|
|
@ -1260,13 +1262,13 @@ default-package-overrides:
|
|||
- io-streams ==1.5.2.0
|
||||
- io-streams-haproxy ==1.0.1.0
|
||||
- ip6addr ==1.0.2
|
||||
- ipa ==0.3
|
||||
- ipa ==0.3.1
|
||||
- iproute ==1.7.11
|
||||
- IPv6Addr ==2.0.2
|
||||
- ipynb ==0.1.0.1
|
||||
- ipython-kernel ==0.10.2.1
|
||||
- irc ==0.6.1.0
|
||||
- irc-client ==1.1.2.0
|
||||
- irc-client ==1.1.2.1
|
||||
- irc-conduit ==0.3.0.4
|
||||
- irc-ctcp ==0.1.3.0
|
||||
- isbn ==1.1.0.2
|
||||
|
|
@ -1328,7 +1330,7 @@ default-package-overrides:
|
|||
- language-bash ==0.9.2
|
||||
- language-c ==0.8.3
|
||||
- language-c-quote ==0.13
|
||||
- language-docker ==9.3.0
|
||||
- language-docker ==10.0.0
|
||||
- language-java ==0.2.9
|
||||
- language-javascript ==0.7.1.0
|
||||
- language-protobuf ==1.0.1
|
||||
|
|
@ -1687,7 +1689,7 @@ default-package-overrides:
|
|||
- pagure-cli ==0.2
|
||||
- pandoc ==2.13
|
||||
- pandoc-dhall-decoder ==0.1.0.1
|
||||
- pandoc-plot ==1.1.1
|
||||
- pandoc-plot ==1.2.0
|
||||
- pandoc-throw ==0.1.0.0
|
||||
- pandoc-types ==1.22
|
||||
- pantry ==0.5.1.5
|
||||
|
|
@ -2177,6 +2179,7 @@ default-package-overrides:
|
|||
- splint ==1.0.1.4
|
||||
- split ==0.2.3.4
|
||||
- splitmix ==0.1.0.3
|
||||
- splitmix-distributions ==0.7.0.0
|
||||
- spoon ==0.3.1
|
||||
- spreadsheet ==0.1.3.8
|
||||
- sqlcli ==0.2.2.0
|
||||
|
|
@ -2506,8 +2509,8 @@ default-package-overrides:
|
|||
- utf8-string ==1.0.2
|
||||
- util ==0.1.17.1
|
||||
- utility-ht ==0.0.16
|
||||
- uuid ==1.3.14
|
||||
- uuid-types ==1.0.4
|
||||
- uuid ==1.3.15
|
||||
- uuid-types ==1.0.5
|
||||
- validation ==1.1.1
|
||||
- validation-selective ==0.1.0.1
|
||||
- validity ==0.11.0.0
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ dont-distribute-packages:
|
|||
- approx-rand-test
|
||||
- barley
|
||||
- bson-mapping
|
||||
- bv-sized-lens
|
||||
- clash-prelude-quickcheck
|
||||
- click-clack
|
||||
- cloudyfs
|
||||
|
|
@ -79,9 +80,9 @@ dont-distribute-packages:
|
|||
- openpgp-crypto-api
|
||||
- patch-image
|
||||
- perdure
|
||||
- persistent-mysql_2_12_1_0
|
||||
- persistent-postgresql_2_12_1_1
|
||||
- persistent-sqlite_2_12_0_0
|
||||
- persistent-mysql_2_13_0_0
|
||||
- persistent-postgresql_2_13_0_0
|
||||
- persistent-sqlite_2_13_0_0
|
||||
- pontarius-mediaserver
|
||||
- pontarius-xmpp-extras
|
||||
- pontarius-xpmn
|
||||
|
|
|
|||
|
|
@ -101,17 +101,6 @@ self: super: builtins.intersectAttrs super {
|
|||
ormolu = enableSeparateBinOutput super.ormolu;
|
||||
ghcid = enableSeparateBinOutput super.ghcid;
|
||||
|
||||
# Ensure the necessary frameworks for Darwin.
|
||||
OpenAL = if pkgs.stdenv.isDarwin
|
||||
then addExtraLibrary super.OpenAL pkgs.darwin.apple_sdk.frameworks.OpenAL
|
||||
else super.OpenAL;
|
||||
|
||||
# Ensure the necessary frameworks for Darwin.
|
||||
proteaaudio = if pkgs.stdenv.isDarwin
|
||||
then addExtraLibrary super.proteaaudio pkgs.darwin.apple_sdk.frameworks.AudioToolbox
|
||||
else super.proteaaudio;
|
||||
|
||||
|
||||
hzk = overrideCabal super.hzk (drv: {
|
||||
preConfigure = "sed -i -e /include-dirs/d hzk.cabal";
|
||||
configureFlags = [ "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper" ];
|
||||
|
|
@ -131,39 +120,11 @@ self: super: builtins.intersectAttrs super {
|
|||
# Foreign dependency name clashes with another Haskell package.
|
||||
libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; };
|
||||
|
||||
# Fix Darwin build.
|
||||
halive = if pkgs.stdenv.isDarwin
|
||||
then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit
|
||||
else super.halive;
|
||||
|
||||
# Heist's test suite requires system pandoc
|
||||
heist = overrideCabal super.heist (drv: {
|
||||
testToolDepends = [pkgs.pandoc];
|
||||
});
|
||||
|
||||
# the system-fileio tests use canonicalizePath, which fails in the sandbox
|
||||
system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio;
|
||||
|
||||
# Prevents needing to add `security_tool` as a run-time dependency for
|
||||
# everything using x509-system to give access to the `security` executable.
|
||||
x509-system =
|
||||
if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
|
||||
then
|
||||
# darwin.security_tool is broken in Mojave (#45042)
|
||||
|
||||
# We will use the system provided security for now.
|
||||
# Beware this WILL break in sandboxes!
|
||||
|
||||
# TODO(matthewbauer): If someone really needs this to work in sandboxes,
|
||||
# I think we can add a propagatedImpureHost dep here, but I’m hoping to
|
||||
# get a proper fix available soonish.
|
||||
overrideCabal super.x509-system (drv: {
|
||||
postPatch = (drv.postPatch or "") + ''
|
||||
substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
|
||||
'';
|
||||
})
|
||||
else super.x509-system;
|
||||
|
||||
# https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216
|
||||
gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"];
|
||||
glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"];
|
||||
|
|
@ -266,12 +227,6 @@ self: super: builtins.intersectAttrs super {
|
|||
# /homeless-shelter. Disabled.
|
||||
purescript = dontCheck super.purescript;
|
||||
|
||||
# https://github.com/haskell-foundation/foundation/pull/412
|
||||
foundation =
|
||||
if pkgs.stdenv.isDarwin
|
||||
then dontCheck super.foundation
|
||||
else super.foundation;
|
||||
|
||||
# Hardcoded include path
|
||||
poppler = overrideCabal super.poppler (drv: {
|
||||
postPatch = ''
|
||||
|
|
@ -283,23 +238,8 @@ self: super: builtins.intersectAttrs super {
|
|||
# Uses OpenGL in testing
|
||||
caramia = dontCheck super.caramia;
|
||||
|
||||
llvm-hs =
|
||||
let llvmHsWithLlvm9 = super.llvm-hs.override { llvm-config = pkgs.llvm_9; };
|
||||
in
|
||||
if pkgs.stdenv.isDarwin
|
||||
then
|
||||
overrideCabal llvmHsWithLlvm9 (oldAttrs: {
|
||||
# One test fails on darwin.
|
||||
doCheck = false;
|
||||
# llvm-hs's Setup.hs file tries to add the lib/ directory from LLVM8 to
|
||||
# the DYLD_LIBRARY_PATH environment variable. This messes up clang
|
||||
# when called from GHC, probably because clang is version 7, but we are
|
||||
# using LLVM8.
|
||||
preCompileBuildDriver = oldAttrs.preCompileBuildDriver or "" + ''
|
||||
substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()"
|
||||
'';
|
||||
})
|
||||
else llvmHsWithLlvm9;
|
||||
# requires llvm 9 specifically https://github.com/llvm-hs/llvm-hs/#building-from-source
|
||||
llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_9; };
|
||||
|
||||
# Needs help finding LLVM.
|
||||
spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;
|
||||
|
|
@ -322,14 +262,6 @@ self: super: builtins.intersectAttrs super {
|
|||
# Patch to consider NIX_GHC just like xmonad does
|
||||
dyre = appendPatch super.dyre ./patches/dyre-nix.patch;
|
||||
|
||||
yesod-bin = if pkgs.stdenv.isDarwin
|
||||
then addBuildDepend super.yesod-bin pkgs.darwin.apple_sdk.frameworks.Cocoa
|
||||
else super.yesod-bin;
|
||||
|
||||
hmatrix = if pkgs.stdenv.isDarwin
|
||||
then addBuildDepend super.hmatrix pkgs.darwin.apple_sdk.frameworks.Accelerate
|
||||
else super.hmatrix;
|
||||
|
||||
# https://github.com/edwinb/EpiVM/issues/13
|
||||
# https://github.com/edwinb/EpiVM/issues/14
|
||||
epic = addExtraLibraries (addBuildTool super.epic self.buildHaskellPackages.happy) [pkgs.boehmgc pkgs.gmp];
|
||||
|
|
@ -405,43 +337,8 @@ self: super: builtins.intersectAttrs super {
|
|||
# Looks like Avahi provides the missing library
|
||||
dnssd = super.dnssd.override { dns_sd = pkgs.avahi.override { withLibdnssdCompat = true; }; };
|
||||
|
||||
# Ensure the necessary frameworks are propagatedBuildInputs on darwin
|
||||
OpenGLRaw = overrideCabal super.OpenGLRaw (drv: {
|
||||
librarySystemDepends =
|
||||
pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends;
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends
|
||||
++ pkgs.lib.optionals pkgs.stdenv.isDarwin
|
||||
[ pkgs.darwin.apple_sdk.frameworks.OpenGL ];
|
||||
preConfigure = pkgs.lib.optionalString pkgs.stdenv.isDarwin ''
|
||||
frameworkPaths=($(for i in $nativeBuildInputs; do if [ -d "$i"/Library/Frameworks ]; then echo "-F$i/Library/Frameworks"; fi done))
|
||||
frameworkPaths=$(IFS=, ; echo "''${frameworkPaths[@]}")
|
||||
configureFlags+=$(if [ -n "$frameworkPaths" ]; then echo -n "--ghc-options=-optl=$frameworkPaths"; fi)
|
||||
'';
|
||||
});
|
||||
GLURaw = overrideCabal super.GLURaw (drv: {
|
||||
librarySystemDepends =
|
||||
pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends;
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends
|
||||
++ pkgs.lib.optionals pkgs.stdenv.isDarwin
|
||||
[ pkgs.darwin.apple_sdk.frameworks.OpenGL ];
|
||||
});
|
||||
bindings-GLFW = overrideCabal super.bindings-GLFW (drv: {
|
||||
doCheck = false; # requires an active X11 display
|
||||
librarySystemDepends =
|
||||
pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends;
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends
|
||||
++ pkgs.lib.optionals pkgs.stdenv.isDarwin
|
||||
(with pkgs.darwin.apple_sdk.frameworks;
|
||||
[ AGL Cocoa OpenGL IOKit Kernel CoreVideo
|
||||
pkgs.darwin.CF ]);
|
||||
});
|
||||
OpenCL = overrideCabal super.OpenCL (drv: {
|
||||
librarySystemDepends =
|
||||
pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends;
|
||||
libraryHaskellDepends = drv.libraryHaskellDepends
|
||||
++ pkgs.lib.optionals pkgs.stdenv.isDarwin
|
||||
[ pkgs.darwin.apple_sdk.frameworks.OpenCL ];
|
||||
});
|
||||
# requires an X11 display
|
||||
bindings-GLFW = dontCheck super.bindings-GLFW;
|
||||
|
||||
# requires an X11 display in test suite
|
||||
gi-gtk-declarative = dontCheck super.gi-gtk-declarative;
|
||||
|
|
@ -474,16 +371,8 @@ self: super: builtins.intersectAttrs super {
|
|||
testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ];
|
||||
});
|
||||
|
||||
# cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
|
||||
# on darwin: https://github.com/NixOS/cabal2nix/issues/146.
|
||||
hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
|
||||
|
||||
# FSEvents API is very buggy and tests are unreliable. See
|
||||
# http://openradar.appspot.com/10207999 and similar issues.
|
||||
# https://github.com/haskell-fswatch/hfsnotify/issues/62
|
||||
fsnotify = if pkgs.stdenv.isDarwin
|
||||
then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa
|
||||
else dontCheck super.fsnotify;
|
||||
fsnotify = dontCheck super.fsnotify;
|
||||
|
||||
hidapi = addExtraLibrary super.hidapi pkgs.udev;
|
||||
|
||||
|
|
@ -844,21 +733,6 @@ self: super: builtins.intersectAttrs super {
|
|||
'' + (drv.postInstall or "");
|
||||
});
|
||||
|
||||
FractalArt = overrideCabal super.FractalArt (drv: {
|
||||
librarySystemDepends = pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin [
|
||||
pkgs.darwin.libobjc
|
||||
pkgs.darwin.apple_sdk.frameworks.AppKit
|
||||
] ++ (drv.librarySystemDepends or []);
|
||||
});
|
||||
|
||||
arbtt = overrideCabal super.arbtt (drv: {
|
||||
librarySystemDepends = pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin [
|
||||
pkgs.darwin.apple_sdk.frameworks.Foundation
|
||||
pkgs.darwin.apple_sdk.frameworks.Carbon
|
||||
pkgs.darwin.apple_sdk.frameworks.IOKit
|
||||
] ++ (drv.librarySystemDepends or []);
|
||||
});
|
||||
|
||||
# set more accurate set of platforms instead of maintaining
|
||||
# an ever growing list of platforms to exclude via unsupported-platforms
|
||||
cpuid = overrideCabal super.cpuid {
|
||||
|
|
@ -867,4 +741,35 @@ self: super: builtins.intersectAttrs super {
|
|||
|
||||
# Pass the correct libarchive into the package.
|
||||
streamly-archive = super.streamly-archive.override { archive = pkgs.libarchive; };
|
||||
|
||||
# passes the -msse2 flag which only works on x86 platforms
|
||||
hsignal = overrideCabal super.hsignal {
|
||||
platforms = pkgs.lib.platforms.x86;
|
||||
};
|
||||
|
||||
hls-brittany-plugin = overrideCabal super.hls-brittany-plugin (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
});
|
||||
hls-class-plugin = overrideCabal super.hls-class-plugin (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
});
|
||||
# Tests have file permissions expections that don‘t work with the nix store.
|
||||
hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin;
|
||||
hls-haddock-comments-plugin = overrideCabal super.hls-haddock-comments-plugin (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
});
|
||||
hls-eval-plugin = overrideCabal super.hls-eval-plugin (drv: {
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR/home
|
||||
'';
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue