Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-05-08 00:46:53 +00:00 committed by GitHub
commit 2c85188911
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
102 changed files with 7604 additions and 6457 deletions

12
.github/CODEOWNERS vendored
View file

@ -79,11 +79,13 @@
/pkgs/development/tools/poetry2nix @adisbladis
# Haskell
/pkgs/development/compilers/ghc @cdepillabout @sternenseemann
/pkgs/development/haskell-modules @cdepillabout @sternenseemann
/pkgs/development/haskell-modules/default.nix @cdepillabout @sternenseemann
/pkgs/development/haskell-modules/generic-builder.nix @cdepillabout @sternenseemann
/pkgs/development/haskell-modules/hoogle.nix @cdepillabout @sternenseemann
/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn
/maintainers/scripts/haskell @cdepillabout @sternenseemann @maralorn
/pkgs/development/compilers/ghc @cdepillabout @sternenseemann @maralorn
/pkgs/development/haskell-modules @cdepillabout @sternenseemann @maralorn
/pkgs/test/haskell @cdepillabout @sternenseemann @maralorn
/pkgs/top-level/release-haskell.nix @cdepillabout @sternenseemann @maralorn
/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn
# Perl
/pkgs/development/interpreters/perl @volth @stigtsp

3
.github/labeler.yml vendored
View file

@ -50,10 +50,13 @@
"6.topic: haskell":
- doc/languages-frameworks/haskell.section.md
- maintainers/scripts/haskell/**/*
- pkgs/development/compilers/ghc/**/*
- pkgs/development/haskell-modules/**/*
- pkgs/development/tools/haskell/**/*
- pkgs/test/haskell/**/*
- pkgs/top-level/haskell-packages.nix
- pkgs/top-level/release-haskell.nix
"6.topic: kernel":
- pkgs/build-support/kernel/**/*

View file

@ -0,0 +1,37 @@
#! /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.
#
# Related scripts are update-hackage.sh, for updating the snapshot of the
# Hackage database used by hackage2nix, and update-cabal2nix-unstable.sh,
# for updating the version of hackage2nix used to perform this task.
set -euo pipefail
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
hackage2nix \
--hackage "$unpacked_hackage" \
--preferred-versions <(for n in "$unpacked_hackage"/*/preferred-versions; do cat "$n"; echo; done) \
--nixpkgs "$PWD" \
--config "$config_dir/main.yaml" \
--config "$config_dir/stackage.yaml" \
--config "$config_dir/broken.yaml" \
--config "$config_dir/transitive-broken.yaml"
if [[ "${1:-}" == "--do-commit" ]]; then
git add pkgs/development/haskell-modules/hackage-packages.nix
git commit -F - << EOF
hackage-packages.nix: Regenerate based on current config
This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh
EOF
fi

View file

@ -0,0 +1,3 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p coreutils nix gnused -I nixpkgs=.
echo -e $(nix-instantiate --eval --strict maintainers/scripts/haskell/transitive-broken-packages.nix) | sed 's/\"//' > pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml

View file

@ -0,0 +1,21 @@
let
nixpkgs = import ../../..;
inherit (nixpkgs {}) pkgs lib;
getEvaluating = x:
builtins.attrNames (
lib.filterAttrs (
_: v: (builtins.tryEval (v.outPath or null)).success && lib.isDerivation v && !v.meta.broken
) x
);
brokenDeps = lib.subtractLists
(getEvaluating pkgs.haskellPackages)
(getEvaluating (nixpkgs { config.allowBroken = true; }).haskellPackages);
in
''
# This file is automatically generated by
# maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
# It is supposed to list all haskellPackages that cannot evaluate because they
# depend on a dependency marked as broken.
dont-distribute-packages:
${lib.concatMapStringsSep "\n" (x: " - ${x}") brokenDeps}
''

View file

@ -0,0 +1,17 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable -I nixpkgs=.
# Updates cabal2nix-unstable to the latest master of the nixos/cabal2nix repository.
# See regenerate-hackage-packages.sh for details on the purpose of this script.
set -euo pipefail
# fetch current master HEAD from Github
head_info="$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/NixOS/cabal2nix/branches/master)"
# extract commit hash
commit="$(jq -r .commit.sha <<< "$head_info")"
# extract commit timestamp and convert to date
date="$(date "--date=$(jq -r .commit.commit.committer.date <<< "$head_info")" +%F)"
# generate nix expression from cabal file, replacing the version with the commit date
echo '# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.' > pkgs/development/haskell-modules/cabal2nix-unstable.nix
cabal2nix "https://github.com/NixOS/cabal2nix/archive/$commit.tar.gz" | sed -e 's/version = ".*"/version = "'"unstable-$date"'"/' >> pkgs/development/haskell-modules/cabal2nix-unstable.nix

View file

@ -0,0 +1,35 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused -I nixpkgs=.
# See regenerate-hackage-packages.sh for details on the purpose of this script.
set -euo pipefail
pin_file=pkgs/data/misc/hackage/pin.json
current_commit="$(jq -r .commit $pin_file)"
old_date="$(jq -r .msg $pin_file | sed 's/Update from Hackage at //')"
git_info="$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/commercialhaskell/all-cabal-hashes/branches/hackage)"
head_commit="$(echo "$git_info" | jq -r .commit.sha)"
commit_msg="$(echo "$git_info" | jq -r .commit.commit.message)"
new_date="$(echo "$commit_msg" | sed 's/Update from Hackage at //')"
if [ "$current_commit" != "$head_commit" ]; then
url="https://github.com/commercialhaskell/all-cabal-hashes/archive/$head_commit.tar.gz"
hash="$(nix-prefetch-url "$url")"
jq -n \
--arg commit "$head_commit" \
--arg hash "$hash" \
--arg url "$url" \
--arg commit_msg "$commit_msg" \
'{commit: $commit, url: $url, sha256: $hash, msg: $commit_msg}' \
> $pin_file
fi
if [[ "${1:-}" == "--do-commit" ]]; then
git add pkgs/data/misc/hackage/pin.json
git commit -F - << EOF
all-cabal-hashes: $old_date -> $new_date
This commit has been generated by maintainers/scripts/haskell/update-hackage.sh
EOF
fi

View file

@ -0,0 +1,68 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p nix curl jq nix-prefetch-github git gnused gnugrep -I nixpkgs=.
set -eu -o pipefail
tmpfile=$(mktemp "update-stackage.XXXXXXX")
# shellcheck disable=SC2064
stackage_config="pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml"
trap "rm ${tmpfile} ${tmpfile}.new" 0
touch "$tmpfile" "$tmpfile.new" # Creating files here so that trap creates no errors.
curl -L -s "https://stackage.org/nightly/cabal.config" >"$tmpfile"
old_version=$(grep "# Stackage Nightly" $stackage_config | sed -E 's/.*([0-9]{4}-[0-9]{2}-[0-9]{2}).*/\1/')
version=$(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.nightly-//p" "$tmpfile")
if [[ "$old_version" == "$version" ]]; then
echo "No new stackage version"
exit 0 # Nothing to do
fi
# Create a simple yaml version of the file.
sed -r \
-e '/^--/d' \
-e 's|^constraints:||' \
-e 's|^ +| - |' \
-e 's|,$||' \
-e '/installed$/d' \
-e '/^$/d' \
< "${tmpfile}" | sort --ignore-case >"${tmpfile}.new"
cat > $stackage_config << EOF
# Stackage Nightly $version
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
EOF
# Drop restrictions on some tools where we always want the latest version.
sed -r \
-e '/ cabal-install /d' \
-e '/ cabal2nix /d' \
-e '/ cabal2spec /d' \
-e '/ distribution-nixpkgs /d' \
-e '/ git-annex /d' \
-e '/ hindent /d' \
-e '/ hledger/d' \
-e '/ hlint /d' \
-e '/ hoogle /d' \
-e '/ hopenssl /d' \
-e '/ jailbreak-cabal /d' \
-e '/ json-autotype/d' \
-e '/ language-nix /d' \
-e '/ shake /d' \
-e '/ ShellCheck /d' \
-e '/ stack /d' \
-e '/ weeder /d' \
< "${tmpfile}.new" >> $stackage_config
if [[ "${1:-}" == "--do-commit" ]]; then
git add $config_file
git commit -F - << EOF
Stackage Nightly: $old_version -> $version
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
EOF
fi

View file

@ -96,6 +96,15 @@ with lib.maintainers; {
scope = "Maintain GNOME desktop environment and platform.";
};
haskell = {
members = [
maralorn
cdepillabout
sternenseemann
];
scope = "Maintain Haskell packages and infrastructure.";
};
home-assistant = {
members = [
fab

View file

@ -18,13 +18,6 @@
# - ttyAMA0: for QEMU's -machine virt
boot.kernelParams = ["console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"];
boot.initrd.availableKernelModules = [
# Allows early (earlier) modesetting for the Raspberry Pi
"vc4" "bcm2835_dma" "i2c_bcm2835"
# Allows early (earlier) modesetting for Allwinner SoCs
"sun4i_drm" "sun8i_drm_hdmi" "sun8i_mixer"
];
sdImage = {
populateFirmwareCommands = let
configTxt = pkgs.writeText "config.txt" ''

View file

@ -29,6 +29,7 @@ in
imports = [
(mkRemovedOptionModule [ "sdImage" "bootPartitionID" ] "The FAT partition for SD image now only holds the Raspberry Pi firmware files. Use firmwarePartitionID to configure that partition's ID.")
(mkRemovedOptionModule [ "sdImage" "bootSize" ] "The boot files for SD image have been moved to the main ext4 partition. The FAT partition now only holds the Raspberry Pi firmware files. Changing its size may not be required.")
../../profiles/all-hardware.nix
];
options.sdImage = {

View file

@ -46,11 +46,66 @@ in
# VMware support.
"mptspi" "vmxnet3" "vsock"
] ++ lib.optional platform.isx86 "vmw_balloon"
++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
++ lib.optionals (!platform.isAarch64 && !platform.isAarch32) [ # not sure where else they're missing
"vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport"
# Hyper-V support.
"hv_storvsc"
] ++ lib.optionals (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [
# Most of the following falls into two categories:
# - early KMS / early display
# - early storage (e.g. USB) support
# Allows using framebuffer configured by the initial boot firmware
"simplefb"
# Allwinner support
# Required for early KMS
"sun4i-drm"
"sun8i-mixer" # Audio, but required for kms
# PWM for the backlight
"pwm-sun4i"
# Broadcom
"vc4"
] ++ lib.optionals pkgs.stdenv.isAarch64 [
# Most of the following falls into two categories:
# - early KMS / early display
# - early storage (e.g. USB) support
# Broadcom
"pcie-brcmstb"
# Rockchip
"dw-hdmi"
"dw-mipi-dsi"
"rockchipdrm"
"rockchip-rga"
"phy-rockchip-pcie"
"pcie-rockchip-host"
# Misc. uncategorized hardware
# Used for some platform's integrated displays
"panel-simple"
"pwm-bl"
# Power supply drivers, some platforms need them for USB
"axp20x-ac-power"
"axp20x-battery"
"pinctrl-axp209"
"mp8859"
# USB drivers
"xhci-pci-renesas"
# Misc "weak" dependencies
"analogix-dp"
"analogix-anx6345" # For DP or eDP (e.g. integrated display)
];
# Include lots of firmware.

View file

@ -5,6 +5,19 @@ with lib;
let
cfg = config.services.brltty;
targets = [
"default.target" "multi-user.target"
"rescue.target" "emergency.target"
];
genApiKey = pkgs.writers.writeDash "generate-brlapi-key" ''
if ! test -f /etc/brlapi.key; then
echo -n generating brlapi key...
${pkgs.brltty}/bin/brltty-genkey -f /etc/brlapi.key
echo done
fi
'';
in {
options = {
@ -18,33 +31,27 @@ in {
};
config = mkIf cfg.enable {
systemd.services.brltty = {
description = "Braille Device Support";
unitConfig = {
Documentation = "http://mielke.cc/brltty/";
DefaultDependencies = "no";
RequiresMountsFor = "${pkgs.brltty}/var/lib/brltty";
};
serviceConfig = {
ExecStart = "${pkgs.brltty}/bin/brltty --no-daemon";
Type = "notify";
TimeoutStartSec = 5;
TimeoutStopSec = 10;
Restart = "always";
RestartSec = 30;
Nice = -10;
OOMScoreAdjust = -900;
ProtectHome = "read-only";
ProtectSystem = "full";
SystemCallArchitectures = "native";
};
wants = [ "systemd-udev-settle.service" ];
after = [ "local-fs.target" "systemd-udev-settle.service" ];
before = [ "sysinit.target" ];
wantedBy = [ "sysinit.target" ];
users.users.brltty = {
description = "BRLTTY daemon user";
group = "brltty";
};
users.groups = {
brltty = { };
brlapi = { };
};
systemd.services."brltty@".serviceConfig =
{ ExecStartPre = "!${genApiKey}"; };
# Install all upstream-provided files
systemd.packages = [ pkgs.brltty ];
systemd.tmpfiles.packages = [ pkgs.brltty ];
services.udev.packages = [ pkgs.brltty ];
environment.systemPackages = [ pkgs.brltty ];
# Add missing WantedBys (see issue #81138)
systemd.paths.brltty.wantedBy = targets;
systemd.paths."brltty@".wantedBy = targets;
};
}

View file

@ -6,21 +6,21 @@ let
cfg = config.hardware.fancontrol;
configFile = pkgs.writeText "fancontrol.conf" cfg.config;
in{
in
{
options.hardware.fancontrol = {
enable = mkEnableOption "software fan control (requires fancontrol.config)";
config = mkOption {
default = null;
type = types.nullOr types.lines;
description = "Fancontrol configuration file content. See <citerefentry><refentrytitle>pwmconfig</refentrytitle><manvolnum>8</manvolnum></citerefentry> from the lm_sensors package.";
type = types.lines;
description = "Required fancontrol configuration file content. See <citerefentry><refentrytitle>pwmconfig</refentrytitle><manvolnum>8</manvolnum></citerefentry> from the lm_sensors package.";
example = ''
# Configuration file generated by pwmconfig
INTERVAL=10
DEVPATH=hwmon3=devices/virtual/thermal/thermal_zone2 hwmon4=devices/platform/f71882fg.656
DEVNAME=hwmon3=soc_dts1 hwmon4=f71869a
FCTEMPS=hwmon4/device/pwm1=hwmon3/temp1_input
FCFANS= hwmon4/device/pwm1=hwmon4/device/fan1_input
FCFANS=hwmon4/device/pwm1=hwmon4/device/fan1_input
MINTEMP=hwmon4/device/pwm1=35
MAXTEMP=hwmon4/device/pwm1=65
MINSTART=hwmon4/device/pwm1=150
@ -30,16 +30,30 @@ in{
};
config = mkIf cfg.enable {
users = {
groups.lm_sensors = {};
users.fancontrol = {
isSystemUser = true;
group = "lm_sensors";
description = "fan speed controller";
};
};
systemd.services.fancontrol = {
unitConfig.Documentation = "man:fancontrol(8)";
documentation = [ "man:fancontrol(8)" ];
description = "software fan control";
wantedBy = [ "multi-user.target" ];
after = [ "lm_sensors.service" ];
serviceConfig = {
Type = "simple";
ExecStart = "${pkgs.lm_sensors}/sbin/fancontrol ${configFile}";
Group = "lm_sensors";
User = "fancontrol";
};
};
};
meta.maintainers = [ maintainers.evils ];
}

View file

@ -1,28 +1,34 @@
import ./make-test-python.nix ({ pkgs, ... } : {
name = "fancontrol";
meta = with pkgs.lib.maintainers; {
maintainers = [ evils ];
};
machine =
{ ... }:
{ hardware.fancontrol.enable = true;
hardware.fancontrol.config = ''
INTERVAL=42
DEVPATH=hwmon1=devices/platform/dummy
DEVNAME=hwmon1=dummy
FCTEMPS=hwmon1/device/pwm1=hwmon1/device/temp1_input
FCFANS=hwmon1/device/pwm1=hwmon1/device/fan1_input
MINTEMP=hwmon1/device/pwm1=25
MAXTEMP=hwmon1/device/pwm1=65
MINSTART=hwmon1/device/pwm1=150
MINSTOP=hwmon1/device/pwm1=0
'';
machine = { ... }: {
imports = [ ../modules/profiles/minimal.nix ];
hardware.fancontrol.enable = true;
hardware.fancontrol.config = ''
INTERVAL=42
DEVPATH=hwmon1=devices/platform/dummy
DEVNAME=hwmon1=dummy
FCTEMPS=hwmon1/device/pwm1=hwmon1/device/temp1_input
FCFANS=hwmon1/device/pwm1=hwmon1/device/fan1_input
MINTEMP=hwmon1/device/pwm1=25
MAXTEMP=hwmon1/device/pwm1=65
MINSTART=hwmon1/device/pwm1=150
MINSTOP=hwmon1/device/pwm1=0
'';
};
# This configuration cannot be valid for the test VM, so it's expected to get an 'outdated' error.
testScript = ''
start_all()
machine.wait_for_unit("fancontrol.service")
machine.wait_until_succeeds(
"journalctl -eu fancontrol | grep 'Configuration appears to be outdated'"
# can't wait for unit fancontrol.service because it doesn't become active due to invalid config
# fancontrol.service is WantedBy multi-user.target
machine.wait_for_unit("multi-user.target")
machine.succeed(
"journalctl -eu fancontrol | tee /dev/stderr | grep 'Configuration appears to be outdated'"
)
machine.shutdown()
'';
})

View file

@ -2,6 +2,7 @@
, python3
, fetchFromGitHub
, wrapQtAppsHook
, borgbackup
}:
python3.pkgs.buildPythonApplication rec {
@ -30,7 +31,10 @@ python3.pkgs.buildPythonApplication rec {
doCheck = false;
preFixup = ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
makeWrapperArgs+=(
"''${qtWrapperArgs[@]}"
--prefix PATH : ${lib.makeBinPath [ borgbackup ]}
)
'';
meta = with lib; {

View file

@ -114,10 +114,10 @@
elpaBuild {
pname = "aggressive-completion";
ename = "aggressive-completion";
version = "1.5";
version = "1.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/aggressive-completion-1.5.tar";
sha256 = "1gy0q5yc1a0w31qpyb92f672zcfgxbp5s104ycgk11jxk4y17nw9";
url = "https://elpa.gnu.org/packages/aggressive-completion-1.6.tar";
sha256 = "0i7kcxd7pbdw57gczbxddr2n4j778x2ccfpkgjhdlpdsyidfh2bq";
};
packageRequires = [ emacs ];
meta = {
@ -219,16 +219,16 @@
license = lib.licenses.free;
};
}) {};
async = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }:
async = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "async";
ename = "async";
version = "1.9.3";
version = "1.9.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/async-1.9.3.tar";
sha256 = "1pmfjrlapvhkjqcal8x95w190hm9wsgxb3byc22rc1gf5z0p52c8";
url = "https://elpa.gnu.org/packages/async-1.9.5.tar";
sha256 = "02f43vqlggy4qkqdggkl9mcg3rvagjysj45xgrx41jjx6cnjnm19";
};
packageRequires = [ cl-lib nadvice ];
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/async.html";
license = lib.licenses.free;
@ -238,10 +238,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
version = "13.0.6";
version = "13.0.11";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-13.0.6.tar";
sha256 = "00wp388rh2nnk8fam53kilykg90jylps31qxv9ijy1lsp1hqdjys";
url = "https://elpa.gnu.org/packages/auctex-13.0.11.tar";
sha256 = "0sy4f1n38q58vyzw5l0f80ci3j99rb25gbwj0frl0pglfmgzl44k";
};
packageRequires = [ emacs ];
meta = {
@ -482,10 +482,10 @@
elpaBuild {
pname = "cl-lib";
ename = "cl-lib";
version = "0.6.1";
version = "0.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/cl-lib-0.6.1.el";
sha256 = "00w7bw6wkig13pngijh7ns45s1jn5kkbbjaqznsdh6jk5x089j9y";
url = "https://elpa.gnu.org/packages/cl-lib-0.7.tar";
sha256 = "0s1vkkj1yc5zn6bvc84sr726cm4v3jh2ymm7hc3rr00swwbz35lv";
};
packageRequires = [];
meta = {
@ -651,6 +651,21 @@
license = lib.licenses.free;
};
}) {};
corfu = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "corfu";
ename = "corfu";
version = "0.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/corfu-0.4.tar";
sha256 = "0yaspx58w02n3liqy5i4lm6lk5f1fm6v5lfrzp7xaqnngq1f4gbj";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/corfu.html";
license = lib.licenses.free;
};
}) {};
counsel = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib, swiper }:
elpaBuild {
pname = "counsel";
@ -775,10 +790,10 @@
elpaBuild {
pname = "debbugs";
ename = "debbugs";
version = "0.27";
version = "0.28";
src = fetchurl {
url = "https://elpa.gnu.org/packages/debbugs-0.27.tar";
sha256 = "1zn9p9vmfv5ihrp8d06b6abs48q225v42cgwa01s39hld6zg6wbv";
url = "https://elpa.gnu.org/packages/debbugs-0.28.tar";
sha256 = "1qks38hpg3drhxzw66n5yxfq0v6fj9ya7d9dc6x0xwfp6r2x0li0";
};
packageRequires = [ emacs soap-client ];
meta = {
@ -1209,7 +1224,8 @@
license = lib.licenses.free;
};
}) {};
excorporate = callPackage ({ elpaBuild
excorporate = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
, fetchurl
, fsm
@ -1220,12 +1236,19 @@
elpaBuild {
pname = "excorporate";
ename = "excorporate";
version = "0.9.5";
version = "0.9.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/excorporate-0.9.5.tar";
sha256 = "0z5x8lqvxh8zra23nmh36cdnr2yk855i4fc3mlbwaj5sdy9sqpf5";
url = "https://elpa.gnu.org/packages/excorporate-0.9.6.tar";
sha256 = "0ljav8g1npg0a36x1xxpfs2gvk622fh3si95s3w2vmwa27ynirzj";
};
packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ];
packageRequires = [
cl-lib
emacs
fsm
nadvice
soap-client
url-http-ntlm
];
meta = {
homepage = "https://elpa.gnu.org/packages/excorporate.html";
license = lib.licenses.free;
@ -2233,10 +2256,10 @@
elpaBuild {
pname = "modus-themes";
ename = "modus-themes";
version = "1.2.4";
version = "1.3.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/modus-themes-1.2.4.tar";
sha256 = "0wz6dgkrq4ryvj0kxnzqxwh4i8b9lw15d5dsazjpqa7gfwffpzp0";
url = "https://elpa.gnu.org/packages/modus-themes-1.3.2.tar";
sha256 = "085zi3ckf4s1kjskqb04b78rgrhbdhrrp74yksb5w0hl58bd8rsc";
};
packageRequires = [ emacs ];
meta = {
@ -2696,10 +2719,10 @@
elpaBuild {
pname = "phps-mode";
ename = "phps-mode";
version = "0.4.2";
version = "0.4.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/phps-mode-0.4.2.tar";
sha256 = "0ngh54jdh56563crgvf0r4gd6zfvhbkxs9prp12930gav8mdm3sh";
url = "https://elpa.gnu.org/packages/phps-mode-0.4.3.tar";
sha256 = "0yvwfaj7l4z3zgycvnf1j0r5jx4lryaapljbw2sqvwqpbgyiw0y0";
};
packageRequires = [ emacs ];
meta = {
@ -2741,10 +2764,10 @@
elpaBuild {
pname = "posframe";
ename = "posframe";
version = "1.0.0";
version = "1.0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/posframe-1.0.0.tar";
sha256 = "1k06dbh9xqn2vix5qkcapl57v0c21b344r8dx6j5qr4jxirsn2x5";
url = "https://elpa.gnu.org/packages/posframe-1.0.2.tar";
sha256 = "19a1dkjyw9m74aamyqrsvzrdwshngqpmjzdngx6v5nifvcilrlnk";
};
packageRequires = [ emacs ];
meta = {
@ -2756,10 +2779,10 @@
elpaBuild {
pname = "project";
ename = "project";
version = "0.5.4";
version = "0.6.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/project-0.5.4.tar";
sha256 = "0arjvhzzcf8b80w94yvpgfdlhsjwf5jk1r7vcai5a4dg3bi9cxyb";
url = "https://elpa.gnu.org/packages/project-0.6.0.tar";
sha256 = "0m0r1xgz1ffx6mi2gjz1dkgrn89sh4y5ysi0gj6p1w05bf8p0lc0";
};
packageRequires = [ emacs xref ];
meta = {
@ -2801,10 +2824,10 @@
elpaBuild {
pname = "pyim";
ename = "pyim";
version = "3.6";
version = "3.7.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/pyim-3.6.tar";
sha256 = "1fmbzh33s9xdvrfjhkqr9ydcqbiv8lr04k5idvbpc9vwjjjan5y0";
url = "https://elpa.gnu.org/packages/pyim-3.7.1.tar";
sha256 = "0k73f1qdl51qshnvycjassdh70id5gp5qi5wz7k4zyl8pbampiyd";
};
packageRequires = [ async emacs xr ];
meta = {
@ -3081,10 +3104,10 @@
elpaBuild {
pname = "rec-mode";
ename = "rec-mode";
version = "1.6";
version = "1.8.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/rec-mode-1.6.tar";
sha256 = "1dhv3n2x0bpdisi9bj3qa0bhpjzhs57fga72s4fxh44gp92yl18q";
url = "https://elpa.gnu.org/packages/rec-mode-1.8.1.tar";
sha256 = "0injk27l38d0sl9nzjz2bkd0qgccxyf31i42mwmivv86kv0kyxyb";
};
packageRequires = [ emacs ];
meta = {
@ -3267,10 +3290,10 @@
elpaBuild {
pname = "setup";
ename = "setup";
version = "0.1.2";
version = "0.2.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/setup-0.1.2.tar";
sha256 = "1q29phch4fvmvc255kgvzsnzdqp6kaip7ybpxprd0kkdjs3jrsqv";
url = "https://elpa.gnu.org/packages/setup-0.2.0.tar";
sha256 = "1xhjkyksilw1vbx12a4yz4bpj0dhl3m02yi8d9nyd19z098cfa9y";
};
packageRequires = [ emacs ];
meta = {
@ -3297,10 +3320,10 @@
elpaBuild {
pname = "shell-command-plus";
ename = "shell-command+";
version = "2.0.0";
version = "2.1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/shell-command+-2.0.0.tar";
sha256 = "1l8lwami4rbp94sbb1k4dvv7z0dvf51s0992xragpn9b9jbx5qd6";
url = "https://elpa.gnu.org/packages/shell-command+-2.1.0.tar";
sha256 = "1jyrnv89989bi03m5h8dj0cllsw3rvyxkiyfrh9v6gpxjwfy8lmq";
};
packageRequires = [ emacs ];
meta = {
@ -3691,10 +3714,10 @@
elpaBuild {
pname = "tramp";
ename = "tramp";
version = "2.5.0.3";
version = "2.5.0.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tramp-2.5.0.3.tar";
sha256 = "0c77d1ihn17lzk9jb7ss346ryprnbii1zmijl6zj0kk4lm8fpfl3";
url = "https://elpa.gnu.org/packages/tramp-2.5.0.4.tar";
sha256 = "0yk4ckk45gkjp24nfywz49j8pazq33m6pga3lirb5h6zc8an5z24";
};
packageRequires = [ emacs ];
meta = {
@ -3736,10 +3759,10 @@
elpaBuild {
pname = "transient";
ename = "transient";
version = "0.3.0";
version = "0.3.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/transient-0.3.0.tar";
sha256 = "1a457apfl762nn5xf1h3hbvrgs9hybkxh0jwb2y713zkhhck66cp";
url = "https://elpa.gnu.org/packages/transient-0.3.2.tar";
sha256 = "10zqa245dn6z689z7ap6nx6q9s95whzgybpwl2slpmnawxix2q6i";
};
packageRequires = [ emacs ];
meta = {
@ -3927,10 +3950,10 @@
elpaBuild {
pname = "vertico";
ename = "vertico";
version = "0.4";
version = "0.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vertico-0.4.tar";
sha256 = "1af9ri51i7pn1pcsmbavnwqafrn46vbxrbqjzfi6a7q6n5yv77im";
url = "https://elpa.gnu.org/packages/vertico-0.6.tar";
sha256 = "19f6ffljraikz83nc2y9q83zjc4cfyzn9rnwm18lwh6sjsydz6kk";
};
packageRequires = [ emacs ];
meta = {
@ -4235,10 +4258,10 @@
elpaBuild {
pname = "xref";
ename = "xref";
version = "1.0.4";
version = "1.1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/xref-1.0.4.el";
sha256 = "0hkm59qqlsfw3w9ws9xhpmmz30ylifmh05a00ba58zvv1kz04x1g";
url = "https://elpa.gnu.org/packages/xref-1.1.0.tar";
sha256 = "1s7pwk09bry4nqr4bc78a3mbwyrxagai2gpsd49x47czy2x7m3ax";
};
packageRequires = [ emacs ];
meta = {

View file

@ -4,10 +4,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "20210412";
version = "20210503";
src = fetchurl {
url = "https://orgmode.org/elpa/org-20210412.tar";
sha256 = "17hj4y0c9hjqqa7inzjadz9z64vh621lm4cb0asm13r7d1v186yf";
url = "https://orgmode.org/elpa/org-20210503.tar";
sha256 = "0j9p834c67qzxbxz8s1n8l5blylrpb3jh9wywphlb6jgbgl0mw09";
};
packageRequires = [];
meta = {
@ -19,10 +19,10 @@
elpaBuild {
pname = "org-plus-contrib";
ename = "org-plus-contrib";
version = "20210412";
version = "20210503";
src = fetchurl {
url = "https://orgmode.org/elpa/org-plus-contrib-20210412.tar";
sha256 = "162nl1a62l9d4nazply93sx4lih11845z87hxmpfd0n7i7s290mh";
url = "https://orgmode.org/elpa/org-plus-contrib-20210503.tar";
sha256 = "0k0wmnx2g919h3s9ynv1cvdlyxvydglslamlwph4xng4kzcr5lrk";
};
packageRequires = [];
meta = {

View file

@ -63,17 +63,10 @@ rustPlatform.buildRustPackage rec {
OpenGL
];
installPhase = ''
runHook preInstall
install -D $releaseDir/emulsion $out/bin/emulsion
'' + lib.optionalString stdenv.isLinux ''
patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion
'' + ''
runHook postInstall
postFixup = lib.optionalString stdenv.isLinux ''
patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion
'';
dontPatchELF = true;
meta = with lib; {
description = "A fast and minimalistic image viewer";
homepage = "https://arturkovacs.github.io/emulsion-website/";

View file

@ -13,14 +13,14 @@ let
pythonPackages = python3Packages;
in
mkDerivation rec {
version = "1.12";
version = "1.13";
pname = "renderdoc";
src = fetchFromGitHub {
owner = "baldurk";
repo = "renderdoc";
rev = "v${version}";
sha256 = "4k0WsTsz4WwPZC8Dj85l2ntJOZkLgmBBOJcX9Bb4U7I=";
sha256 = "MBvdnB1YPeCaXSgqqtGs0SMocbarjmaWtIUkBBCvufc=";
};
buildInputs = [

View file

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "upwork";
version = "5.5.0.1";
version = "5.5.0.11";
src = fetchurl {
url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_5_0_1_291c031686ed44ff/${pname}_${version}_amd64.deb";
sha256 = "49192ecfb10929b5b51cf8899186059649c894109ec172695cd7cfaa50923f6a";
url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_5_0_11_61df9c99b6df4e7b/${pname}_${version}_amd64.deb";
sha256 = "db83d5fb1b5383992c6156284f6f3cd3a6b23f727ce324ba90c82817553fb4f7";
};
dontWrapGApps = true;

View file

@ -1,12 +1,8 @@
{ mkDerivation, callPackage, buildPackages
{ mkDerivation
, async, base, bytestring, containers, fetchFromGitLab, mtl
, parallel-io, parsec, lib, stm, transformers
, parallel-io, parsec, lib, stm, transformers, sbv_7_13, z3
}:
let
z3 = callPackage ./z3.nix { gomp = null; z3 = buildPackages.z3; };
in let
sbv = callPackage ./sbv-7.13.nix { inherit z3; };
in
mkDerivation rec {
pname = "petrinizer";
version = "0.9.1.1";
@ -22,10 +18,11 @@ mkDerivation rec {
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
async base bytestring containers mtl parallel-io parsec sbv stm
async base bytestring containers mtl parallel-io parsec sbv_7_13 stm
transformers
];
description = "Safety and Liveness Analysis of Petri Nets with SMT solvers";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ raskin ];
inherit (sbv_7_13.meta) platforms;
}

View file

@ -1,26 +0,0 @@
{ mkDerivation, array, async, base, bytestring, containers
, crackNum, deepseq, directory, doctest, filepath, generic-deriving
, ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random
, lib, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
, template-haskell, time, z3
}:
mkDerivation {
pname = "sbv";
version = "7.13";
sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array async base containers crackNum deepseq directory filepath
generic-deriving ghc mtl pretty process QuickCheck random syb
template-haskell time
];
testHaskellDepends = [
base bytestring containers crackNum directory doctest filepath Glob
hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit
tasty-quickcheck template-haskell
];
testSystemDepends = [ z3 ];
homepage = "http://leventerkok.github.com/sbv/";
description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
license = lib.licenses.bsd3;
}

View file

@ -1,24 +0,0 @@
{ mkDerivation, fetchpatch
, base, containers, gomp, hspec, QuickCheck, lib
, transformers, z3
}:
mkDerivation {
pname = "z3";
version = "408.0";
sha256 = "13qkzy9wc17rm60i24fa9sx15ywbxq4a80g33w20887gvqyc0q53";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base containers transformers ];
librarySystemDepends = [ gomp z3 ];
testHaskellDepends = [ base hspec QuickCheck ];
homepage = "https://github.com/IagoAbal/haskell-z3";
description = "Bindings for the Z3 Theorem Prover";
license = lib.licenses.bsd3;
doCheck = false;
patches = [
(fetchpatch {
url = "https://github.com/IagoAbal/haskell-z3/commit/b10e09b8a809fb5bbbb1ef86aeb62109ece99cae.patch";
sha256 = "13fnrs27mg3985r3lwks8fxfxr5inrayy2cyx2867d92pnl3yry4";
})
];
}

View file

@ -9,7 +9,6 @@
, meson
, ninja
, nixosTests
, pandoc
, pango
, pixman
, pkg-config
@ -23,20 +22,19 @@
stdenv.mkDerivation rec {
pname = "cagebreak";
version = "1.7.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "project-repo";
repo = pname;
rev = version;
hash = "sha256-HpAjJHu5sxZKof3ydnU3wcP5GpnH6Ax8m1T1vVoq+oI=";
hash = "sha256-1IztedN5/I/4TDKHLJ26fSrDsvJ5QAr+cbzS2PQITDE=";
};
nativeBuildInputs = [
makeWrapper
meson
ninja
pandoc
pkg-config
scdoc
wayland
@ -55,37 +53,33 @@ stdenv.mkDerivation rec {
wlroots
];
outputs = [
"out"
"contrib"
];
mesonFlags = [
"-Dman-pages=true"
"-Dversion_override=${version}"
"-Dxwayland=${lib.boolToString withXwayland}"
];
# TODO: investigate why is this happening
postPatch = ''
sed -i -e 's|<drm_fourcc.h>|<libdrm/drm_fourcc.h>|' *.c
'';
postInstall = ''
mkdir -p $contrib/share/cagebreak
cp $src/examples/config $contrib/share/cagebreak/config
install -d $out/share/cagebreak/
install -m644 $src/examples/config $out/share/cagebreak/
'';
postFixup = lib.optionalString withXwayland ''
wrapProgram $out/bin/cagebreak --prefix PATH : "${xwayland}/bin"
'';
passthru.tests.basic = nixosTests.cagebreak;
meta = with lib; {
description = "A Wayland tiling compositor inspired by ratpoison";
homepage = "https://github.com/project-repo/cagebreak";
description = "A Wayland tiling compositor inspired by ratpoison";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ berbiche ];
platforms = platforms.linux;
};
passthru.tests.basic = nixosTests.cagebreak;
}

View file

@ -1,7 +1,9 @@
{ lib, stdenv, ghcWithPackages, makeWrapper, packages ? (x: []) }:
{ lib, stdenv, haskellPackages, makeWrapper, packages ? (x: []) }:
let
taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self);
taffybarEnv = haskellPackages.ghc.withPackages (self: [
self.taffybar
] ++ packages self);
in stdenv.mkDerivation {
name = "taffybar-with-packages-${taffybarEnv.version}";
@ -13,8 +15,5 @@ in stdenv.mkDerivation {
--set NIX_GHC "${taffybarEnv}/bin/ghc"
'';
meta = {
platforms = lib.platforms.unix;
license = lib.licenses.bsd3;
};
inherit (haskellPackages.taffybar) meta;
}

View file

@ -47,6 +47,7 @@ Options:
--deepClone Clone the entire repository.
--no-deepClone Make a shallow clone of just the required ref.
--leave-dotGit Keep the .git directories.
--fetch-lfs Fetch git Large File Storage (LFS) files.
--fetch-submodules Fetch submodules.
--builder Clone as fetchgit does, but url, rev, and out option are mandatory.
--quiet Only print the final json summary.

View file

@ -1,6 +1,10 @@
# Hackage database snapshot, used by maintainers/scripts/regenerate-hackage-packages.sh
# and callHackage
{ fetchurl }:
let
pin = builtins.fromJSON (builtins.readFile ./pin.json);
in
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/d202e2aff06500ede787ed63544476f6d41e9eb7.tar.gz";
sha256 = "00hmclrhr3a2h9vshsl909g0zgymlamx491lkhwr5kgb3qx9sfh2";
inherit (pin) url sha256;
passthru.updateScript = ../../../../maintainers/scripts/haskell/update-hackage.sh;
}

View file

@ -0,0 +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"
}

View file

@ -1,43 +0,0 @@
{ lib, stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }:
stdenv.mkDerivation rec {
pname = "avian";
version = "1.2.0";
src = fetchFromGitHub {
owner = "readytalk";
repo = "avian";
rev = "v${version}";
sha256 = "1j2y45cpqk3x6a743mgpg7z3ivwm7qc9jy6xirvay7ah1qyxmm48";
};
buildInputs = [ zlib jdk ]
++ lib.optionals stdenv.isDarwin [ CoreServices Foundation ];
NIX_CFLAGS_COMPILE = "-Wno-error";
postPatch = ''
substituteInPlace makefile \
--replace 'g++' 'c++' \
--replace 'gcc' 'cc'
'';
installPhase = ''
mkdir -p $out/bin
cp build/*/avian $out/bin/
cp build/*/avian-dynamic $out/bin/
'';
meta = {
description = "Lightweight Java virtual machine";
longDescription = ''
Avian is a lightweight virtual machine and class library designed
to provide a useful subset of Javas features, suitable for
building self-contained applications.
'';
homepage = "https://readytalk.github.io/avian/";
license = lib.licenses.isc;
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.earldouglas ];
};
}

View file

@ -11,7 +11,7 @@ let
inherit (lib) optionals optionalString;
version = "1.15.11";
version = "1.15.12";
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "1rb1s130yqy80kcl140k5a53xhvw4fmrpmclvqygcv67si0j8nzj";
sha256 = "sha256-HGkRk330onf6dOe378PQhZRJjExK3AtsSuNWYTdSgJE=";
};
# perl is used for testing go vet

View file

@ -11,7 +11,7 @@ let
inherit (lib) optionals optionalString;
version = "1.16.3";
version = "1.16.4";
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "sha256-spjSnekjbKR6Aj44IxO8wtLu0x36cGtgoEEDzoOnGiU=";
sha256 = "sha256-rk9rbioWd9MYF5hGVadiB0tTVtpQ+1hyK5kQSHDUNQM=";
};
# perl is used for testing go vet

View file

@ -0,0 +1,40 @@
# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh.
{ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
, containers, deepseq, directory, distribution-nixpkgs, fetchzip
, filepath, hackage-db, hopenssl, hpack, language-nix, lens, lib
, monad-par, monad-par-extras, mtl, optparse-applicative, pretty
, process, split, tasty, tasty-golden, text, time, transformers
, yaml
}:
mkDerivation {
pname = "cabal2nix";
version = "unstable-2021-05-06";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/b598bc4682b0827554b5780acdd6f948d320283b.tar.gz";
sha256 = "04afm56cyhj2l41cvq4z11k92jjchr21a8vg9pjaz438pma7jgw1";
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson ansi-wl-pprint base bytestring Cabal containers deepseq
directory distribution-nixpkgs filepath hackage-db hopenssl hpack
language-nix lens optparse-applicative pretty process split text
time transformers yaml
];
executableHaskellDepends = [
aeson base bytestring Cabal containers directory
distribution-nixpkgs filepath hopenssl language-nix lens monad-par
monad-par-extras mtl optparse-applicative pretty
];
testHaskellDepends = [
base Cabal containers directory filepath language-nix lens pretty
process tasty tasty-golden
];
preCheck = ''
export PATH="$PWD/dist/build/cabal2nix:$PATH"
export HOME="$TMPDIR/home"
'';
homepage = "https://github.com/nixos/cabal2nix#readme";
description = "Convert Cabal files into Nix build instructions";
license = lib.licenses.bsd3;
}

View file

@ -197,7 +197,19 @@ self: super: {
digit = doJailbreak super.digit;
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck super.hnix);
hnix = generateOptparseApplicativeCompletion "hnix"
(overrideCabal super.hnix (drv: {
doCheck = false;
prePatch = ''
# fix encoding problems when patching
${pkgs.dos2unix}/bin/dos2unix hnix.cabal
'' + (drv.prePatch or "");
patches = [
# support ref-tf in hnix 0.12.0.1, can be removed after
# https://github.com/haskell-nix/hnix/pull/918
./patches/hnix-ref-tf-0.5-support.patch
] ++ (drv.patches or []);
}));
# Fails for non-obvious reasons while attempting to use doctest.
search = dontCheck super.search;
@ -291,7 +303,6 @@ self: super: {
htsn = dontCheck super.htsn;
htsn-import = dontCheck super.htsn-import;
http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105
ihaskell = dontCheck super.ihaskell;
influxdb = dontCheck super.influxdb;
integer-roots = dontCheck super.integer-roots; # requires an old version of smallcheck, will be fixed in > 1.0
itanium-abi = dontCheck super.itanium-abi;
@ -362,7 +373,6 @@ self: super: {
tickle = dontCheck super.tickle;
tpdb = dontCheck super.tpdb;
translatable-intset = dontCheck super.translatable-intset;
trifecta = if pkgs.stdenv.hostPlatform.isAarch64 then dontCheck super.trifecta else super.trifecta; # affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461
ua-parser = dontCheck super.ua-parser;
unagi-chan = dontCheck super.unagi-chan;
wai-logger = dontCheck super.wai-logger;
@ -854,9 +864,6 @@ self: super: {
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 = super.hledger-lib.override { pretty-simple = self.pretty-simple; };
# Copy hledger man pages from data directory into the proper place. This code
# should be moved into the cabal2nix generator.
hledger = overrideCabal super.hledger (drv: {
@ -1284,16 +1291,34 @@ self: super: {
# https://github.com/kowainik/policeman/issues/57
policeman = doJailbreak super.policeman;
haskell-gi-base = addBuildDepends super.haskell-gi-base [ pkgs.gobject-introspection ];
# nixpkgs has bumped gdkpixbuf C lib, so we need gi-gdkpixbuf_2_0_26 to link against that.
# This leads to all this bumps which can be removed once stackage has haskell-gi 0.25.
haskell-gi = self.haskell-gi_0_25_0;
haskell-gi-base = addBuildDepends super.haskell-gi-base_0_25_0 [ pkgs.gobject-introspection ];
gi-glib = self.gi-glib_2_0_25;
gi-cairo = self.gi-cairo_1_0_25;
gi-gobject = self.gi-gobject_2_0_26;
gi-atk = self.gi-atk_2_0_23;
gi-gio = self.gi-gio_2_0_28;
gi-harfbuzz = self.gi-harfbuzz_0_0_4;
gi-javascriptcore = self.gi-javascriptcore_4_0_23;
gi-pango = self.gi-pango_1_0_24;
gi-soup = self.gi-soup_2_4_24;
gi-gdkpixbuf = self.gi-gdkpixbuf_2_0_26;
gi-gdk = self.gi-gdk_3_0_24;
gi-gtk = self.gi-gtk_3_0_37;
gi-webkit2 = self.gi-webkit2_4_0_27;
gi-cairo-render = doJailbreak super.gi-cairo-render;
gi-cairo-connector = doJailbreak super.gi-cairo-connector;
gi-gtk-hs = self.gi-gtk-hs_0_3_10;
gi-dbusmenu = self.gi-dbusmenu_0_4_9;
gi-xlib = self.gi-xlib_2_0_10;
gi-gdkx11 = self.gi-gdkx11_3_0_11;
gi-dbusmenugtk3 = self.gi-dbusmenugtk3_0_4_10;
# 2020-08-14: Needs some manual patching to be compatible with haskell-gi-base 0.24
# 2021-05-17: Needs some manual patching to be compatible with haskell-gi-base 0.25
# Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119
jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk (pkgs.fetchpatch {
url = "https://github.com/ghcjs/jsaddle/compare/9727365...f842748.patch";
sha256 = "07l4l999lmlx7sqxf7v4f70rmxhx9r0cjblkgc4n0y6jin4iv1cb";
stripLen = 2;
extraPrefix = "";
});
jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk ./patches/jsaddle-webkit2gtk.patch;
# Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released)
# https://github.com/lehins/massiv/pull/104
@ -1790,4 +1815,74 @@ self: super: {
excludes = ["test/buildtest"];
});
# workaround for https://github.com/peti/distribution-nixpkgs/issues/9
pam = super.pam.override { inherit (pkgs) pam; };
# Too strict version bounds on base:
# https://github.com/obsidiansystems/database-id/issues/1
database-id-class = doJailbreak super.database-id-class;
cabal2nix-unstable = overrideCabal super.cabal2nix-unstable {
passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh;
};
# Too strict version bounds on base and optparse-applicative
# https://github.com/diagrams/diagrams-cairo/issues/77
diagrams-cairo = doJailbreak super.diagrams-cairo;
# Too strict version bounds on base
# https://github.com/gibiansky/IHaskell/issues/1217
ihaskell-display = doJailbreak super.ihaskell-display;
ihaskell-basic = doJailbreak super.ihaskell-basic;
# too strict bounds on QuickCheck
# https://github.com/HeinrichApfelmus/hyper-haskell/issues/42
hyper-extra = doJailbreak super.hyper-extra;
# Fixes too strict version bounds on regex libraries
# Presumably to be removed at the next release
yi-language = appendPatch super.yi-language (pkgs.fetchpatch {
url = "https://github.com/yi-editor/yi/commit/0d3bcb5ba4c237d57ce33a3dc39b63c56d890765.patch";
sha256 = "0r4mzngs0x1akqpajzx7ssa9rax977fvj5ra8d3grfbpx6z0nm01";
includes = [ "yi-language.cabal" ];
stripLen = 2;
extraPrefix = "";
});
# https://github.com/ghcjs/jsaddle/issues/123
jsaddle = overrideCabal super.jsaddle (drv: {
# lift conditional version constraint on ref-tf
postPatch = ''
sed -i 's/ref-tf.*,/ref-tf,/' jsaddle.cabal
'' + (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 {
doCheck = pkgs.stdenv.targetPlatform.system == "x86_64-linux";
};
# Fix build failure by picking patch from 8.5,
# we need this version of sbv for petrinizer
sbv_7_13 = appendPatch super.sbv_7_13
(pkgs.fetchpatch {
url = "https://github.com/LeventErkok/sbv/commit/57014b9c7c67dd9b63619a996e2c66e32c33c958.patch";
sha256 = "10npa8nh2413n6p6qld795qfkbld08icm02bspmk93y0kabpgmgm";
});
# Too strict bounds on ref-tf
# https://github.com/travitch/haggle/issues/4
haggle = doJailbreak super.haggle;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View file

@ -98,4 +98,10 @@ self: super: {
# The test suite seems pretty broken.
base64-bytestring = dontCheck super.base64-bytestring;
# 5.6 introduced support for GHC 9.0.x, but hasn't landed in stackage yet
profunctors = super.profunctors_5_6_2;
# 5 introduced support for GHC 9.0.x, but hasn't landed in stackage yet
lens = super.lens_5_0_1;
}

View file

@ -0,0 +1,439 @@
# pkgs/development/haskell-modules/configuration-hackage2nix.yaml
compiler: ghc-8.10.4
core-packages:
- array-0.5.4.0
- base-4.14.1.0
- binary-0.8.8.0
- bytestring-0.10.12.0
- Cabal-3.2.1.0
- containers-0.6.2.1
- deepseq-1.4.4.0
- directory-1.3.6.0
- exceptions-0.10.4
- filepath-1.4.2.1
- ghc-8.10.4
- ghc-boot-8.10.4
- ghc-boot-th-8.10.4
- ghc-compact-0.1.0.0
- ghc-heap-8.10.4
- ghc-prim-0.6.1
- ghci-8.10.4
- haskeline-0.8.0.1
- hpc-0.6.1.0
- integer-gmp-1.0.3.0
- libiserv-8.10.4
- mtl-2.2.2
- parsec-3.1.14.0
- pretty-1.1.3.6
- process-1.6.9.0
- rts-1.0
- stm-2.5.0.0
- template-haskell-2.16.0.0
- terminfo-0.4.1.4
- text-1.2.4.1
- time-1.9.3
- transformers-0.5.6.2
- unix-2.7.2.2
- xhtml-3000.2.2.1
# Hack: The following package is a core package of GHCJS. If we don't declare
# it, then hackage2nix will generate a Hackage database where all dependants
# of this library are marked as "broken".
- ghcjs-base-0
# This is a list of packages with versions from the latest Stackage LTS release.
#
# The packages and versions in this list cause the `hackage2nix` tool to
# generate the package at the given version.
#
# For instance, with a line like the following:
#
# - aeson ==1.4.6.0
#
# `hackage2nix` will generate the `aeson` package at version 1.4.6.0 in the
# ./hackage-packages.nix file.
#
# Since the packages in the LTS package set are sometimes older than the latest
# on Hackage, `hackage2nix` is smart enough to also generate the latest version
# of a given package.
#
# In the above example with aeson, if there was version 1.5.0.0 of aeson
# available on Hackage, `hackage2nix` would generate two packages, `aeson`
# at version 1.4.6.0 and `aeson_1_5_0_0` at version 1.5.0.0.
#
# WARNING: This list is generated semiautomatically based on the most recent
# LTS package set. If you want to add entries to it, you must do so before the
# comment saying "# LTS Haskell x.y". Any changes after that comment will be
# lost the next time `update-stackage.sh` runs.
default-package-overrides:
# This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag
- MissingH ==1.4.2.0
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs
- gi-gdkx11 < 4
# Needs Cabal 3.4 for Setup.hs
- 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.
- Cabal == 2.2.* # required for jailbreak-cabal etc.
- Cabal == 2.4.* # required for cabal-install etc.
- Cabal == 3.2.* # required for cabal-install etc.
- dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20
- dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20
- dhall == 1.29.0 # required for ats-pkg
- Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
- ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0
- haddock == 2.23.* # required on GHC < 8.10.x
- haddock-api == 2.23.* # required on GHC < 8.10.x
- haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0
- happy == 1.19.9 # for purescript
- hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
- hlint < 3.3 # We dont 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
- refinery == 0.3.* # required by hls-tactics-plugin-1.0.0.0
- resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
- sbv == 7.13 # required for pkgs.petrinizer
- gi-gdk == 3.0.24 # 2021-05-07: For haskell-gi 0.25 without gtk4
- gi-gtk < 4.0 # 2021-05-07: For haskell-gi 0.25 without gtk4
- gi-gdkx11 == 3.0.11 # 2021-05-07: For haskell-gi 0.25 without gtk4
package-maintainers:
peti:
- cabal-install
- cabal2nix
- cabal2spec
- distribution-nixpkgs
- funcmp
- git-annex
- hackage-db
- hledger
- hledger-interest
- hledger-ui
- hledger-web
- hopenssl
- hsdns
- hsemail
- hsyslog
- jailbreak-cabal
- language-nix
- logging-facade-syslog
- nix-paths
- pandoc
- structured-haskell-mode
- titlecase
- xmonad
- xmonad-contrib
gridaphobe:
- located-base
jb55:
# - bson-lens
- cased
- elm-export-persistent
# - pipes-mongodb
- streaming-wai
kiwi:
- config-schema
- config-value
- glirc
- irc-core
- matterhorn
- mattermost-api
- mattermost-api-qc
- Unique
psibi:
- path-pieces
- persistent
- persistent-sqlite
- persistent-template
- shakespeare
abbradar:
- Agda
roberth:
- arion-compose
- hercules-ci-agent
- hercules-ci-api
- hercules-ci-api-agent
- hercules-ci-api-core
- hercules-ci-cli
- hercules-ci-cnix-expr
- hercules-ci-cnix-store
cdepillabout:
- pretty-simple
- spago
terlar:
- nix-diff
maralorn:
- reflex-dom
- cabal-fmt
- shh
- neuron
- releaser
- taskwarrior
- haskell-language-server
- shake-bench
- iCalendar
- stm-containers
sorki:
- cayenne-lpp
- data-stm32
- gcodehs
- nix-derivation
- nix-narinfo
- ttn
- ttn-client
- update-nix-fetchgit
- zre
utdemir:
- nix-tree
turion:
- rhine
- rhine-gloss
- essence-of-live-coding
- essence-of-live-coding-gloss
- essence-of-live-coding-pulse
- essence-of-live-coding-quickcheck
- Agda
- dunai
- finite-typelits
- pulse-simple
- simple-affine-space
sternenseemann:
# also maintain upstream package
- spacecookie
- gopher-proxy
# other packages I can help out for
- systemd
- fast-logger
- flat
- Euterpea2
- utc
- socket
- gitit
- yarn-lock
- yarn2nix
poscat:
- hinit
bdesham:
- pinboard-notes-backup
unsupported-platforms:
alsa-mixer: [ x86_64-darwin ]
alsa-pcm: [ x86_64-darwin ]
alsa-seq: [ x86_64-darwin ]
AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
barbly: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
bdcs-api: [ x86_64-darwin ]
bindings-sane: [ x86_64-darwin ]
bindings-directfb: [ x86_64-darwin ]
cut-the-crap: [ x86_64-darwin ]
d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
dx9base: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Euterpea: [ x86_64-darwin ]
freenect: [ x86_64-darwin ]
FTGL: [ x86_64-darwin ]
gi-dbusmenugtk3: [ x86_64-darwin ]
gi-dbusmenu: [ x86_64-darwin ]
gi-ggit: [ x86_64-darwin ]
gi-ibus: [ x86_64-darwin ]
gi-ostree: [ x86_64-darwin ]
gi-vte: [ x86_64-darwin ]
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 ]
hidapi: [ x86_64-darwin ]
hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
HSoM: [ x86_64-darwin ]
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 ]
lio-fs: [ x86_64-darwin ]
logging-facade-journald: [ x86_64-darwin ]
midi-alsa: [ x86_64-darwin ]
mpi-hs: [ aarch64-linux, x86_64-darwin ]
mpi-hs-binary: [ aarch64-linux, x86_64-darwin ]
mpi-hs-cereal: [ aarch64-linux, x86_64-darwin ]
mpi-hs-store: [ aarch64-linux, x86_64-darwin ]
mplayer-spot: [ aarch64-linux ]
oculus: [ x86_64-darwin ]
pam: [ x86_64-darwin ]
piyo: [ x86_64-darwin ]
PortMidi-simple: [ x86_64-darwin ]
PortMidi: [ x86_64-darwin ]
posix-api: [ x86_64-darwin ]
Raincat: [ x86_64-darwin ]
reactivity: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
reflex-dom: [ x86_64-darwin ]
rtlsdr: [ x86_64-darwin ]
rubberband: [ x86_64-darwin ]
sbv: [ aarch64-linux ]
sdl2-mixer: [ x86_64-darwin ]
sdl2-ttf: [ x86_64-darwin ]
synthesizer-alsa: [ x86_64-darwin ]
taffybar: [ x86_64-darwin ]
termonad: [ x86_64-darwin ]
tokyotyrant-haskell: [ x86_64-darwin ]
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 ]
vulkan-utils: [ x86_64-darwin ]
webkit2gtk3-javascriptcore: [ x86_64-darwin ]
Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32-junction-point: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32-notify: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
xattr: [ x86_64-darwin ]
xgboost-haskell: [ aarch64-linux, armv7l-linux ]
XInput: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
xmobar: [ x86_64-darwin ]
xmonad-extras: [ x86_64-darwin ]
xmonad-volume: [ x86_64-darwin ]
dont-distribute-packages:
# Depends on shine, which is a ghcjs project.
- shine-varying
# these packages depend on software with an unfree license
- accelerate-bignum
- accelerate-blas
- accelerate-cublas
- accelerate-cuda
- accelerate-cufft
- accelerate-examples
- accelerate-fft
- accelerate-fourier-benchmark
- accelerate-io-array
- accelerate-io-bmp
- accelerate-io-bytestring
- accelerate-io-cereal
- accelerate-io-JuicyPixels
- accelerate-io-repa
- accelerate-io-vector
- accelerate-kullback-liebler
- accelerate-llvm-ptx
- bindings-yices
- boolector
- ccelerate-cuda
- containers-accelerate
- cplex-hs
- cublas
- cuda # 2020-08-18 because of dependency nvidia-x11
- cufft
- cusolver
- cusparse
- gloss-raster-accelerate
- hashable-accelerate
- libnvvm
- matlab
- nvvm
- Obsidian
- odpic-raw
- patch-image
# license for input data unclear, dependency not on Hackage
# see https://github.com/NixOS/nixpkgs/pull/88604
- tensorflow-mnist
- yices-easy
- yices-painless
# these packages don't evaluate because they have broken (system) dependencies
- XML
- comark
- couch-simple
- diagrams-hsqml
- diagrams-reflex
- dialog
- fltkhs-demos
- fltkhs-fluid-demos
- fltkhs-hello-world
- fltkhs-themes
- ghcjs-dom-hello
- ghcjs-dom-webkit
- gi-javascriptcore
- gi-webkit
- gi-webkit2
- gi-webkit2webextension
- gsmenu
- haste-gapi
- haste-perch
- hbro
- hplayground
- hs-mesos
- hsqml
- hsqml-datamodel
- hsqml-datamodel-vinyl
- hsqml-datemodel-vinyl
- hsqml-demo-manic
- hsqml-demo-morris
- hsqml-demo-notes
- hsqml-demo-notes
- hsqml-demo-samples
- hsqml-morris
- hsqml-morris
- hstorchat
- imprevu-happstack
- jsaddle-webkit2gtk
- jsaddle-webkitgtk
- jsc
- lambdacat
- leksah
- manatee-all
- manatee-browser
- manatee-reader
- markup-preview
- nomyx-api
- nomyx-core
- nomyx-language
- nomyx-library
- nomyx-server
- passman-cli
- passman-core
- reflex-dom-colonnade
- reflex-dom-contrib
- reflex-dom-fragment-shader-canvas
- reflex-dom-helpers
- reflex-jsx
- sneathlane-haste
- spike
- tianbar
- trasa-reflex
- treersec
- wai-middleware-brotli
- web-browser-in-haskell
- webkit
- webkitgtk3
- webkitgtk3-javascriptcore
- websnap

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,121 @@
# This file is automatically generated by
# maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
# It is supposed to list all haskellPackages that cannot evaluate because they
# depend on a dependency marked as broken.
dont-distribute-packages:
- AesonBson
- HGamer3D-API
- HGamer3D-CAudio-Binding
- HGamer3D-OIS-Binding
- HipmunkPlayground
- Holumbus-Distribution
- Holumbus-MapReduce
- Holumbus-Storage
- KiCS
- KiCS-debugger
- KiCS-prophecy
- RESTng
- ViennaRNA-bindings
- XML
- acme-safe
- aeson-bson
- approx-rand-test
- barley
- bson-mapping
- clash-prelude-quickcheck
- click-clack
- cloudyfs
- cognimeta-utils
- comark
- comonad-random
- containers-accelerate
- definitive-graphics
- ecdsa
- effective-aspects-mzv
- eliminators_0_8
- fltkhs-demos
- fltkhs-fluid-demos
- fltkhs-hello-world
- fltkhs-themes
- fluent-logger-conduit
- gi-gtk_4_0_4
- goat
- gridfs
- gsmenu
- gtk2hs-cast-glade
- gtk2hs-cast-gnomevfs
- gtk2hs-cast-gtkglext
- gtk2hs-cast-gtksourceview2
- hakyll-contrib-i18n
- hascat
- hascat-lib
- hascat-setup
- hascat-system
- haste-gapi
- haste-perch
- hatexmpp3
- hplayground
- hs2dot
- hsqml-datamodel-vinyl
- hsqml-demo-morris
- hsqml-morris
- hubris
- hxt-binary
- hxt-filter
- imprevu-happstack
- javaclass
- keera-posture
- lambdabot-xmpp
- leksah
- liquidhaskell-cabal-demo
- mp3decoder
- network-pgi
- nomyx-api
- nomyx-core
- nomyx-language
- nomyx-library
- nomyx-server
- one-liner_2_0
- openpgp-crypto-api
- patch-image
- perdure
- persistent-mysql_2_12_1_0
- persistent-postgresql_2_12_1_1
- persistent-sqlite_2_12_0_0
- pontarius-mediaserver
- pontarius-xmpp-extras
- pontarius-xpmn
- procrastinating-structure
- reactive
- redHandlers
- reflex-dom-colonnade
- regex-genex
- ribosome
- ribosome-root
- ribosome-test
- ripple
- robot
- roguestar-engine
- roguestar-gl
- roguestar-glut
- route-generator
- sc2hs
- sexpresso
- shine-varying
- singleton-nats_0_4_6
- smtp2mta
- sneathlane-haste
- sock2stream
- starrover2
- text-xml-generic
- trasa-reflex
- treersec
- tuple-hlist
- wai-dispatch
- wai-hastache
- wai-middleware-brotli
- wai-session-tokyocabinet
- wx
- wxc
- wxcore

View file

@ -657,10 +657,6 @@ self: super: builtins.intersectAttrs super {
spago =
let
# spago requires an older version of megaparsec, but it appears to work
# fine with newer versions.
spagoWithOverrides = doJailbreak super.spago;
docsSearchApp_0_0_10 = pkgs.fetchurl {
url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.10/docs-search-app.js";
sha256 = "0m5ah29x290r0zk19hx2wix2djy7bs4plh9kvjz6bs9r45x25pa5";
@ -681,17 +677,8 @@ self: super: builtins.intersectAttrs super {
sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6";
};
spagoFixHpack = overrideCabal spagoWithOverrides (drv: {
spagoDocs = overrideCabal super.spago (drv: {
postUnpack = (drv.postUnpack or "") + ''
# The source for spago is pulled directly from GitHub. It uses a
# package.yaml file with hpack, not a .cabal file. In the package.yaml file,
# it uses defaults from the master branch of the hspec repo. It will try to
# fetch these at build-time (but it will fail if running in the sandbox).
#
# The following line modifies the package.yaml to not pull in
# defaults from the hspec repo.
substituteInPlace "$sourceRoot/package.yaml" --replace 'defaults: hspec/hspec@master' ""
# Spago includes the following two files directly into the binary
# with Template Haskell. They are fetched at build-time from the
# `purescript-docs-search` repo above. If they cannot be fetched at
@ -717,9 +704,8 @@ self: super: builtins.intersectAttrs super {
'';
});
# Because of the problem above with pulling in hspec defaults to the
# package.yaml file, the tests are disabled.
spagoWithoutChecks = dontCheck spagoFixHpack;
# Tests require network access.
spagoWithoutChecks = dontCheck spagoDocs;
in
spagoWithoutChecks;
@ -826,4 +812,59 @@ self: super: builtins.intersectAttrs super {
# Tests access internet
prune-juice = dontCheck super.prune-juice;
# based on https://github.com/gibiansky/IHaskell/blob/aafeabef786154d81ab7d9d1882bbcd06fc8c6c4/release.nix
ihaskell = overrideCabal super.ihaskell (drv: {
configureFlags = (drv.configureFlags or []) ++ [
# ihaskell's cabal file forces building a shared executable,
# but without passing --enable-executable-dynamic, the RPATH
# contains /build/ and leads to a build failure with nix
"--enable-executable-dynamic"
];
preCheck = ''
export HOME=$TMPDIR/home
export PATH=$PWD/dist/build/ihaskell:$PATH
export GHC_PACKAGE_PATH=$PWD/dist/package.conf.inplace/:$GHC_PACKAGE_PATH
'';
});
# tests need to execute the built executable
stutter = overrideCabal super.stutter (drv: {
preCheck = ''
export PATH=dist/build/stutter:$PATH
'' + (drv.preCheck or "");
});
# Install man page and generate shell completions
pinboard-notes-backup = overrideCabal
(generateOptparseApplicativeCompletion "pnbackup" super.pinboard-notes-backup)
(drv: {
postInstall = ''
install -D man/pnbackup.1 $out/share/man/man1/pnbackup.1
'' + (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 {
platforms = pkgs.lib.platforms.x86;
};
# Pass the correct libarchive into the package.
streamly-archive = super.streamly-archive.override { archive = pkgs.libarchive; };
}

View file

@ -464,7 +464,12 @@ stdenv.mkDerivation ({
installPhase = ''
runHook preInstall
${if !isLibrary then "${setupCommand} install" else ''
${if !isLibrary && buildTarget == "" then "${setupCommand} install"
# ^^ if the project is not a library, and no build target is specified, we can just use "install".
else if !isLibrary then "${setupCommand} copy ${buildTarget}"
# ^^ if the project is not a library, and we have a build target, then use "copy" to install
# just the target specified; "install" will error here, since not all targets have been built.
else ''
${setupCommand} copy
local packageConfDir="$out/lib/${ghc.name}/package.conf.d"
local packageConfFile="$packageConfDir/${pname}-${version}.conf"

File diff suppressed because it is too large Load diff

View file

@ -196,6 +196,16 @@ rec {
appendPatch = drv: x: appendPatches drv [x];
appendPatches = drv: xs: overrideCabal drv (drv: { patches = (drv.patches or []) ++ xs; });
/* Set a specific build target instead of compiling all targets in the package.
* For example, imagine we have a .cabal file with a library, and 2 executables "dev" and "server".
* We can build only "server" and not wait on the compilation of "dev" by using setBuildTarget as follows:
*
* setBuildTarget (callCabal2nix "thePackageName" thePackageSrc {}) "server"
*
*/
setBuildTargets = drv: xs: overrideCabal drv (drv: { buildTarget = lib.concatStringsSep " " xs; });
setBuildTarget = drv: x: setBuildTargets drv [x];
doHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = true; });
dontHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = false; });

View file

@ -11,6 +11,10 @@ self: super: {
ldgallery-compiler = self.callPackage ../../tools/graphics/ldgallery/compiler { };
# Used by maintainers/scripts/regenerate-hackage-packages.sh, and generated
# from the latest master instead of the current version on Hackage.
cabal2nix-unstable = self.callPackage ./cabal2nix-unstable.nix { };
# https://github.com/channable/vaultenv/issues/1
vaultenv = self.callPackage ../tools/haskell/vaultenv { };

View file

@ -0,0 +1,34 @@
diff '--color=auto' '--color=never' -r --unified hnix-0.12.0.1/hnix.cabal hnix-patched/hnix.cabal
--- hnix-0.12.0.1/hnix.cabal 2001-09-09 03:46:40.000000000 +0200
+++ hnix-patched/hnix.cabal 2021-05-05 12:07:38.388267353 +0200
@@ -430,7 +430,7 @@
, parser-combinators >= 1.0.1 && < 1.3
, prettyprinter >= 1.7.0 && < 1.8
, process >= 1.6.3 && < 1.7
- , ref-tf >= 0.4.0 && < 0.5
+ , ref-tf >= 0.5
, regex-tdfa >= 1.2.3 && < 1.4
, scientific >= 0.3.6 && < 0.4
, semialign >= 1 && < 1.2
diff '--color=auto' '--color=never' -r --unified hnix-0.12.0.1/src/Nix/Fresh.hs hnix-patched/src/Nix/Fresh.hs
--- hnix-0.12.0.1/src/Nix/Fresh.hs 2001-09-09 03:46:40.000000000 +0200
+++ hnix-patched/src/Nix/Fresh.hs 2021-05-05 12:07:45.841267497 +0200
@@ -65,18 +65,3 @@
runFreshIdT :: Functor m => Var m i -> FreshIdT i m a -> m a
runFreshIdT i m = runReaderT (unFreshIdT m) i
-
--- Orphan instance needed by Infer.hs and Lint.hs
-
--- Since there's no forking, it's automatically atomic.
-instance MonadAtomicRef (ST s) where
- atomicModifyRef r f = do
- v <- readRef r
- let (a, b) = f v
- writeRef r a
- return b
- atomicModifyRef' r f = do
- v <- readRef r
- let (a, b) = f v
- writeRef r $! a
- return b

View file

@ -0,0 +1,65 @@
From 09f44aa3271390c14f92a3f196ab2ba475b4907f Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 14 Aug 2020 17:52:28 +0200
Subject: [PATCH 1/2] jsaddle-webkit2gtk: Bump haskell-gi-base upper bound
---
jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal b/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal
index 93d0b77..60c2312 100644
--- a/jsaddle-webkit2gtk.cabal
+++ b/jsaddle-webkit2gtk.cabal
@@ -35,7 +35,7 @@ library
gi-gtk >=3.0.17 && <3.1,
gi-webkit2 >=4.0.14 && <4.1,
gi-javascriptcore >=4.0.14 && <4.1,
- haskell-gi-base >=0.20 && <0.24,
+ haskell-gi-base >=0.20 && <0.26,
haskell-gi-overloading >=0.0 && < 2.0,
jsaddle >=0.9.4.0 && <0.10,
text >=1.2.1.3 && <1.3,
From f8427480ca827b2bee1d9b33dfa6118e14fe2924 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 14 Aug 2020 18:10:26 +0200
Subject: [PATCH 2/2] Locally define noAdjustment and noCancellable
Those two convenience definitions disappeared from gi-gio and gi-gtk in
newer versions.
---
.../src/Language/Javascript/JSaddle/WebKitGTK.hs | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs b/jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs
index 898dac2..5249477 100644
--- a/src/Language/Javascript/JSaddle/WebKitGTK.hs
+++ b/src/Language/Javascript/JSaddle/WebKitGTK.hs
@@ -55,11 +55,11 @@ import GI.GLib (timeoutAdd, idleAdd, pattern PRIORITY_HIGH, pattern PRIORITY_DEF
import qualified GI.Gtk as Gtk (main, init)
import GI.Gtk
(windowSetPosition, windowSetDefaultSize, windowNew,
- scrolledWindowNew, noAdjustment, containerAdd,
+ scrolledWindowNew, Adjustment, containerAdd,
WindowType(..), WindowPosition(..), widgetDestroy,
widgetGetToplevel, widgetShowAll, onWidgetDestroy,
mainQuit)
-import GI.Gio (noCancellable)
+import GI.Gio (Cancellable)
import GI.JavaScriptCore (valueToString)
import GI.WebKit2
(scriptDialogPromptSetText, scriptDialogPromptGetDefaultText,
@@ -82,6 +82,12 @@ import Language.Javascript.JSaddle (JSM, Results, Batch)
import Language.Javascript.JSaddle.Run (runJavaScript)
import Language.Javascript.JSaddle.Run.Files (initState, runBatch, ghcjsHelpers)
+noAdjustment :: Maybe Adjustment
+noAdjustment = Nothing
+
+noCancellable :: Maybe Cancellable
+noCancellable = Nothing
+
quitWebView :: WebView -> IO ()
quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't this be postGUISync?
widgetDestroy w

View file

@ -1,5 +1,5 @@
{ lib, stdenv, ghc, llvmPackages, packages, symlinkJoin, makeWrapper
, withLLVM ? false
, withLLVM ? !(stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isPowerPC)
, postBuild ? ""
, ghcLibdir ? null # only used by ghcjs, when resolving plugins
}:

View file

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
"-Wno-error=class-memaccess"
"-Wno-error=restrict"
"-Wno-error=format-truncation"
# Needed with GCC 10
"-Wno-error=maybe-uninitialized"
]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference");
patchPhase = lib.optionalString stdenv.isDarwin ''

View file

@ -77,15 +77,17 @@ stdenv.mkDerivation rec {
"-DIGRAPH_USE_INTERNAL_GMP=OFF"
"-DIGRAPH_GLPK_SUPPORT=ON"
"-DIGRAPH_GRAPHML_SUPPORT=ON"
"-DIGRAPH_ENABLE_LTO=ON"
"-DIGRAPH_ENABLE_LTO=AUTO"
"-DIGRAPH_ENABLE_TLS=ON"
"-DBUILD_SHARED_LIBS=ON"
];
doCheck = true;
preCheck = ''
# needed to find libigraph.so
# needed to find libigraph, and liblas on darwin
preCheck = if stdenv.isDarwin then ''
export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [ blas ]}:$PWD/src"
'' else ''
export LD_LIBRARY_PATH="$PWD/src"
'';

View file

@ -6,9 +6,8 @@ mkDerivation {
version = "0.16.1.0";
src = fetchgit {
url = "https://github.com/hercules-ci/optparse-applicative.git";
sha256 = "0v0r11jaav95im82if976256kncp0ji7nfdrlpbgmwxnkj1hxl48";
rev = "f9d1242f9889d2e09ff852db9dc2d231d9a3e8d8";
fetchSubmodules = true;
sha256 = "05vchaw2rf46hh2128qjpky686iy5hff964mbdhcyiz612jjflyp";
rev = "9e2968c09a7c5b29d04578dc68d81ce5aec0591e";
};
libraryHaskellDepends = [
ansi-wl-pprint base process transformers transformers-compat

View file

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.8.0";
version = "3.10.0";
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
sha256 = "sha256-AjUpxdY/5IoWMBtufP3OVnMpUwpxgpCNWoydH1w+t+Y=";
sha256 = "sha256-lIyDYt6OsBOPq1ytD4B4JxX7JeSGWprH2kqqFMzZcGY=";
};
nativeBuildInputs = [ setuptools-scm ];

View file

@ -4,6 +4,7 @@
, pymysql
, pytest
, isPy27
, fetchpatch
}:
buildPythonPackage rec {
@ -18,6 +19,14 @@ buildPythonPackage rec {
sha256 = "1qvy3phbsxp55161dnppjfx2m1kn82v0irc3xzqw0adfd81vaiad";
};
patches = [
(fetchpatch {
# vendor functions previously provided by pymysql.util
url = "https://github.com/aio-libs/aiomysql/pull/554/commits/919b997a9de7f53d721af76762fba425e306531e.patch";
sha256 = "V1VYyqr6RwTXoVoGVyMuJst6uqTuuHbpMOpLoVZO1XA=";
})
];
propagatedBuildInputs = [
pymysql
];

View file

@ -1,30 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy3k
, certifi
, chardet
, fetchFromGitHub
, deprecated
, idna
, oauthlib
, requests
, requests_oauthlib
, six
, urllib3
, pytestrunner
, pytest
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "atlassian-python-api";
version = "3.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "7ef384a91a790c807336e2bd6b7554284691aadd6d7413d199baf752dd84c53e";
src = fetchFromGitHub {
owner = "atlassian-api";
repo = pname;
rev = version;
sha256 = "sha256-J0/CtfBtOdWReKQS/VvOL/3r+j4zJfnv/ICIXepKUvc=";
};
checkInputs = [ pytestrunner pytest ];
checkInputs = [
pytestCheckHook
];
propagatedBuildInputs = [ deprecated oauthlib requests requests_oauthlib six ];

View file

@ -9,7 +9,7 @@
, osqp
, scipy
, scs
, useOpenmp ? true
, useOpenmp ? (!stdenv.isDarwin)
# Check inputs
, pytestCheckHook
}:

View file

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, gcc-unwrapped
@ -12,9 +13,11 @@ buildPythonPackage rec {
sha256 = "ef6810e76d16c95c11b96371e2d8eefd1d270ec03f9bcd07590e8dcc2c69e92b";
};
postPatch = ''
postPatch = let
libstdcpp = "${lib.getLib gcc-unwrapped}/lib/libstdc++${stdenv.hostPlatform.extensions.sharedLibrary}";
in ''
substituteInPlace cxxfilt/__init__.py \
--replace "find_any_library('stdc++', 'c++')" '"${lib.getLib gcc-unwrapped}/lib/libstdc++.so"'
--replace "find_any_library('stdc++', 'c++')" '"${libstdcpp}"'
'';
# no tests

View file

@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "fritzconnection";
version = "1.4.2";
version = "1.5.0";
# no tests on PyPI
src = fetchFromGitHub {
owner = "kbr";
repo = pname;
rev = version;
sha256 = "02w1hwbfwbh5xlq433myzv6ms7jqxg8kn3d6znq4ic22zprzf5r2";
sha256 = "sha256-Iw7R+39rpoCTrRD74kBihF7AMcJWxy2xdPhKLznWdlo=";
};
disabled = pythonOlder "3.6";

View file

@ -39,7 +39,7 @@ buildPythonPackage rec {
cargoSha256 = "0ifvpdizcdp2c5x2x2j1bhhy5a75q0pk7a63dmh52mlpmh45fy6r";
LIBCLANG_PATH = llvmPackages.libclang + "/lib";
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
propagatedBuildInputs = [
requests

View file

@ -2,14 +2,17 @@
buildPythonPackage rec {
pname = "jq";
version = "1.1.2";
version = "1.1.3";
src = fetchPypi {
inherit pname version;
sha256 = "77e747c6ad10ce65479f5f9064ab036483bf307bf71fdd7d6235ef895fcc506e";
sha256 = "1ryxcll7601ki9rwlnryhhxpmwwnxs2qxq7kjm2b0xcqgzx1vv7r";
};
patches = [ ./jq-py-setup.patch ];
patches = [
# Removes vendoring
./jq-py-setup.patch
];
buildInputs = [ jq ];

View file

@ -1,17 +1,17 @@
From 968ddf2bd773e800e46737fced743bd00af9aa0d Mon Sep 17 00:00:00 2001
From: William Kral <william.kral@gmail.com>
Date: Tue, 8 Sep 2020 22:04:24 -0700
Subject: [PATCH] Vastly simplify setup.py for distro compatibility
From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001
From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
Date: Fri, 7 May 2021 19:14:20 -0400
Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility
---
setup.py | 101 ++-----------------------------------------------------
1 file changed, 2 insertions(+), 99 deletions(-)
setup.py | 98 +-------------------------------------------------------
1 file changed, 1 insertion(+), 97 deletions(-)
diff --git a/setup.py b/setup.py
index cb63f60..87380ed 100644
index 663792c..3ebcabe 100644
--- a/setup.py
+++ b/setup.py
@@ -1,114 +1,19 @@
@@ -1,113 +1,19 @@
#!/usr/bin/env python
import os
@ -79,8 +79,7 @@ index cb63f60..87380ed 100644
- tarball_path=jq_lib_tarball_path,
- lib_dir=jq_lib_dir,
- commands=[
- ["autoreconf", "-i"],
- ["./configure", "CFLAGS=-fPIC", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
- ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
- ["make"],
- ])
-
@ -93,7 +92,7 @@ index cb63f60..87380ed 100644
-
- macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET")
- if macosx_deployment_target:
- os.environ['MACOSX_DEPLOYMENT_TARGET'] = macosx_deployment_target
- os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target)
-
- def run_command(args):
- print("Executing: %s" % ' '.join(args))
@ -127,21 +126,19 @@ index cb63f60..87380ed 100644
)
setup(
@@ -120,8 +25,7 @@ setup(
url='http://github.com/mwilliamson/jq.py',
@@ -120,7 +26,6 @@ setup(
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
license='BSD 2-Clause',
- ext_modules = [jq_extension],
ext_modules = [jq_extension],
- cmdclass={"build_ext": jq_build_ext},
+ ext_modules=[jq_extension],
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
@@ -137,4 +41,3 @@ setup(
'Programming Language :: Python :: 3.8',
@@ -137,4 +42,3 @@ setup(
'Programming Language :: Python :: 3.9',
],
)
-
--
2.28.0
2.29.3

View file

@ -5,7 +5,7 @@
, numpy
, scipy
, jinja2
, pytest
, pytestCheckHook
, networkx
, matplotlib
, python-igraph
@ -32,7 +32,7 @@ buildPythonPackage rec {
];
checkInputs = [
pytest
pytestCheckHook
networkx
matplotlib
python-igraph
@ -40,10 +40,6 @@ buildPythonPackage rec {
ipywidgets
];
checkPhase = ''
pytest test --ignore test/test_drawing.py
'';
meta = with lib; {
description = "Python implementation of Mapper algorithm for Topological Data Analysis";
homepage = "https://kepler-mapper.scikit-tda.org/";

View file

@ -1,22 +1,20 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy27
, pythonOlder
, msgpack
, nose
, numpy
, six
, ruamel_yaml
, msgpack
, coverage
, coveralls
, pydantic
, pymongo
, lsof
, ruamel_yaml
, tqdm
}:
buildPythonPackage rec {
pname = "monty";
version = "2021.3.3";
disabled = isPy27; # uses type annotations
disabled = pythonOlder "3.5"; # uses type annotations
# No tests in Pypi
src = fetchFromGitHub {
@ -26,21 +24,30 @@ buildPythonPackage rec {
sha256 = "1nbv0ys0fv70rgzskkk8gsfr9dsmm7ykim5wv36li840zsj83b1l";
};
checkInputs = [ lsof nose numpy msgpack coverage coveralls pymongo];
propagatedBuildInputs = [ six ruamel_yaml ];
propagatedBuildInputs = [
ruamel_yaml
tqdm
msgpack
];
# test suite tries to decode bytes, but msgpack now returns a str
# https://github.com/materialsvirtuallab/monty/pull/121
postPatch = ''
substituteInPlace tests/test_serialization.py \
--replace ".decode('utf-8')" ""
'';
checkInputs = [
nose
numpy
pydantic
pymongo
];
preCheck = ''
substituteInPlace tests/test_os.py \
--replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#'
'';
checkPhase = ''
runHook preCheck
nosetests -v
runHook postCheck
'';
meta = with lib; {
description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems";
longDescription = "

View file

@ -3,11 +3,12 @@
, pythonOlder
, fetchFromGitHub
, setuptools
, setuptools_scm
, setuptools-scm
, pyvcd
, jinja2
, importlib-resources
, importlib-metadata
, git
# for tests
, pytestCheckHook
@ -30,7 +31,7 @@ buildPythonPackage rec {
sha256 = "0cjs9wgmxa76xqmjhsw4fsb2mhgvd85jgs2mrjxqp6fwp8rlgnl1";
};
nativeBuildInputs = [ setuptools_scm ];
nativeBuildInputs = [ setuptools-scm git ];
propagatedBuildInputs = [
setuptools

View file

@ -1,45 +1,36 @@
{ lib, fetchPypi, buildPythonPackage, pip, pytest, click, six
, setuptools_scm, git, glibcLocales, mock }:
{ lib
, fetchPypi
, pythonOlder
, buildPythonPackage
, pip
, pytest
, pytest-xdist
, click
, setuptools-scm
, git
, glibcLocales
, mock
, pep517
}:
buildPythonPackage rec {
pname = "pip-tools";
version = "6.0.1";
version = "6.1.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "3b0c7b95e8d3dfb011bb42cb38f356fcf5d0630480462b59c4d0a112b8d90281";
sha256 = "sha256-QAv3finMpIwxq8IQBCkyu1LcwTjvTqTVLF20KaqK5u4=";
};
LC_ALL = "en_US.UTF-8";
checkInputs = [ pytest git glibcLocales mock ];
propagatedBuildInputs = [ pip click six setuptools_scm ];
disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) [
# Depend on network tests:
"test_allow_unsafe_option" #paramaterized, but all fail
"test_annotate_option" #paramaterized, but all fail
"test_editable_package_vcs"
"test_editable_top_level_deps_preserved" # can't figure out how to select only one parameter to ignore
"test_filter_pip_markers"
"test_filter_pip_markes"
"test_generate_hashes_all_platforms"
"test_generate_hashes_verbose"
"test_generate_hashes_with_editable"
"test_generate_hashes_with_url"
"test_generate_hashes_without_interfering_with_each_other"
"test_get_file_hash_without_interfering_with_each_other"
"test_get_hashes_local_repository_cache_miss"
"test_realistic_complex_sub_dependencies"
"test_stdin"
"test_upgrade_packages_option"
"test_url_package"
"test_editable_package"
"test_locally_available_editable_package_is_not_archived_in_cache_dir"
];
checkInputs = [ pytest git glibcLocales mock pytest-xdist ];
propagatedBuildInputs = [ pip click setuptools-scm pep517 ];
checkPhase = ''
export HOME=$(mktemp -d) VIRTUAL_ENV=1
py.test -k "${disabledTests}"
py.test -m "not network"
'';
meta = with lib; {

View file

@ -1,6 +1,12 @@
{ lib, buildPythonPackage, fetchPypi
, requests, websocket_client, python_magic
, pytest, mock }:
{ lib
, buildPythonPackage
, fetchPypi
, requests
, websocket_client
, python_magic
, cryptography
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pushbullet.py";
@ -11,13 +17,17 @@ buildPythonPackage rec {
sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64";
};
propagatedBuildInputs = [ requests websocket_client python_magic ];
propagatedBuildInputs = [ cryptography requests websocket_client python_magic ];
checkInputs = [ pytest mock ];
checkPhase = ''
PUSHBULLET_API_KEY="" py.test -k "not test_e2e and not test_auth"
preCheck = ''
export PUSHBULLET_API_KEY=""
'';
checkInputs = [ pytestCheckHook ];
disabledTests = [
"test_auth_fail"
"test_auth_success"
"test_decryption"
];
meta = with lib; {
description = "A simple python client for pushbullet.com";

View file

@ -28,6 +28,7 @@ buildPythonPackage rec {
preBuild = ''
export CC=${stdenv.cc.targetPrefix}cc
substituteInPlace pyvex_c/Makefile --replace 'AR=ar' 'AR=${stdenv.cc.targetPrefix}ar'
'';
# No tests are available on PyPI, GitHub release has tests

View file

@ -5,6 +5,7 @@
, nose
, lxml
, requests
, six
}:
buildPythonPackage rec {
@ -17,7 +18,11 @@ buildPythonPackage rec {
sha256 = "22524120d744b50d25ef6bfc7052637e4ead9e2afac92563231ec89848f5adf5";
};
propagatedBuildInputs = [ lxml requests ];
propagatedBuildInputs = [
lxml
requests
six
];
# future is not used, and pathlib is installed part of python38+
# w/o an external package

View file

@ -1,5 +1,6 @@
{ lib
, buildPythonPackage
, fetchpatch
, fetchPypi
, pytestCheckHook
, hypothesis
@ -17,6 +18,15 @@ buildPythonPackage rec {
sha256 = "7a578aa0740e9ee2b48356fe1f347139190c4c72e27f303b3617054efd15df32";
};
patches = [
# Fixes test failure on darwin. Filed upstream: https://github.com/naimetti/rfc3339-validator/pull/3.
# Not yet merged.
(fetchpatch {
url = "https://github.com/rmcgibbo/rfc3339-validator/commit/4b6bb62c30bd158d3b4663690dcba1084ac31770.patch";
sha256 = "0h9k82hhmp2xfzn49n3i47ws3rpm9lvfs2rjrds7hgx5blivpwl6";
})
];
propagatedBuildInputs = [ six ];
checkInputs = [ pytestCheckHook hypothesis strict-rfc3339 ];

View file

@ -6,7 +6,7 @@
, colorama
, dataclasses
, ipywidgets
, poetry
, poetry-core
, pygments
, typing-extensions
, pytestCheckHook
@ -14,27 +14,33 @@
buildPythonPackage rec {
pname = "rich";
version = "9.13.0";
version = "10.1.0";
format = "pyproject";
disabled = pythonOlder "3.6";
# tests not included in pypi tarball
src = fetchFromGitHub {
owner = "willmcgugan";
repo = pname;
rev = "v${version}";
sha256 = "0si3rzhg8wfxw4aakkp8sr6nbzfa54rl0w92macd1338q90ha4ly";
sha256 = "sha256-HH+k9uiK34yoqu83rknCIe2DpoqJRHkcqABuj8zjzqs=";
};
format = "pyproject";
nativeBuildInputs = [ poetry ];
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [
CommonMark
colorama
ipywidgets
pygments
typing-extensions
] ++ lib.optional (pythonOlder "3.7") dataclasses;
] ++ lib.optional (pythonOlder "3.7") [
dataclasses
];
checkInputs = [
pytestCheckHook
];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "rich" ];
meta = with lib; {

View file

@ -1,33 +1,43 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonAtLeast
, fetchFromGitHub
, colorcet
, cryptography
, flask
, flask-compress
, flask-cors
, flask-sockets
, gevent
, imageio
, numpy
, scipy
, pillow
, gevent
, wget
, pyopenssl
, scipy
, six
, colorcet
, unidecode
, urllib3
, wget
, deepdiff
, pytestCheckHook
, pytestcov
, websocket_client
}:
buildPythonPackage rec {
pname = "runway-python";
version = "0.6.1";
src = fetchPypi {
inherit pname version;
sha256 = "66cf1517dd817bf6db3792608920274f964dd0ced8dabecd925b8bc17aa95740";
src = fetchFromGitHub {
owner = "runwayml";
repo = "model-sdk";
rev = version;
sha256 = "1ww2wai1qnly8i7g42vhkkbs4yp7wi9x4fjdxsg9fl3izjra0zs2";
};
propagatedBuildInputs = [
colorcet
cryptography
flask
flask-compress
flask-cors
@ -36,6 +46,7 @@ buildPythonPackage rec {
imageio
numpy
pillow
pyopenssl
scipy
six
unidecode
@ -43,13 +54,30 @@ buildPythonPackage rec {
wget
];
# tests are not packaged in the released tarball
doCheck = false;
pythonImportsCheck = [
"runway"
];
checkInputs = [
deepdiff
pytestCheckHook
pytestcov
websocket_client
];
disabledTests = [
# these tests require network
"test_file_deserialization_remote"
"test_file_deserialization_absolute_directory"
"test_file_deserialization_remote_directory"
] ++ lib.optionals (pythonAtLeast "3.9") [
# AttributeError: module 'base64' has no attribute 'decodestring
# https://github.com/runwayml/model-sdk/issues/99
"test_image_serialize_and_deserialize"
"test_segmentation_serialize_and_deserialize_colormap"
"test_segmentation_serialize_and_deserialize_labelmap"
];
meta = {
description = "Helper library for creating Runway models";
homepage = "https://github.com/runwayml/model-sdk";

View file

@ -1,8 +1,17 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, pyusb
, cython
, git
, pkgconfig
, pytest-runner
, setuptools-scm
, future
, numpy
, pyusb
, mock
, pytestCheckHook
, zipp
}:
## Usage
@ -18,19 +27,35 @@ buildPythonPackage rec {
owner = "ap--";
repo = "python-seabreeze";
rev = "v${version}";
sha256 = "1lna3w1vsci35dhyi7qjvbb99gxvzk23k195c7by7kkrps844q1j";
sha256 = "1hm9aalpb9sdp8s7ckn75xvyiacp5678pv9maybm5nz0z2h29ibq";
leaveDotGit = true;
};
nativeBuildInputs = [
cython
git
pkgconfig
pytest-runner
setuptools-scm
];
propagatedBuildInputs = [
future
numpy
pyusb
];
postInstall = ''
mkdir -p $out/etc/udev/rules.d
cp misc/10-oceanoptics.rules $out/etc/udev/rules.d/10-oceanoptics.rules
cp os_support/10-oceanoptics.rules $out/etc/udev/rules.d/10-oceanoptics.rules
'';
# underlying c libraries are tested and fail
# (c libs are used with anaconda, which we don't care about as we use the alternative path, being that of pyusb).
doCheck = false;
propagatedBuildInputs = [ pyusb numpy ];
# few backends enabled, but still some tests
checkInputs = [
pytestCheckHook
mock
zipp
];
setupPyBuildFlags = [ "--without-cseabreeze" ];

View file

@ -1,10 +1,8 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, authlib
, requests
, pyopenssl
, cryptography
, idna
, mock
, isPy27
, nose
@ -24,21 +22,20 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
authlib
requests
pyopenssl
cryptography
idna
];
checkInputs = [
nose
pytz
responses
] ++ lib.optionals isPy27 [ mock ];
];
postPatch = ''
substituteInPlace setup.py \
--replace "mock==1.0.1" "mock"
checkPhase = ''
runHook preCheck
nosetests -v
runHook postCheck
'';
meta = with lib; {

View file

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, colorama
, sphinx
, livereload
}:
@ -14,10 +15,15 @@ buildPythonPackage rec {
sha256 = "de1ca3b66e271d2b5b5140c35034c89e47f263f2cd5db302c9217065f7443f05";
};
propagatedBuildInputs = [ sphinx livereload ];
propagatedBuildInputs = [
colorama
sphinx
livereload
];
# No tests included.
doCheck = false;
pythonImportsCheck = [ "sphinx_autobuild" ];
meta = with lib; {

View file

@ -19,6 +19,7 @@ buildPythonPackage rec {
description = "Python bindings for Linux SPI access through spidev";
license = licenses.mit;
maintainers = with maintainers; [ hexa ];
platforms = platforms.linux;
};
}

View file

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "surepy";
version = "0.5.0";
version = "0.6.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "benleb";
repo = pname;
rev = "v${version}";
sha256 = "1adsnjya142bxdhfxqsi2qa35ylvdcibigs1wafjlxazlxs3mg0j";
sha256 = "sha256-XoYiZPBc9SybyKocui1HqSA+YPiPpbupJWMCfmQT5RU=";
};
nativeBuildInputs = [ poetry-core ];
@ -43,11 +43,6 @@ buildPythonPackage rec {
rich
];
postPatch = ''
# halo is out-dated, https://github.com/benleb/surepy/pull/7
substituteInPlace pyproject.toml --replace "^0.0.30" "^0.0.31"
'';
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "surepy" ];

View file

@ -1,35 +1,37 @@
{ lib, stdenv, fetchFromGitHub, jshon, electron_3
{ lib, stdenvNoCC, fetchFromGitHub, jshon, electron_10
, runtimeShell, hyper-haskell-server, extra-packages ? [] }:
let
binPath = lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages);
electron = electron_3;
in stdenv.mkDerivation rec {
electron = electron_10;
in stdenvNoCC.mkDerivation rec {
pname = "hyper-haskell";
version = "0.1.0.2";
version = "0.2.3.0";
src = fetchFromGitHub {
owner = "HeinrichApfelmus";
repo = "hyper-haskell";
rev = "v${version}";
sha256 = "1k38h7qx12z7463z8466pji0nwfkp4qkg7q83kns2mzmwmw5jnmb";
sha256 = "1nmkry4wh6a2dy98fcs81mq2p7zhxp1k0f4m3szr6fm3j1zwrd43";
};
propagatedBuildInputs = extra-packages;
buildCommand = ''
dontBuild = true;
installPhase = ''
mkdir -p $out/bin $out/share/hyper-haskell/worksheets $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/mime/packages
# Electron app
cp -R $src/app $out
cp -R app $out
# Desktop Launcher
cp $src/resources/hyper-haskell.desktop $out/share/applications/hyper-haskell.desktop
cp $src/resources/icons/icon.svg $out/share/icons/hicolor/scalable/apps/hyper-haskell.svg
cp $src/resources/shared-mime-info.xml $out/share/mime/packages/hyper-haskell.xml
cp resources/hyper-haskell.desktop $out/share/applications/hyper-haskell.desktop
cp resources/icons/icon.svg $out/share/icons/hicolor/scalable/apps/hyper-haskell.svg
cp resources/shared-mime-info.xml $out/share/mime/packages/hyper-haskell.xml
# install example worksheets with backend set to nix
for worksheet in "$src/worksheets/"*.hhs; do
for worksheet in "worksheets/"*.hhs; do
${jshon}/bin/jshon -e settings -s nix -i packageTool -p < $worksheet > $out/share/hyper-haskell/worksheets/`basename $worksheet`
done

View file

@ -2,9 +2,8 @@
let
ihaskellEnv = ghcWithPackages (self: [
self.ihaskell
(haskell.lib.doJailbreak self.ihaskell-blaze)
(haskell.lib.doJailbreak self.ihaskell-diagrams)
(haskell.lib.doJailbreak self.ihaskell-display)
self.ihaskell-blaze
self.ihaskell-diagrams
] ++ packages self);
ihaskellSh = writeScriptBin "ihaskell-notebook" ''
#! ${stdenv.shell}

View file

@ -1,37 +1,38 @@
# This has been automatically generated by the script
# ./update.sh. This should not be changed by hand.
{ mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool
, base, bower-json, bytestring, Cabal, containers, cryptonite
, dhall, directory, either, extra, fetchgit, file-embed, filepath
, foldl, fsnotify, generic-lens, Glob, hpack, hspec, hspec-discover
, base, bower-json, bytestring, containers, cryptonite, dhall
, directory, either, extra, fetchgit, file-embed, filepath, foldl
, fsnotify, generic-lens, Glob, hspec, hspec-discover
, hspec-megaparsec, http-client, http-conduit, http-types
, lens-family-core, lib, megaparsec, mtl, network-uri, open-browser
, optparse-applicative, prettyprinter, process, QuickCheck, retry
, rio, rio-orphans, safe, semver-range, stm, stringsearch
, tar, template-haskell, temporary, text, time, transformers
, turtle, unliftio, unordered-containers, utf8-string, versions
, with-utf8, zlib
, rio, rio-orphans, safe, semver-range, stm, stringsearch, tar
, template-haskell, temporary, text, time, transformers, turtle
, unliftio, unordered-containers, utf8-string, versions, with-utf8
, zlib
}:
mkDerivation {
pname = "spago";
version = "0.20.1";
version = "0.20.2";
src = fetchgit {
url = "https://github.com/purescript/spago.git";
sha256 = "1j2yi6zz9m0k0298wllin39h244v8b2rx87yxxgdbjg77kn96vxg";
rev = "41ad739614f4f2c2356ac921308f9475a5a918f4";
sha256 = "11jh3bszvl8zfi4xcabpx43jply28dxdywd6fadxspaa05jdxxn2";
rev = "0f38c9153e46f30e9d87963e181f5c1a595f4b64";
fetchSubmodules = true;
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal async-pool base bower-json
bytestring Cabal containers cryptonite dhall directory either
file-embed filepath foldl fsnotify generic-lens Glob http-client
http-conduit http-types lens-family-core megaparsec mtl network-uri
open-browser optparse-applicative prettyprinter process retry rio
rio-orphans safe semver-range stm stringsearch tar template-haskell
temporary text time transformers turtle unliftio
unordered-containers utf8-string versions with-utf8 zlib
bytestring containers cryptonite dhall directory either file-embed
filepath foldl fsnotify generic-lens Glob http-client http-conduit
http-types lens-family-core megaparsec mtl network-uri open-browser
optparse-applicative prettyprinter process retry rio rio-orphans
safe semver-range stm stringsearch tar template-haskell temporary
text time transformers turtle unliftio unordered-containers
utf8-string versions with-utf8 zlib
];
libraryToolDepends = [ hpack ];
executableHaskellDepends = [
ansi-terminal base text turtle with-utf8
];
@ -40,7 +41,6 @@ mkDerivation {
process QuickCheck temporary text turtle versions
];
testToolDepends = [ hspec-discover ];
prePatch = "hpack";
homepage = "https://github.com/purescript/spago#readme";
license = lib.licenses.bsd3;
}

View file

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p cabal2nix curl jq
#!nix-shell -i bash -p cabal2nix curl jq haskellPackages.cabal2nix-unstable -I nixpkgs=.
#
# This script will update the spago derivation to the latest version using
# cabal2nix.
@ -25,7 +25,10 @@ new_version=$(curl --silent "https://api.github.com/repos/purescript/spago/relea
echo "Updating spago from old version $old_version to new version $new_version."
echo "Running cabal2nix and outputting to ${spago_derivation_file}..."
cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" > "$spago_derivation_file"
echo "# This has been automatically generated by the script" > "$spago_derivation_file"
echo "# ./update.sh. This should not be changed by hand." >> "$spago_derivation_file"
cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" >> "$spago_derivation_file"
# TODO: This should ideally also automatically update the docsSearchVersion
# from pkgs/development/haskell/configuration-nix.nix.

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "racer";
version = "2.1.40";
version = "2.1.44";
src = fetchFromGitHub {
owner = "racer-rust";
repo = "racer";
rev = "v${version}";
sha256 = "sha256-8Is+RBfcXKbGSFzYoolLHs30rxlNI//xVGEOhxP2TV8=";
sha256 = "sha256-EmxJg2QDpGZ5TbMy9y6P11LdMucBdvewkRewuUzccGM=";
};
cargoSha256 = "sha256-iUomr9viCdZk4nV75/OP8vHtJpMbmy+pq1IbaA2lLmE=";
cargoSha256 = "sha256-kKQnpEashpIwrXubuZIpU+tzxFaUjr6jaVunYPqaHnM=";
nativeBuildInputs = [ makeWrapper ];
buildInputs = lib.optional stdenv.isDarwin Security;

View file

@ -1,16 +1,16 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "treefmt";
version = "0.1.1";
version = "0.2.0";
src = fetchFromGitHub {
owner = "numtide";
repo = "treefmt";
rev = "v${version}";
sha256 = "0a4yikkqppawii1q0kzsxwfp1aid688wa0lixjwfsl279lr69css";
sha256 = "10mv18hsyz5kd001i6cgk0xag4yk7rhxvs09acp2s68qni1v8vx2";
};
cargoSha256 = "08k60gd23yanfraxpbw9hi7jbqgsxz9mv1ci6q9piis5742zlj9s";
cargoSha256 = "02455sk8n900j8qr79mrchk7m0gb4chhw0saa280p86vn56flvs0";
meta = {
description = "one CLI to format the code tree";

View file

@ -102,6 +102,6 @@ mkDerivation rec {
hedgehog or hedgehogs after a player's or CPU turn is shown only when
all movement on the battlefield has ceased).'';
maintainers = with maintainers; [ kragniz fpletz ];
inherit (ghc.meta) platforms;
inherit (fpc.meta) platforms;
};
}

View file

@ -859,7 +859,7 @@ let
# Bump the maximum number of CPUs to support systems like EC2 x1.*
# instances and Xeon Phi.
NR_CPUS = freeform "384";
} // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {
} // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
# Enables support for the Allwinner Display Engine 2.0
SUN8I_DE2_CCU = whenAtLeast "4.13" yes;
@ -871,6 +871,14 @@ let
# The kernel command line will override a platform-specific configuration from its device tree.
# https://github.com/torvalds/linux/blob/856deb866d16e29bd65952e0289066f6078af773/kernel/dma/contiguous.c#L35-L44
CMA_SIZE_MBYTES = freeform "32";
# Many ARM SBCs hand off a pre-configured framebuffer.
# This always can can be replaced by the actual native driver.
# Keeping it a built-in ensures it will be used if possible.
FB_SIMPLE = yes;
} // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux") {
ARM_LPAE = yes;
};
};
in

View file

@ -176,6 +176,7 @@ in with py.pkgs; buildPythonApplication rec {
# test infrastructure
asynctest
pytest-aiohttp
pytest-mock
pytest-rerunfailures
pytest-xdist
pytestCheckHook
@ -239,6 +240,7 @@ in with py.pkgs; buildPythonApplication rec {
"folder"
"folder_watcher"
"freebox"
"fritz"
"fritzbox"
"fritzbox_callmonitor"
"frontend"
@ -359,6 +361,7 @@ in with py.pkgs; buildPythonApplication rec {
"stream"
"subaru"
"sun"
"surepetcare"
"switch"
"system_health"
"system_log"

View file

@ -22,8 +22,7 @@ with pkgs;
cc-wrapper-libcxx-9 = callPackage ./cc-wrapper { stdenv = llvmPackages_9.libcxxStdenv; };
stdenv-inputs = callPackage ./stdenv-inputs { };
haskell-shellFor = callPackage ./haskell-shellFor { };
haskell-documentationTarball = callPackage ./haskell-documentationTarball { };
haskell = callPackage ./haskell { };
cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };

View file

@ -0,0 +1,7 @@
{ lib, callPackage }:
lib.recurseIntoAttrs {
shellFor = callPackage ./shellFor { };
documentationTarball = callPackage ./documentationTarball { };
setBuildTarget = callPackage ./setBuildTarget { };
}

View file

@ -0,0 +1,4 @@
module Main where
main :: IO ()
main = putStrLn "Hello, Bar!"

View file

@ -0,0 +1,4 @@
module Main where
main :: IO ()
main = putStrLn "Hello, Foo!"

View file

@ -0,0 +1,2 @@
import Distribution.Simple
main = defaultMain

View file

@ -0,0 +1,38 @@
{ pkgs, haskellPackages }:
let
# This can be regenerated by running `cabal2nix .` in the current directory.
pkgDef =
{ mkDerivation, base, lib }:
mkDerivation {
pname = "haskell-setBuildTarget";
version = "0.1.0.0";
src = ./.;
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base ];
license = lib.licenses.bsd3;
};
drv = haskellPackages.callPackage pkgDef {};
test = target: excluded:
let only = pkgs.haskell.lib.setBuildTarget drv target;
in ''
if [[ ! -f "${only}/bin/${target}" ]]; then
echo "${target} was not built"
exit 1
fi
if [[ -f "${only}/bin/${excluded}" ]]; then
echo "${excluded} was built, when it should not have been"
exit 1
fi
'';
in pkgs.runCommand "test haskell.lib.setBuildTarget" {} ''
${test "foo" "bar"}
${test "bar" "foo"}
touch "$out"
''

View file

@ -0,0 +1,16 @@
cabal-version: >=1.10
name: haskell-setBuildTarget
version: 0.1.0.0
author: Isaac Shapira
maintainer: fresheyeball@protonmail.com
build-type: Simple
executable foo
main-is: Foo.hs
build-depends: base
default-language: Haskell2010
executable bar
main-is: Bar.hs
build-depends: base
default-language: Haskell2010

View file

@ -1,22 +1,22 @@
{ lib, haskellPackages, cabal-install }:
{ lib, writeText, haskellPackages, cabal-install }:
(haskellPackages.shellFor {
packages = p: [ p.database-id-class p.constraints ];
packages = p: [ p.constraints p.linear ];
nativeBuildInputs = [ cabal-install ];
phases = [ "unpackPhase" "buildPhase" "installPhase" ];
unpackPhase = ''
sourceRoot=$(pwd)/scratch
mkdir -p "$sourceRoot"
cd "$sourceRoot"
tar -xf ${haskellPackages.database-id-class.src}
tar -xf ${haskellPackages.constraints.src}
cp ${builtins.toFile "cabal.project" "packages: database-id-class* constraints*"} cabal.project
tar -xf ${haskellPackages.linear.src}
cp ${writeText "cabal.project" "packages: constraints* linear*"} cabal.project
'';
buildPhase = ''
export HOME=$(mktemp -d)
mkdir -p $HOME/.cabal
touch $HOME/.cabal/config
cabal v2-build --offline --verbose database-id-class constraints --ghc-options="-O0 -j$NIX_BUILD_CORES"
cabal v2-build --offline --verbose constraints linear --ghc-options="-O0 -j$NIX_BUILD_CORES"
'';
installPhase = ''
touch $out

View file

@ -1,19 +1,19 @@
{ lib, stdenv, fetchurl, pkg-config, python3, bluez
, alsaSupport ? stdenv.isLinux, alsaLib ? null
, systemdSupport ? stdenv.isLinux, systemd ? null }:
assert alsaSupport -> alsaLib != null;
assert systemdSupport -> systemd != null;
, tcl, acl, kmod, coreutils, shadow, util-linux, udev
, alsaSupport ? stdenv.isLinux, alsaLib
, systemdSupport ? stdenv.isLinux, systemd
}:
stdenv.mkDerivation rec {
name = "brltty-6.1";
pname = "brltty";
version = "6.3";
src = fetchurl {
url = "http://brltty.com/archive/${name}.tar.gz";
sha256 = "0nk54chr7z2w579vyiak9xk2avhnvrx7x2l5sk8nyw2zplchkx9q";
url = "https://brltty.app/archive/${pname}-${version}.tar.gz";
sha256 = "14psxwlvgyi2fj1zh8rfykyjcjaya8xa7yg574bxd8y8n49n8hvb";
};
nativeBuildInputs = [ pkg-config python3.pkgs.cython ];
nativeBuildInputs = [ pkg-config python3.pkgs.cython tcl ];
buildInputs = [ bluez ]
++ lib.optional alsaSupport alsaLib
++ lib.optional systemdSupport systemd;
@ -26,17 +26,70 @@ stdenv.mkDerivation rec {
It drives the braille display, and provides complete screen review functionality.
Some speech capability has also been incorporated.
'';
homepage = "http://www.brltty.com/";
license = lib.licenses.gpl2;
homepage = "https://brltty.app";
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.bramd ];
platforms = lib.platforms.all;
};
makeFlags = [ "PYTHON_PREFIX=$(out)" ];
preConfigurePhases = [ "preConfigure" ];
makeFlags = [
"PYTHON_PREFIX=$(out)"
"SYSTEMD_UNITS_DIRECTORY=$(out)/lib/systemd/system"
"SYSTEMD_USERS_DIRECTORY=$(out)/lib/sysusers.d"
"SYSTEMD_FILES_DIRECTORY=$(out)/lib/tmpfiles.d"
"UDEV_LIBRARY_DIRECTORY=$(out)/lib/udev"
"UDEV_RULES_TYPE=all"
"POLKIT_POLICY_DIR=$(out)/share/polkit-1/actions"
"POLKIT_RULE_DIR=$(out)/share/polkit-1/rules.d"
];
configureFlags = [
"--with-writable-directory=/run/brltty"
"--with-updatable-directory=/var/lib/brltty"
"--with-api-socket-path=/var/lib/BrlAPI"
];
installFlags = [ "install-systemd" "install-udev" "install-polkit" ];
preConfigure = ''
substituteInPlace configure --replace /sbin/ldconfig ldconfig
# Some script needs a working tclsh shebang
patchShebangs .
# Skip impure operations
substituteInPlace Programs/Makefile.in \
--replace install-writable-directory "" \
--replace install-apisoc-directory "" \
--replace install-api-key ""
'';
postInstall = ''
# Rewrite absolute paths
substituteInPlace $out/bin/brltty-mkuser \
--replace '/sbin/nologin' '${shadow}/bin/nologin'
(
cd $out/lib
substituteInPlace systemd/system/brltty@.service \
--replace '/usr/lib' "$out/lib" \
--replace '/sbin/modprobe' '${kmod}/bin/modprobe'
# Ensure the systemd-wrapper script uses the correct path to the brltty binary
sed "/^Environment=\"BRLTTY_EXECUTABLE_ARGUMENTS.*/a Environment=\"BRLTTY_EXECUTABLE_PATH=$out/bin/brltty\"" -i systemd/system/brltty@.service
substituteInPlace systemd/system/brltty-device@.service \
--replace '/usr/bin/true' '${coreutils}/bin/true'
substituteInPlace udev/rules.d/90-brltty-uinput.rules \
--replace '/usr/bin/setfacl' '${acl}/bin/setfacl'
substituteInPlace tmpfiles.d/brltty.conf \
--replace "$out/etc" '/etc'
# Remove unused commands from udev rules
sed '/initctl/d' -i udev/rules.d/90-brltty-device.rules
# Remove pulse-access group from systemd unit and sysusers
substituteInPlace systemd/system/brltty@.service \
--replace 'SupplementaryGroups=pulse-access' '# SupplementaryGroups=pulse-access'
substituteInPlace sysusers.d/brltty.conf \
--replace 'm brltty pulse-access' '# m brltty pulse-access'
)
substituteInPlace $out/libexec/brltty/systemd-wrapper \
--replace 'logger' "${util-linux}/bin/logger" \
--replace 'udevadm' "${udev}/bin/udevadm"
'';
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cloc";
version = "1.88";
version = "1.90";
src = fetchFromGitHub {
owner = "AlDanial";
repo = "cloc";
rev = version;
sha256 = "1ixgswzbzv63bl50gb2kgaqr0jcicjz6w610hi9fal1i7744zraw";
rev = "v${version}";
sha256 = "0ic9q6qqw5f1wafp9lpmhr0miasbdb9zr59c0jlymnzffdmnliyc";
};
setSourceRoot = ''

View file

@ -1,21 +1,14 @@
{ lib, stdenv, fetchurl, autoreconfHook, tzdata, fetchpatch }:
stdenv.mkDerivation rec {
version = "0.4.7";
version = "0.4.8";
pname = "dateutils";
src = fetchurl {
url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz";
sha256 = "16jr9yjk8wgzfh22hr3z6mp4jm3fkacyibds4jj5xx5yymbm8wj9";
sha256 = "0061f36axskm7yq9cp64x5a5phil8d3zgcd668nfmqzk9ji58w1z";
};
patches = [
(fetchpatch {
url = "https://bitbucket.org/hroptatyr/dateutils/commits/6813ed94534f2311fbe9164748919e39d60b0190/raw";
sha256 = "1zs3iizb172ha56g03rr8kzd8zx6qypiqsc11jw758mliwxk5rgc";
})
];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ tzdata ]; # needed for datezone
enableParallelBuilding = true;

View file

@ -1,49 +1,30 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv, fetchFromGitHub, pkg-config, gengetopt, m4, gnupg
, git, perl, autoconf, automake, help2man, boehmgc }:
stdenv.mkDerivation rec {
pname = "mmv";
version = "1.01b";
version = "2.0";
src = fetchurl {
url = "mirror://debian/pool/main/m/mmv/mmv_${version}.orig.tar.gz";
sha256 = "0399c027ea1e51fd607266c1e33573866d4db89f64a74be8b4a1d2d1ff1fdeef";
src = fetchFromGitHub {
owner = "rrthomas";
repo = "mmv";
rev = "v${version}";
sha256 = "sha256-MmxDk3PBtvK/thrh6x67M+nMdCDlOQQHkREqLmzF2Mk=";
fetchSubmodules = true;
};
hardeningDisable = [ "format" ];
patches = [
# Use Debian patched version, as upstream is no longer maintained and it
# contains a _lot_ of fixes.
(fetchurl {
url = "mirror://debian/pool/main/m/mmv/mmv_${version}-15.diff.gz";
sha256 = "9ad3e3d47510f816b4a18bae04ea75913588eec92248182f85dd09bc5ad2df13";
})
];
postPatch = ''
sed -i \
-e 's/^\s*LDFLAGS\s*=\s*-s\s*-N/LDFLAGS = -s/' \
-e "s|/usr/bin|$out/bin|" \
-e "s|/usr/man|$out/share/man|" \
Makefile
preConfigure = ''
./bootstrap
'';
preInstall = ''
mkdir -p "$out/bin" "$out/share/man/man1"
'';
postInstall = ''
for variant in mcp mad mln
do
ln -s mmv "$out/bin/$variant"
ln -s mmv.1 "$out/share/man/man1/$variant.1"
done
'';
nativeBuildInputs = [ gengetopt m4 git gnupg perl autoconf automake help2man pkg-config ];
buildInputs = [ boehmgc ];
meta = {
homepage = "http://linux.maruhn.com/sec/mmv.html";
homepage = "https://github.com/rrthomas/mmv";
description = "Utility for wildcard renaming, copying, etc";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ siraben ];
};
}

View file

@ -8,13 +8,13 @@ let
in stdenv.mkDerivation rec {
pname = "svtplay-dl";
version = "3.6";
version = "3.7";
src = fetchFromGitHub {
owner = "spaam";
repo = "svtplay-dl";
rev = version;
sha256 = "1hnbpj4k08356k2rmsairbfnxwfxs5lv59nxcj6hy5wf162h2hzb";
sha256 = "0krskxbmlglkipqzjwgm2nmq118m8l0djgh0f8l6n2w3bjblhyfx";
};
pythonPaths = [ cryptography pyyaml requests ];

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "zellij";
version = "0.6.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "zellij-org";
repo = pname;
rev = "v${version}";
sha256 = "sha256-spESDjX7scihVQrr/f6KMCI9VfdTxxPWP7FcJ965FYk=";
sha256 = "sha256-armEkYiRQ2RvKFUtNlnMejkNSLJOEQpFzUPduNJatMo=";
};
cargoSha256 = "0rm31sfcj2d85w1l4hhfmva3j828dfhiv5br1mnpaqaa01zzs1q1";
cargoSha256 = "sha256-68UfDlQ1KuGZwcuSNeOCwULxS+Ei16lEydrO4CssD3Y=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -975,6 +975,12 @@ mapAliases ({
posix_man_pages = man-pages-posix; # Added 2021-04-15
/* Cleanup before 21.11, Added 2021-05-07 */
avian = throw ''
The package doesn't compile anymore on NixOS and both development
& maintenance is abandoned by upstream.
'';
/* If these are in the scope of all-packages.nix, they cause collisions
between mixed versions of qt. See:
https://github.com/NixOS/nixpkgs/pull/101369 */

Some files were not shown because too many files have changed in this diff Show more