diff --git a/doc/languages-frameworks/node.section.md b/doc/languages-frameworks/node.section.md
index c1f4294711a..2120adfc0b4 100644
--- a/doc/languages-frameworks/node.section.md
+++ b/doc/languages-frameworks/node.section.md
@@ -25,12 +25,13 @@ build system it uses. Here are some examples:
After you have identified the correct system, you need to override your package
expression while adding in build system as a build input. For example, `dat`
-requires `node-gyp-build`, so we override its expression in `default.nix`:
+requires `node-gyp-build`, so [we override](https://github.com/NixOS/nixpkgs/blob/32f5e5da4a1b3f0595527f5195ac3a91451e9b56/pkgs/development/node-packages/default.nix#L37-L40) its expression in [`default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages/default.nix):
```nix
-dat = nodePackages.dat.override (oldAttrs: {
- buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ];
-});
+ dat = super.dat.override {
+ buildInputs = [ self.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ];
+ meta.broken = since "12";
+ };
```
To add a package from NPM to nixpkgs:
diff --git a/doc/stdenv/multiple-output.xml b/doc/stdenv/multiple-output.xml
index 51e1cc2e024..0f177ec719f 100644
--- a/doc/stdenv/multiple-output.xml
+++ b/doc/stdenv/multiple-output.xml
@@ -22,39 +22,69 @@
The reduction effects could be instead achieved by building the parts in completely separate derivations. That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once. This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb.
+
+
+ A number of attributes can be used to work with a derivation with multiple outputs. The attribute outputs is a list of strings, which are the names of the outputs. For each of these names, an identically named attribute is created, corresponding to that output. The attribute meta.outputsToInstall is used to determine the default set of outputs to install when using the derivation name unqualified.
+
+
Installing a split package
- When installing a package via systemPackages or nix-env you have several options:
+ When installing a package with multiple outputs, the package's meta.outputsToInstall attribute determines which outputs are actually installed. meta.outputsToInstall is a list whose default installs binaries and the associated man pages. The following sections describe ways to install different outputs.
-
-
-
- You can install particular outputs explicitly, as each is available in the Nix language as an attribute of the package. The outputs attribute contains a list of output names.
-
-
-
-
- You can let it use the default outputs. These are handled by meta.outputsToInstall attribute that contains a list of output names.
-
-
- TODO: more about tweaking the attribute, etc.
-
-
-
-
- NixOS provides configuration option environment.extraOutputsToInstall that allows adding extra outputs of environment.systemPackages atop the default ones. It's mainly meant for documentation and debug symbols, and it's also modified by specific options.
-
-
+
+ Selecting outputs to install via NixOS
+
+
+ NixOS provides two ways to select the outputs to install for packages listed in environment.systemPackages:
+
+
+
+
- At this moment there is no similar configurability for packages installed by nix-env. You can still use approach from to override meta.outputsToInstall attributes, but that's a rather inconvenient way.
+ The configuration option environment.extraOutputsToInstall is appended to each package's meta.outputsToInstall attribute to determine the outputs to install. It can for example be used to install info documentation or debug symbols for all packages.
-
-
-
+
+
+
+ The outputs can be listed as packages in environment.systemPackages. For example, the "out" and "info" outputs for the coreutils package can be installed by including coreutils and coreutils.info in environment.systemPackages.
+
+
+
+
+
+
+ Selecting outputs to install via <command>nix-env</command>
+
+
+ nix-env lacks an easy way to select the outputs to install. When installing a package, nix-env always installs the outputs listed in meta.outputsToInstall, even when the user explicitly selects an output.
+
+
+
+
+ nix-env silenty disregards the outputs selected by the user, and instead installs the outputs from meta.outputsToInstall. For example,
+
+$ nix-env -iA nixpkgs.coreutils.info
+
+ installs the "out" output (coreutils.meta.outputsToInstall is [ "out" ]) instead of the requested "info".
+
+
+
+
+ The only recourse to select an output with nix-env is to override the package's meta.outputsToInstall, using the functions described in . For example, the following overlay adds the "info" output for the coreutils package:
+
+
+self: super:
+{
+ coreutils = super.coreutils.overrideAttrs (oldAttrs: {
+ meta = oldAttrs.meta // { outputsToInstall = oldAttrs.meta.outputsToInstall or [ "out" ] ++ [ "info" ]; };
+ });
+}
+
+
Using a split package
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a35b7956d3c..c17c91551aa 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1873,6 +1873,12 @@
githubId = 1918;
name = "David Anderson";
};
+ dandellion = {
+ email = "daniel@dodsorf.as";
+ github = "dali99";
+ githubId = 990767;
+ name = "Daniel Olsen";
+ };
danharaj = {
email = "dan@obsidian.systems";
github = "danharaj";
@@ -3633,6 +3639,12 @@
githubId = 26877687;
name = "Yurii Izorkin";
};
+ j0hax = {
+ name = "Johannes Arnold";
+ email = "johannes.arnold@stud.uni-hannover.de";
+ github = "j0hax";
+ githubId = 3802620;
+ };
jacg = {
name = "Jacek Generowicz";
email = "jacg@my-post-office.net";
diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
index 84849282e9a..b205e230968 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -45,6 +45,10 @@
path
+
+ flake-uri
+
+
@@ -199,6 +203,18 @@
+
+
+ flake-uri#name
+
+
+
+ Build the NixOS system from the specified flake.
+ The flake must contain an output named
+ nixosConfigurations.name.
+
+
+
diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index f70f08a0f8a..7dab5c69dfb 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -521,7 +521,7 @@
- flake-uri[name]
+ flake-uri#name
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 0a76bffd5c9..7d11d422e30 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -1059,6 +1059,12 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
removed, as it depends on libraries from deepin.
+
+
+ The opendkim module now uses systemd sandboxing features
+ to limit the exposure of the system towards the opendkim service.
+
+
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix
index c6939c7d698..76a2022082c 100644
--- a/nixos/lib/testing-python.nix
+++ b/nixos/lib/testing-python.nix
@@ -63,18 +63,12 @@ rec {
mkdir -p $out
LOGFILE=/dev/null tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver
-
- for i in */xchg/coverage-data; do
- mkdir -p $out/coverage-data
- mv $i $out/coverage-data/$(dirname $(dirname $i))
- done
'';
};
makeTest =
{ testScript
- , makeCoverageReport ? false
, enableOCR ? false
, name ? "unnamed"
# Skip linting (mainly intended for faster dev cycles)
@@ -153,7 +147,6 @@ rec {
};
test = passMeta (runTests driver);
- report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; });
nodeNames = builtins.attrNames nodes;
invalidNodeNames = lib.filter
@@ -169,7 +162,7 @@ rec {
Please stick to alphanumeric chars and underscores as separation.
''
else
- (if makeCoverageReport then report else test) // {
+ test // {
inherit nodes driver test;
};
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 1de1916a07d..5b681ca5946 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -198,10 +198,8 @@ let
ln -s ${renderConf} $dst/10-nixos-rendering.conf
# 50-user.conf
- # Since latest fontconfig looks for default files inside the package,
- # we had to move this one elsewhere to be able to exclude it here.
- ${optionalString cfg.includeUserConf ''
- ln -s ${pkg.out}/etc/fonts/conf.d.bak/50-user.conf $dst/50-user.conf
+ ${optionalString (!cfg.includeUserConf) ''
+ rm $dst/50-user.conf
''}
# local.conf (indirect priority 51)
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index e0252befdfd..a180d1bc4c1 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -10,6 +10,7 @@ umask 0022
# Parse the command line for the -I flag
extraBuildFlags=()
+flakeFlags=()
mountPoint=/mnt
channelPath=
@@ -34,6 +35,23 @@ while [ "$#" -gt 0 ]; do
--system|--closure)
system="$1"; shift 1
;;
+ --flake)
+ flake="$1"
+ flakeFlags=(--experimental-features 'nix-command flakes')
+ shift 1
+ ;;
+ --recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file)
+ lockFlags+=("$i")
+ ;;
+ --update-input)
+ j="$1"; shift 1
+ lockFlags+=("$i" "$j")
+ ;;
+ --override-input)
+ j="$1"; shift 1
+ k="$1"; shift 1
+ lockFlags+=("$i" "$j" "$k")
+ ;;
--channel)
channelPath="$1"; shift 1
;;
@@ -92,14 +110,32 @@ if [[ ${NIXOS_CONFIG:0:1} != / ]]; then
exit 1
fi
-if [[ ! -e $NIXOS_CONFIG && -z $system ]]; then
+if [[ -n $flake ]]; then
+ if [[ $flake =~ ^(.*)\#([^\#\"]*)$ ]]; then
+ flake="${BASH_REMATCH[1]}"
+ flakeAttr="${BASH_REMATCH[2]}"
+ fi
+ if [[ -z "$flakeAttr" ]]; then
+ echo "Please specify the name of the NixOS configuration to be installed, as a URI fragment in the flake-uri."
+ echo "For example, to use the output nixosConfigurations.foo from the flake.nix, append \"#foo\" to the flake-uri."
+ exit 1
+ fi
+ flakeAttr="nixosConfigurations.\"$flakeAttr\""
+fi
+
+# Resolve the flake.
+if [[ -n $flake ]]; then
+ flake=$(nix "${flakeFlags[@]}" flake info --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url)
+fi
+
+if [[ ! -e $NIXOS_CONFIG && -z $system && -z $flake ]]; then
echo "configuration file $NIXOS_CONFIG doesn't exist"
exit 1
fi
# A place to drop temporary stuff.
-tmpdir="$(mktemp -d -p $mountPoint)"
-trap "rm -rf $tmpdir" EXIT
+tmpdir="$(mktemp -d -p "$mountPoint")"
+trap 'rm -rf $tmpdir' EXIT
# store temporary files on target filesystem by default
export TMPDIR=${TMPDIR:-$tmpdir}
@@ -108,12 +144,19 @@ sub="auto?trusted=1"
# Build the system configuration in the target filesystem.
if [[ -z $system ]]; then
- echo "building the configuration in $NIXOS_CONFIG..."
outLink="$tmpdir/system"
- nix-build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \
- --extra-substituters "$sub" \
- '' -A system -I "nixos-config=$NIXOS_CONFIG" ${verbosity[@]}
- system=$(readlink -f $outLink)
+ if [[ -z $flake ]]; then
+ echo "building the configuration in $NIXOS_CONFIG..."
+ nix-build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \
+ --extra-substituters "$sub" \
+ '' -A system -I "nixos-config=$NIXOS_CONFIG" "${verbosity[@]}"
+ else
+ echo "building the flake in $flake..."
+ nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.toplevel" \
+ --extra-substituters "$sub" "${verbosity[@]}" \
+ "${extraBuildFlags[@]}" "${lockFlags[@]}" --out-link "$outLink"
+ fi
+ system=$(readlink -f "$outLink")
fi
# Set the system profile to point to the configuration. TODO: combine
@@ -121,7 +164,7 @@ fi
# a progress bar.
nix-env --store "$mountPoint" "${extraBuildFlags[@]}" \
--extra-substituters "$sub" \
- -p $mountPoint/nix/var/nix/profiles/system --set "$system" ${verbosity[@]}
+ -p "$mountPoint"/nix/var/nix/profiles/system --set "$system" "${verbosity[@]}"
# Copy the NixOS/Nixpkgs sources to the target as the initial contents
# of the NixOS channel.
@@ -131,12 +174,12 @@ if [[ -z $noChannelCopy ]]; then
fi
if [[ -n $channelPath ]]; then
echo "copying channel..."
- mkdir -p $mountPoint/nix/var/nix/profiles/per-user/root
+ mkdir -p "$mountPoint"/nix/var/nix/profiles/per-user/root
nix-env --store "$mountPoint" "${extraBuildFlags[@]}" --extra-substituters "$sub" \
- -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet \
- ${verbosity[@]}
- install -m 0700 -d $mountPoint/root/.nix-defexpr
- ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
+ -p "$mountPoint"/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet \
+ "${verbosity[@]}"
+ install -m 0700 -d "$mountPoint"/root/.nix-defexpr
+ ln -sfn /nix/var/nix/profiles/per-user/root/channels "$mountPoint"/root/.nix-defexpr/channels
fi
fi
@@ -150,7 +193,7 @@ touch "$mountPoint/etc/NIXOS"
if [[ -z $noBootLoader ]]; then
echo "installing the boot loader..."
# Grub needs an mtab.
- ln -sfn /proc/mounts $mountPoint/etc/mtab
+ ln -sfn /proc/mounts "$mountPoint"/etc/mtab
NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -- /run/current-system/bin/switch-to-configuration boot
fi
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index ed9c2509b6b..ad40fd2811d 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -17,6 +17,7 @@ showSyntax() {
origArgs=("$@")
extraBuildFlags=()
lockFlags=()
+flakeFlags=()
action=
buildNix=1
fast=
@@ -99,6 +100,7 @@ while [ "$#" -gt 0 ]; do
;;
--flake)
flake="$1"
+ flakeFlags=(--experimental-features 'nix-command flakes')
shift 1
;;
--recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file)
@@ -281,7 +283,7 @@ fi
# Resolve the flake.
if [[ -n $flake ]]; then
- flake=$(nix flake info --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url)
+ flake=$(nix "${flakeFlags[@]}" flake info --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url)
fi
# Find configuration.nix and open editor instead of building.
@@ -293,7 +295,7 @@ if [ "$action" = edit ]; then
fi
exec ${EDITOR:-nano} "$NIXOS_CONFIG"
else
- exec nix edit "${lockFlags[@]}" -- "$flake#$flakeAttr"
+ exec nix "${flakeFlags[@]}" edit "${lockFlags[@]}" -- "$flake#$flakeAttr"
fi
exit 1
fi
@@ -419,7 +421,7 @@ if [ -z "$rollback" ]; then
pathToConfig="$(nixBuild '' --no-out-link -A system "${extraBuildFlags[@]}")"
else
outLink=$tmpDir/result
- nix build "$flake#$flakeAttr.config.system.build.toplevel" \
+ nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.toplevel" \
"${extraBuildFlags[@]}" "${lockFlags[@]}" --out-link $outLink
pathToConfig="$(readlink -f $outLink)"
fi
@@ -429,7 +431,7 @@ if [ -z "$rollback" ]; then
if [[ -z $flake ]]; then
pathToConfig="$(nixBuild '' -A system -k "${extraBuildFlags[@]}")"
else
- nix build "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}"
+ nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}"
pathToConfig="$(readlink -f ./result)"
fi
elif [ "$action" = build-vm ]; then
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 1582f049309..26fc8fb402e 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -22,7 +22,7 @@ let
src = ./nixos-install.sh;
inherit (pkgs) runtimeShell;
nix = config.nix.package.out;
- path = makeBinPath [ nixos-enter ];
+ path = makeBinPath [ pkgs.nixUnstable nixos-enter ];
};
nixos-rebuild =
diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix
index 413660321ec..34c8ff137d6 100644
--- a/nixos/modules/services/games/terraria.nix
+++ b/nixos/modules/services/games/terraria.nix
@@ -25,7 +25,7 @@ let
exit 0
fi
- ${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock send-keys Enter exit Enter
+ ${getBin pkgs.tmux}/bin/tmux -S ${cfg.dataDir}/terraria.sock send-keys Enter exit Enter
${getBin pkgs.coreutils}/bin/tail --pid="$1" -f /dev/null
'';
in
@@ -36,7 +36,7 @@ in
type = types.bool;
default = false;
description = ''
- If enabled, starts a Terraria server. The server can be connected to via tmux -S /var/lib/terraria/terraria.sock attach
+ If enabled, starts a Terraria server. The server can be connected to via tmux -S ${cfg.dataDir}/terraria.sock attach
for administration by users who are a part of the terraria group (use C-b d shortcut to detach again).
'';
};
@@ -111,13 +111,19 @@ in
default = false;
description = "Disables automatic Universal Plug and Play.";
};
+ dataDir = mkOption {
+ type = types.str;
+ default = "/var/lib/terraria";
+ example = "/srv/terraria";
+ description = "Path to variable state data directory for terraria.";
+ };
};
};
config = mkIf cfg.enable {
users.users.terraria = {
description = "Terraria server service user";
- home = "/var/lib/terraria";
+ home = cfg.dataDir;
createHome = true;
uid = config.ids.uids.terraria;
};
@@ -136,13 +142,13 @@ in
User = "terraria";
Type = "forking";
GuessMainPID = true;
- ExecStart = "${getBin pkgs.tmux}/bin/tmux -S /var/lib/terraria/terraria.sock new -d ${pkgs.terraria-server}/bin/TerrariaServer ${concatStringsSep " " flags}";
+ ExecStart = "${getBin pkgs.tmux}/bin/tmux -S ${cfg.dataDir}/terraria.sock new -d ${pkgs.terraria-server}/bin/TerrariaServer ${concatStringsSep " " flags}";
ExecStop = "${stopScript} $MAINPID";
};
postStart = ''
- ${pkgs.coreutils}/bin/chmod 660 /var/lib/terraria/terraria.sock
- ${pkgs.coreutils}/bin/chgrp terraria /var/lib/terraria/terraria.sock
+ ${pkgs.coreutils}/bin/chmod 660 ${cfg.dataDir}/terraria.sock
+ ${pkgs.coreutils}/bin/chgrp terraria ${cfg.dataDir}/terraria.sock
'';
};
};
diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix
index eb6a426684d..9bf6f338d93 100644
--- a/nixos/modules/services/mail/opendkim.nix
+++ b/nixos/modules/services/mail/opendkim.nix
@@ -129,6 +129,36 @@ in {
User = cfg.user;
Group = cfg.group;
RuntimeDirectory = optional (cfg.socket == defaultSock) "opendkim";
+ StateDirectory = "opendkim";
+ StateDirectoryMode = "0700";
+ ReadWritePaths = [ cfg.keyPath ];
+
+ AmbientCapabilities = [];
+ CapabilityBoundingSet = [];
+ DevicePolicy = "closed";
+ LockPersonality = true;
+ MemoryDenyWriteExecute = true;
+ NoNewPrivileges = true;
+ PrivateDevices = true;
+ PrivateMounts = true;
+ PrivateTmp = true;
+ PrivateUsers = true;
+ ProtectClock = true;
+ ProtectControlGroups = true;
+ ProtectHome = true;
+ ProtectHostname = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ ProtectSystem = "strict";
+ RemoveIPC = true;
+ RestrictAddressFamilies = [ "AF_INET" "AF_INET6 AF_UNIX" ];
+ RestrictNamespaces = true;
+ RestrictRealtime = true;
+ RestrictSUIDSGID = true;
+ SystemCallArchitectures = "native";
+ SystemCallFilter = [ "@system-service" "~@privileged @resources" ];
+ UMask = "0077";
};
};
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 425f35f37cb..9896b8023e4 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -783,6 +783,23 @@ in {
};
};
+ systemd.services.gitlab-mailroom = mkIf (gitlabConfig.production.incoming_email.enabled or false) {
+ description = "GitLab incoming mail daemon";
+ after = [ "network.target" "redis.service" "gitlab.service" ]; # gitlab.service creates configs
+ wantedBy = [ "multi-user.target" ];
+ environment = gitlabEnv;
+ serviceConfig = {
+ Type = "simple";
+ TimeoutSec = "infinity";
+ Restart = "on-failure";
+
+ User = cfg.user;
+ Group = cfg.group;
+ ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/bundle exec mail_room -c ${cfg.packages.gitlab}/share/gitlab/config.dist/mail_room.yml";
+ WorkingDirectory = gitlabEnv.HOME;
+ };
+ };
+
systemd.services.gitlab = {
after = [ "gitlab-workhorse.service" "gitaly.service" "network.target" "gitlab-postgresql.service" "redis.service" ];
requires = [ "gitlab-sidekiq.service" ];
diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml
index b6171a9a194..19a3df0a5f6 100644
--- a/nixos/modules/services/misc/gitlab.xml
+++ b/nixos/modules/services/misc/gitlab.xml
@@ -97,6 +97,12 @@ services.gitlab = {
state folder.
+
+ When icoming_mail.enabled is set to true
+ in extraConfig an additional
+ service called gitlab-mailroom is enabled for fetching incoming mail.
+
+
Refer to for all available configuration
options for the
diff --git a/nixos/modules/services/network-filesystems/cachefilesd.nix b/nixos/modules/services/network-filesystems/cachefilesd.nix
index 61981340840..229c9665419 100644
--- a/nixos/modules/services/network-filesystems/cachefilesd.nix
+++ b/nixos/modules/services/network-filesystems/cachefilesd.nix
@@ -43,17 +43,21 @@ in
config = mkIf cfg.enable {
+ boot.kernelModules = [ "cachefiles" ];
+
systemd.services.cachefilesd = {
description = "Local network file caching management daemon";
wantedBy = [ "multi-user.target" ];
- path = [ pkgs.kmod pkgs.cachefilesd ];
- script = ''
- modprobe -qab cachefiles
- mkdir -p ${cfg.cacheDir}
- chmod 700 ${cfg.cacheDir}
- exec cachefilesd -n -f ${cfgFile}
- '';
+ serviceConfig = {
+ Type = "exec";
+ ExecStart = "${pkgs.cachefilesd}/bin/cachefilesd -n -f ${cfgFile}";
+ Restart = "on-failure";
+ PrivateTmp = true;
+ };
};
+ systemd.tmpfiles.rules = [
+ "d ${cfg.cacheDir} 0700 root root - -"
+ ];
};
}
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index e717d78feed..28348c7893a 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -18,6 +18,7 @@ let
fsWatcherEnabled = folder.watch;
fsWatcherDelayS = folder.watchDelay;
ignorePerms = folder.ignorePerms;
+ ignoreDelete = folder.ignoreDelete;
versioning = folder.versioning;
}) (filterAttrs (
_: folder:
@@ -284,8 +285,6 @@ in {
});
};
-
-
rescanInterval = mkOption {
type = types.int;
default = 3600;
@@ -327,6 +326,16 @@ in {
'';
};
+ ignoreDelete = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to delete files in destination. See
+ upstream's docs.
+ '';
+ };
+
};
}));
};
diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index d090885a8ca..759eebf768d 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -277,6 +277,7 @@ in {
ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID";
RuntimeDirectory = "phpfpm";
RuntimeDirectoryPreserve = true; # Relevant when multiple processes are running
+ Restart = "always";
};
}
) cfg.pools;
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 30ffb12cbad..c0ec76e8a3a 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -74,15 +74,8 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; };
# OOM killer randomly get rid of processes, since this leads
# to failures that are hard to diagnose.
echo 2 > /proc/sys/vm/panic_on_oom
-
- # Coverage data is written into /tmp/coverage-data.
- mkdir -p /tmp/xchg/coverage-data
'';
- # If the kernel has been built with coverage instrumentation, make
- # it available under /proc/gcov.
- boot.kernelModules = [ "gcov-proc" ];
-
# Panic if an error occurs in stage 1 (rather than waiting for
# user intervention).
boot.kernelParams =
@@ -111,8 +104,6 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; };
networking.defaultGateway = mkOverride 150 "";
networking.nameservers = mkOverride 150 [ ];
- systemd.globalEnvironment.GCOV_PREFIX = "/tmp/xchg/coverage-data";
-
system.requiredKernelConfig = with config.lib.kernelConfig; [
(isYes "SERIAL_8250_CONSOLE")
(isYes "SERIAL_8250")
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index bd1bf733153..df89949074f 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -633,10 +633,10 @@ in {
+ " mklabel msdos"
+ " mkpart primary ext2 1M 100MB" # /boot
+ " mkpart extended 100M -1s"
- + " mkpart logical 102M 2102M" # md0 (root), first device
- + " mkpart logical 2103M 4103M" # md0 (root), second device
- + " mkpart logical 4104M 4360M" # md1 (swap), first device
- + " mkpart logical 4361M 4617M", # md1 (swap), second device
+ + " mkpart logical 102M 3102M" # md0 (root), first device
+ + " mkpart logical 3103M 6103M" # md0 (root), second device
+ + " mkpart logical 6104M 6360M" # md1 (swap), first device
+ + " mkpart logical 6361M 6617M", # md1 (swap), second device
"udevadm settle",
"ls -l /dev/vda* >&2",
"cat /proc/partitions >&2",
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
index ee060602c82..7e5099f3c31 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
@@ -2,11 +2,11 @@
bitwig-studio1.overrideAttrs (oldAttrs: rec {
name = "bitwig-studio-${version}";
- version = "3.2.6";
+ version = "3.2.7";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
- sha256 = "00hrbgnjns3s8lbjbabwwqvbwz4dlrg33cs3d1qlpzgi3y72h3nn";
+ sha256 = "1mj9kii4bnk5w2p18hypwy8swkpzkaqw98q5fsjq362x4qm0b3py";
};
buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ];
diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index 944a2d189d7..d91e550334b 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
# When updating, please check if https://github.com/csound/csound/issues/1078
# has been fixed in the new version so we can use the normal fluidsynth
# version and remove fluidsynth 1.x from nixpkgs again.
- version = "6.14.0";
+ version = "6.15.0";
enableParallelBuilding = true;
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "csound";
repo = "csound";
rev = version;
- sha256 = "1sr9knfhbm2m0wpkjq2l5n471vnl51wy4p6j4m95zqybimzb4s2j";
+ sha256 = "1vld6v55jxvv3ddr21kh41s4cdkhnm5wpffvd097zqrqh1aq08r0";
};
cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp
diff --git a/pkgs/applications/audio/hydrogen/0.nix b/pkgs/applications/audio/hydrogen/0.nix
new file mode 100644
index 00000000000..b3aff4e4c50
--- /dev/null
+++ b/pkgs/applications/audio/hydrogen/0.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, cmake
+, alsaLib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4
+}:
+
+stdenv.mkDerivation rec {
+ version = "0.9.7";
+ pname = "hydrogen";
+
+ src = fetchurl {
+ url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz";
+ sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy";
+ };
+
+ nativeBuildInputs = [ pkgconfig cmake ];
+ buildInputs = [
+ alsaLib boost glib lash libjack2 libarchive libsndfile lrdf qt4
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Advanced drum machine";
+ homepage = "http://www.hydrogen-music.org";
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.goibhniu ];
+ };
+}
diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix
index b3aff4e4c50..c6d307e2c16 100644
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/pkgs/applications/audio/hydrogen/default.nix
@@ -1,19 +1,27 @@
-{ stdenv, fetchurl, pkgconfig, cmake
-, alsaLib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook
+, alsaLib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf
+, qtbase, qttools, qtxmlpatterns
}:
stdenv.mkDerivation rec {
- version = "0.9.7";
pname = "hydrogen";
+ version = "1.0.1";
- src = fetchurl {
- url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz";
- sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy";
+ src = fetchFromGitHub {
+ owner = "hydrogen-music";
+ repo = pname;
+ rev = version;
+ sha256 = "0snljpvbcgikhz610c325dgvayi0k512p3bglck9vvi90wsqx7l1";
};
- nativeBuildInputs = [ pkgconfig cmake ];
+ nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
buildInputs = [
- alsaLib boost glib lash libjack2 libarchive libsndfile lrdf qt4
+ alsaLib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf
+ qtbase qttools qtxmlpatterns
+ ];
+
+ cmakeFlags = [
+ "-DWANT_DEBUG=OFF"
];
meta = with stdenv.lib; {
@@ -21,6 +29,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.hydrogen-music.org";
license = licenses.gpl2;
platforms = platforms.linux;
- maintainers = [ maintainers.goibhniu ];
+ maintainers = with maintainers; [ goibhniu orivej ];
};
}
diff --git a/pkgs/applications/audio/hydrogen/unstable.nix b/pkgs/applications/audio/hydrogen/unstable.nix
deleted file mode 100644
index 2f220f8d31a..00000000000
--- a/pkgs/applications/audio/hydrogen/unstable.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook
-, alsaLib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf
-, qtbase, qttools, qtxmlpatterns
-}:
-
-stdenv.mkDerivation rec {
- pname = "hydrogen";
- version = "1.0.0-beta2";
-
- src = fetchFromGitHub {
- owner = "hydrogen-music";
- repo = pname;
- rev = version;
- sha256 = "1s3jrdyjpm92flw9mkkxchnj0wz8nn1y1kifii8ws252iiqjya4a";
- };
-
- nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
- buildInputs = [
- alsaLib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf
- qtbase qttools qtxmlpatterns
- ];
-
- cmakeFlags = [
- "-DWANT_DEBUG=OFF"
- ];
-
- meta = with stdenv.lib; {
- description = "Advanced drum machine";
- homepage = "http://www.hydrogen-music.org";
- license = licenses.gpl2;
- platforms = platforms.linux;
- maintainers = with maintainers; [ goibhniu orivej ];
- };
-}
diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix
index 256f5766c41..f229e15871e 100644
--- a/pkgs/applications/audio/lingot/default.nix
+++ b/pkgs/applications/audio/lingot/default.nix
@@ -5,8 +5,10 @@
, gtk3
, wrapGAppsHook
, alsaLib
+, libjack2
, libpulseaudio
, fftw
+, jackSupport ? true
}:
stdenv.mkDerivation rec {
@@ -29,11 +31,9 @@ stdenv.mkDerivation rec {
alsaLib
libpulseaudio
fftw
- ];
+ ] ++ stdenv.lib.optional jackSupport libjack2;
- configureFlags = [
- "--disable-jack"
- ];
+ configureFlags = stdenv.lib.optional (!jackSupport) "--disable-jack";
meta = {
description = "Not a Guitar-Only tuner";
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 87666940c15..8cb28dcfd5a 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,14 +1,14 @@
{ stdenv, mkDerivation, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
mkDerivation rec {
- version = "0.6.2";
+ version = "0.6.3";
pname = "qjackctl";
# some dependencies such as killall have to be installed additionally
src = fetchurl {
url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz";
- sha256 = "1rjhdyp0wzhlqr4cn80rh1qhby998cpqv81j1bbb9hfsiq77viqy";
+ sha256 = "0zbb4jlx56qvcqyhx34mbagkqf3wbxgj84hk0ppf5cmcrxv67d4x";
};
buildInputs = [
diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix
index f1c0b056c82..1a233b3d93e 100644
--- a/pkgs/applications/backup/vorta/default.nix
+++ b/pkgs/applications/backup/vorta/default.nix
@@ -5,13 +5,13 @@
buildPythonApplication rec {
pname = "vorta";
- version = "0.6.26";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "borgbase";
repo = "vorta";
rev = "v${version}";
- sha256 = "189kzwdmissg9142cd7wvxa1rvc2y7lysgr7if99zc7ks59mv6dq";
+ sha256 = "1hz19c0lphwql881n7w0ls39bbl63lccx57c3klwfyzgsxcgdy2j";
};
postPatch = ''
diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix
index 0324f024423..6b5358c9cf9 100644
--- a/pkgs/applications/blockchains/wasabibackend/default.nix
+++ b/pkgs/applications/blockchains/wasabibackend/default.nix
@@ -35,7 +35,7 @@ let
};
pname = "WasabiBackend";
- version = "1.1.11.1";
+ version = "1.1.12";
projectName = "WalletWasabi.Backend";
projectConfiguration = "Release";
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
owner = "zkSNACKs";
repo = "WalletWasabi";
rev = "v${version}";
- sha256 = "0kxww8ywhld00b0qsv5jh5s19jqpahnb9mvshmjnp3cb840j12a7";
+ sha256 = "001k43z2jxvs03csyzndlzlk034aclzc4n8ddrqxykgrq508xk1d";
};
buildInputs = [
diff --git a/pkgs/applications/blockchains/wasabibackend/deps.nix b/pkgs/applications/blockchains/wasabibackend/deps.nix
index ff5184ba860..1058cfcf93c 100644
--- a/pkgs/applications/blockchains/wasabibackend/deps.nix
+++ b/pkgs/applications/blockchains/wasabibackend/deps.nix
@@ -13,6 +13,21 @@ in [
version = "4.0.11";
sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z";
})
+ (fetchNuGet {
+ name = "System.Globalization.Extensions";
+ version = "4.3.0";
+ sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Handles";
+ version = "4.3.0";
+ sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8";
+ })
+ (fetchNuGet {
+ name = "System.Dynamic.Runtime";
+ version = "4.0.11";
+ sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9";
+ })
(fetchNuGet {
name = "System.Threading.Overlapped";
version = "4.0.1";
@@ -23,11 +38,6 @@ in [
version = "4.0.1";
sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p";
})
- (fetchNuGet {
- name = "System.Dynamic.Runtime";
- version = "4.0.11";
- sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9";
- })
(fetchNuGet {
name = "System.Private.DataContractSerialization";
version = "4.1.1";
@@ -38,50 +48,30 @@ in [
version = "4.0.0";
sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k";
})
- (fetchNuGet {
- name = "System.Reflection.Emit.Lightweight";
- version = "4.0.1";
- sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr";
- })
(fetchNuGet {
name = "System.Reflection.Emit";
version = "4.0.1";
sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp";
})
+ (fetchNuGet {
+ name = "System.Reflection.Emit.Lightweight";
+ version = "4.0.1";
+ sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr";
+ })
(fetchNuGet {
name = "System.Reflection.Emit.ILGeneration";
version = "4.0.1";
sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0";
})
- (fetchNuGet {
- name = "System.Diagnostics.DiagnosticSource";
- version = "4.0.0";
- sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m";
- })
(fetchNuGet {
name = "System.Globalization.Extensions";
version = "4.0.1";
sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc";
})
(fetchNuGet {
- name = "System.Security.Cryptography.Cng";
- version = "4.2.0";
- sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc";
- })
- (fetchNuGet {
- name = "System.Security.Cryptography.OpenSsl";
+ name = "System.Diagnostics.DiagnosticSource";
version = "4.0.0";
- sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q";
- })
- (fetchNuGet {
- name = "System.Security.Cryptography.Csp";
- version = "4.0.0";
- sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q";
- })
- (fetchNuGet {
- name = "runtime.native.System.Net.Http";
- version = "4.0.1";
- sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6";
+ sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m";
})
(fetchNuGet {
name = "System.Threading.Tasks.Extensions";
@@ -89,35 +79,65 @@ in [
sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr";
})
(fetchNuGet {
- name = "runtime.native.System.IO.Compression";
- version = "4.1.0";
- sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk";
+ name = "System.Security.Cryptography.Cng";
+ version = "4.2.0";
+ sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc";
})
(fetchNuGet {
- name = "Microsoft.Extensions.FileProviders.Physical";
- version = "2.0.0";
- sha256 = "0l0l92g7sq4122n139av1pn1jl6wlw92hjmdnr47xdss0ndmwrs3";
- })
- (fetchNuGet {
- name = "Microsoft.VisualStudio.Web.CodeGeneration.Contracts";
- version = "2.0.2";
- sha256 = "1fs6sbjn0chx6rv38d61zgk8mhyyxz44xp4wsfya0lvkckyszyn1";
- })
- (fetchNuGet {
- name = "Microsoft.NETCore.App";
- version = "2.0.5";
- sha256 = "0qb7k624w7l0zhapdp519ymqg84a67r8zyd8cpj42hywsgb0dqv6";
+ name = "System.Security.Cryptography.Csp";
+ version = "4.0.0";
+ sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q";
})
(fetchNuGet {
name = "Microsoft.VisualStudio.Web.CodeGeneration.Tools";
version = "2.0.2";
sha256 = "0fkjm06irs53d77z29i6dwj5pjhgj9ivhad8v39ghnrwasc0ivq6";
})
+ (fetchNuGet {
+ name = "System.Security.Cryptography.OpenSsl";
+ version = "4.0.0";
+ sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q";
+ })
+ (fetchNuGet {
+ name = "Microsoft.VisualStudio.Web.CodeGeneration.Contracts";
+ version = "2.0.2";
+ sha256 = "1fs6sbjn0chx6rv38d61zgk8mhyyxz44xp4wsfya0lvkckyszyn1";
+ })
+ (fetchNuGet {
+ name = "runtime.native.System.Net.Http";
+ version = "4.0.1";
+ sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Extensions.FileProviders.Physical";
+ version = "2.0.0";
+ sha256 = "0l0l92g7sq4122n139av1pn1jl6wlw92hjmdnr47xdss0ndmwrs3";
+ })
+ (fetchNuGet {
+ name = "runtime.native.System.IO.Compression";
+ version = "4.1.0";
+ sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk";
+ })
+ (fetchNuGet {
+ name = "Microsoft.NETCore.App";
+ version = "2.0.5";
+ sha256 = "0qb7k624w7l0zhapdp519ymqg84a67r8zyd8cpj42hywsgb0dqv6";
+ })
+ (fetchNuGet {
+ name = "runtime.native.System.Security.Cryptography";
+ version = "4.0.0";
+ sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9";
+ })
(fetchNuGet {
name = "NuGet.Frameworks";
version = "4.0.0";
sha256 = "0nar684cm53cvzx28gzl6kmpg9mrfr1yv29323din7xqal4pscgq";
})
+ (fetchNuGet {
+ name = "Microsoft.Build.Runtime";
+ version = "15.3.409";
+ sha256 = "135ycnqz5jfg61y5zaapgc7xdpjx2aq4icmxb9ph7h5inl445q7q";
+ })
(fetchNuGet {
name = "runtime.native.System";
version = "4.0.0";
@@ -128,125 +148,15 @@ in [
version = "4.0.0";
sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr";
})
- (fetchNuGet {
- name = "Microsoft.Build.Runtime";
- version = "15.3.409";
- sha256 = "135ycnqz5jfg61y5zaapgc7xdpjx2aq4icmxb9ph7h5inl445q7q";
- })
- (fetchNuGet {
- name = "Newtonsoft.Json";
- version = "10.0.1";
- sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv";
- })
- (fetchNuGet {
- name = "Microsoft.Extensions.FileSystemGlobbing";
- version = "2.0.0";
- sha256 = "02lzy6r14ghwfwm384xajq08vv3pl3ww0mi5isrr10vivhijhgg4";
- })
- (fetchNuGet {
- name = "runtime.native.System.Security.Cryptography";
- version = "4.0.0";
- sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9";
- })
- (fetchNuGet {
- name = "Microsoft.Extensions.FileProviders.Abstractions";
- version = "2.0.0";
- sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4";
- })
(fetchNuGet {
name = "Microsoft.NETCore.Targets";
version = "1.0.1";
sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p";
})
(fetchNuGet {
- name = "Microsoft.NETCore.Platforms";
- version = "2.0.1";
- sha256 = "1j2hmnivgb4plni2dd205kafzg6mkg7r4knrd3s7mg75wn2l25np";
- })
- (fetchNuGet {
- name = "Microsoft.NETCore.DotNetHostPolicy";
- version = "2.0.5";
- sha256 = "0v5csskiwpk8kz8wclqad8kcjmxr7ik4w99wl05740qvaag3qysk";
- })
- (fetchNuGet {
- name = "NETStandard.Library";
- version = "2.0.1";
- sha256 = "0d44wjxphs1ck838v7dapm0ag0b91zpiy33cr5vflsrwrqgj51dk";
- })
- (fetchNuGet {
- name = "System.Globalization.Extensions";
- version = "4.3.0";
- sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls";
- })
- (fetchNuGet {
- name = "System.Runtime.Serialization.Primitives";
- version = "4.3.0";
- sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf";
- })
- (fetchNuGet {
- name = "System.Runtime.Numerics";
- version = "4.3.0";
- sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z";
- })
- (fetchNuGet {
- name = "System.Runtime.Serialization.Formatters";
- version = "4.3.0";
- sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m";
- })
- (fetchNuGet {
- name = "System.Xml.XmlDocument";
- version = "4.3.0";
- sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi";
- })
- (fetchNuGet {
- name = "System.Collections";
- version = "4.3.0";
- sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9";
- })
- (fetchNuGet {
- name = "System.Diagnostics.Debug";
- version = "4.3.0";
- sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y";
- })
- (fetchNuGet {
- name = "System.Resources.ResourceManager";
- version = "4.3.0";
- sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49";
- })
- (fetchNuGet {
- name = "System.Reflection.Extensions";
- version = "4.3.0";
- sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq";
- })
- (fetchNuGet {
- name = "System.Runtime.Handles";
- version = "4.3.0";
- sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8";
- })
- (fetchNuGet {
- name = "System.Text.Encoding.Extensions";
- version = "4.3.0";
- sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy";
- })
- (fetchNuGet {
- name = "System.Globalization";
- version = "4.3.0";
- sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki";
- })
- (fetchNuGet {
- name = "System.Linq";
- version = "4.3.0";
- sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7";
- })
- (fetchNuGet {
- name = "System.Text.Encoding";
- version = "4.3.0";
- sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr";
- })
- (fetchNuGet {
- name = "System.ObjectModel";
- version = "4.3.0";
- sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2";
+ name = "Newtonsoft.Json";
+ version = "10.0.1";
+ sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv";
})
(fetchNuGet {
name = "Microsoft.NETCore.DotNetAppHost";
@@ -259,74 +169,74 @@ in [
sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29";
})
(fetchNuGet {
- name = "System.Threading";
+ name = "System.Reflection.Emit.Lightweight";
version = "4.3.0";
- sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34";
+ sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c";
})
(fetchNuGet {
- name = "Microsoft.CSharp";
+ name = "System.IO.FileSystem";
version = "4.3.0";
- sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb";
+ sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw";
})
(fetchNuGet {
- name = "System.IO.Pipes";
- version = "4.0.0";
- sha256 = "0fxfvcf55s9q8zsykwh8dkq2xb5jcqnml2ycq8srfry2l07h18za";
+ name = "Microsoft.Extensions.FileSystemGlobbing";
+ version = "2.0.0";
+ sha256 = "02lzy6r14ghwfwm384xajq08vv3pl3ww0mi5isrr10vivhijhgg4";
})
(fetchNuGet {
- name = "System.Text.RegularExpressions";
- version = "4.3.0";
- sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l";
+ name = "Microsoft.Extensions.FileProviders.Abstractions";
+ version = "2.0.0";
+ sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4";
})
(fetchNuGet {
- name = "System.Reflection";
- version = "4.3.0";
- sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m";
+ name = "Microsoft.NETCore.Platforms";
+ version = "2.0.1";
+ sha256 = "1j2hmnivgb4plni2dd205kafzg6mkg7r4knrd3s7mg75wn2l25np";
})
(fetchNuGet {
- name = "System.IO";
- version = "4.3.0";
- sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f";
+ name = "Microsoft.NETCore.DotNetHostPolicy";
+ version = "2.0.5";
+ sha256 = "0v5csskiwpk8kz8wclqad8kcjmxr7ik4w99wl05740qvaag3qysk";
})
(fetchNuGet {
- name = "System.Xml.XDocument";
+ name = "System.IO.FileSystem.Primitives";
version = "4.3.0";
- sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd";
+ sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c";
})
(fetchNuGet {
- name = "System.Threading.Tasks";
- version = "4.3.0";
- sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7";
+ name = "NETStandard.Library";
+ version = "2.0.1";
+ sha256 = "0d44wjxphs1ck838v7dapm0ag0b91zpiy33cr5vflsrwrqgj51dk";
})
(fetchNuGet {
- name = "System.ComponentModel.TypeConverter";
+ name = "System.Threading.Tasks.Extensions";
version = "4.3.0";
- sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x";
+ sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z";
})
(fetchNuGet {
- name = "System.Runtime.Extensions";
+ name = "System.Collections.Specialized";
version = "4.3.0";
- sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60";
+ sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20";
})
(fetchNuGet {
- name = "System.Dynamic.Runtime";
+ name = "System.ComponentModel";
version = "4.3.0";
- sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk";
+ sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb";
})
(fetchNuGet {
- name = "System.Xml.ReaderWriter";
+ name = "System.Collections.NonGeneric";
version = "4.3.0";
- sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1";
+ sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k";
})
(fetchNuGet {
- name = "System.Linq.Expressions";
+ name = "System.ComponentModel.Primitives";
version = "4.3.0";
- sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv";
+ sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0";
})
(fetchNuGet {
- name = "System.Runtime";
+ name = "System.Runtime.InteropServices";
version = "4.3.0";
- sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";
+ sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j";
})
(fetchNuGet {
name = "NETStandard.Library";
@@ -343,26 +253,246 @@ in [
version = "15.3.409";
sha256 = "135swyygp7cz2civwsz6a7dj7h8bzp7yrybmgxjanxwrw66hm933";
})
- (fetchNuGet {
- name = "Microsoft.Build.Utilities.Core";
- version = "15.3.409";
- sha256 = "1p8a0l9sxmjj86qha748qjw2s2n07q8mn41mj5r6apjnwl27ywnf";
- })
(fetchNuGet {
name = "System.Text.Encoding.CodePages";
version = "4.0.1";
sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3";
})
+ (fetchNuGet {
+ name = "Microsoft.Build.Utilities.Core";
+ version = "15.3.409";
+ sha256 = "1p8a0l9sxmjj86qha748qjw2s2n07q8mn41mj5r6apjnwl27ywnf";
+ })
(fetchNuGet {
name = "Microsoft.Build";
version = "15.3.409";
sha256 = "0vzq6csp2yys9s96c7i37bjml439rdi47g8f5rzqdr7xf5a1jk81";
})
+ (fetchNuGet {
+ name = "System.Runtime.Serialization.Formatters";
+ version = "4.3.0";
+ sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Serialization.Primitives";
+ version = "4.3.0";
+ sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf";
+ })
+ (fetchNuGet {
+ name = "System.ObjectModel";
+ version = "4.3.0";
+ sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2";
+ })
+ (fetchNuGet {
+ name = "System.Diagnostics.Debug";
+ version = "4.3.0";
+ sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y";
+ })
+ (fetchNuGet {
+ name = "System.Resources.ResourceManager";
+ version = "4.3.0";
+ sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Extensions";
+ version = "4.3.0";
+ sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Emit";
+ version = "4.3.0";
+ sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74";
+ })
+ (fetchNuGet {
+ name = "System.Text.Encoding.Extensions";
+ version = "4.3.0";
+ sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy";
+ })
+ (fetchNuGet {
+ name = "System.Text.Encoding";
+ version = "4.3.0";
+ sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr";
+ })
+ (fetchNuGet {
+ name = "System.Xml.XmlDocument";
+ version = "4.3.0";
+ sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Emit.ILGeneration";
+ version = "4.3.0";
+ sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Numerics";
+ version = "4.3.0";
+ sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z";
+ })
+ (fetchNuGet {
+ name = "System.Globalization";
+ version = "4.3.0";
+ sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.TypeExtensions";
+ version = "4.3.0";
+ sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1";
+ })
+ (fetchNuGet {
+ name = "System.Threading";
+ version = "4.3.0";
+ sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Primitives";
+ version = "4.3.0";
+ sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276";
+ })
+ (fetchNuGet {
+ name = "System.Linq";
+ version = "4.3.0";
+ sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7";
+ })
+ (fetchNuGet {
+ name = "System.Diagnostics.Tools";
+ version = "4.3.0";
+ sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1";
+ })
+ (fetchNuGet {
+ name = "Microsoft.NETCore.Targets";
+ version = "1.1.0";
+ sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh";
+ })
+ (fetchNuGet {
+ name = "System.Collections";
+ version = "4.3.0";
+ sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9";
+ })
+ (fetchNuGet {
+ name = "Microsoft.NETCore.Platforms";
+ version = "1.1.0";
+ sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm";
+ })
+ (fetchNuGet {
+ name = "System.IO";
+ version = "4.3.0";
+ sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f";
+ })
(fetchNuGet {
name = "System.Threading.Tasks.Dataflow";
version = "4.6.0";
sha256 = "0a1davr71wssyn4z1hr75lk82wqa0daz0vfwkmg1fm3kckfd72k1";
})
+ (fetchNuGet {
+ name = "System.Xml.XDocument";
+ version = "4.3.0";
+ sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd";
+ })
+ (fetchNuGet {
+ name = "System.IO.Pipes";
+ version = "4.0.0";
+ sha256 = "0fxfvcf55s9q8zsykwh8dkq2xb5jcqnml2ycq8srfry2l07h18za";
+ })
+ (fetchNuGet {
+ name = "System.Diagnostics.FileVersionInfo";
+ version = "4.0.0";
+ sha256 = "1s5vxhy7i09bmw51kxqaiz9zaj9am8wsjyz13j85sp23z267hbv3";
+ })
+ (fetchNuGet {
+ name = "System.Threading.Tasks";
+ version = "4.3.0";
+ sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7";
+ })
+ (fetchNuGet {
+ name = "System.Diagnostics.Contracts";
+ version = "4.0.1";
+ sha256 = "0y6dkd9n5k98vzhc3w14r2pbhf10qjn2axpghpmfr6rlxx9qrb9j";
+ })
+ (fetchNuGet {
+ name = "System.Reflection";
+ version = "4.3.0";
+ sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m";
+ })
+ (fetchNuGet {
+ name = "System.Dynamic.Runtime";
+ version = "4.3.0";
+ sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Loader";
+ version = "4.0.0";
+ sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0";
+ })
+ (fetchNuGet {
+ name = "System.Threading.ThreadPool";
+ version = "4.0.10";
+ sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Extensions";
+ version = "4.3.0";
+ sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Serialization.Xml";
+ version = "4.1.1";
+ sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk";
+ })
+ (fetchNuGet {
+ name = "System.Text.RegularExpressions";
+ version = "4.3.0";
+ sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l";
+ })
+ (fetchNuGet {
+ name = "System.Collections.Immutable";
+ version = "1.2.0";
+ sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m";
+ })
+ (fetchNuGet {
+ name = "Microsoft.CSharp";
+ version = "4.3.0";
+ sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb";
+ })
+ (fetchNuGet {
+ name = "System.ComponentModel.TypeConverter";
+ version = "4.3.0";
+ sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Metadata";
+ version = "1.3.0";
+ sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b";
+ })
+ (fetchNuGet {
+ name = "System.Xml.ReaderWriter";
+ version = "4.3.0";
+ sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1";
+ })
+ (fetchNuGet {
+ name = "System.Linq.Parallel";
+ version = "4.0.1";
+ sha256 = "0i33x9f4h3yq26yvv6xnq4b0v51rl5z8v1bm7vk972h5lvf4apad";
+ })
+ (fetchNuGet {
+ name = "System.Linq.Expressions";
+ version = "4.3.0";
+ sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv";
+ })
+ (fetchNuGet {
+ name = "System.Diagnostics.Process";
+ version = "4.1.0";
+ sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s";
+ })
+ (fetchNuGet {
+ name = "System.Runtime";
+ version = "4.3.0";
+ sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";
+ })
+ (fetchNuGet {
+ name = "System.Xml.XmlDocument";
+ version = "4.0.1";
+ sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1";
+ })
(fetchNuGet {
name = "Microsoft.Extensions.Primitives";
version = "2.0.0";
@@ -374,124 +504,9 @@ in [
sha256 = "1sz2fdp8fdwz21x3lr2m1zhhrbix6iz699fjkwiryqdjl4ygd3hw";
})
(fetchNuGet {
- name = "Microsoft.NETCore.Platforms";
- version = "1.1.0";
- sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm";
- })
- (fetchNuGet {
- name = "Microsoft.NETCore.Targets";
- version = "1.1.0";
- sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh";
- })
- (fetchNuGet {
- name = "System.Reflection.TypeExtensions";
- version = "4.3.0";
- sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1";
- })
- (fetchNuGet {
- name = "System.Reflection.Primitives";
- version = "4.3.0";
- sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276";
- })
- (fetchNuGet {
- name = "System.Runtime.InteropServices";
- version = "4.3.0";
- sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j";
- })
- (fetchNuGet {
- name = "System.Diagnostics.Tools";
- version = "4.3.0";
- sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1";
- })
- (fetchNuGet {
- name = "System.ComponentModel.Primitives";
- version = "4.3.0";
- sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0";
- })
- (fetchNuGet {
- name = "System.ComponentModel";
- version = "4.3.0";
- sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb";
- })
- (fetchNuGet {
- name = "System.Collections.NonGeneric";
- version = "4.3.0";
- sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k";
- })
- (fetchNuGet {
- name = "System.Collections.Specialized";
- version = "4.3.0";
- sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20";
- })
- (fetchNuGet {
- name = "System.Reflection.Emit.ILGeneration";
- version = "4.3.0";
- sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q";
- })
- (fetchNuGet {
- name = "System.Reflection.Emit";
- version = "4.3.0";
- sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74";
- })
- (fetchNuGet {
- name = "System.IO.FileSystem.Primitives";
- version = "4.3.0";
- sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c";
- })
- (fetchNuGet {
- name = "System.Threading.Tasks.Extensions";
- version = "4.3.0";
- sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z";
- })
- (fetchNuGet {
- name = "System.IO.FileSystem";
- version = "4.3.0";
- sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw";
- })
- (fetchNuGet {
- name = "System.Reflection.Emit.Lightweight";
- version = "4.3.0";
- sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c";
- })
- (fetchNuGet {
- name = "System.AppContext";
- version = "4.1.0";
- sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz";
- })
- (fetchNuGet {
- name = "System.ObjectModel";
- version = "4.0.12";
- sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj";
- })
- (fetchNuGet {
- name = "System.Collections.Concurrent";
- version = "4.0.12";
- sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc";
- })
- (fetchNuGet {
- name = "System.IO.FileSystem.Primitives";
- version = "4.0.1";
- sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612";
- })
- (fetchNuGet {
- name = "Microsoft.Win32.Primitives";
- version = "4.0.1";
- sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7";
- })
- (fetchNuGet {
- name = "System.Diagnostics.Tracing";
- version = "4.1.0";
- sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394";
- })
- (fetchNuGet {
- name = "System.Net.Sockets";
- version = "4.1.0";
- sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls";
- })
- (fetchNuGet {
- name = "System.Threading.Timer";
- version = "4.0.1";
- sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6";
+ name = "System.Runtime.Serialization.Primitives";
+ version = "4.1.1";
+ sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k";
})
(fetchNuGet {
name = "Microsoft.NETCore.Platforms";
@@ -499,39 +514,9 @@ in [
sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr";
})
(fetchNuGet {
- name = "System.Globalization.Calendars";
- version = "4.0.1";
- sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh";
- })
- (fetchNuGet {
- name = "System.Security.Cryptography.Encoding";
- version = "4.0.0";
- sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4";
- })
- (fetchNuGet {
- name = "System.Reflection.Primitives";
- version = "4.0.1";
- sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28";
- })
- (fetchNuGet {
- name = "System.Diagnostics.Tools";
- version = "4.0.1";
- sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x";
- })
- (fetchNuGet {
- name = "System.Console";
- version = "4.0.0";
- sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf";
- })
- (fetchNuGet {
- name = "System.Runtime.Handles";
- version = "4.0.1";
- sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g";
- })
- (fetchNuGet {
- name = "System.Security.Cryptography.Primitives";
- version = "4.0.0";
- sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh";
+ name = "System.AppContext";
+ version = "4.1.0";
+ sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz";
})
(fetchNuGet {
name = "System.Diagnostics.Debug";
@@ -539,29 +524,9 @@ in [
sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz";
})
(fetchNuGet {
- name = "System.Collections";
- version = "4.0.11";
- sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6";
- })
- (fetchNuGet {
- name = "System.Reflection.Extensions";
- version = "4.0.1";
- sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn";
- })
- (fetchNuGet {
- name = "System.IO.FileSystem";
- version = "4.0.1";
- sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1";
- })
- (fetchNuGet {
- name = "System.Runtime.Numerics";
- version = "4.0.1";
- sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn";
- })
- (fetchNuGet {
- name = "System.IO.Compression.ZipFile";
- version = "4.0.1";
- sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82";
+ name = "System.Diagnostics.TraceSource";
+ version = "4.0.0";
+ sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h";
})
(fetchNuGet {
name = "System.Resources.ResourceManager";
@@ -569,29 +534,19 @@ in [
sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi";
})
(fetchNuGet {
- name = "System.Security.Cryptography.Algorithms";
- version = "4.2.0";
- sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85";
+ name = "System.Globalization.Calendars";
+ version = "4.0.1";
+ sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh";
})
(fetchNuGet {
- name = "System.Linq";
- version = "4.1.0";
- sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5";
+ name = "System.Xml.XPath";
+ version = "4.0.1";
+ sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m";
})
(fetchNuGet {
- name = "System.Text.Encoding";
- version = "4.0.11";
- sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw";
- })
- (fetchNuGet {
- name = "System.Runtime.InteropServices.RuntimeInformation";
- version = "4.0.0";
- sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6";
- })
- (fetchNuGet {
- name = "System.IO.Compression";
- version = "4.1.0";
- sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji";
+ name = "System.Diagnostics.Tools";
+ version = "4.0.1";
+ sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x";
})
(fetchNuGet {
name = "System.Text.Encoding.Extensions";
@@ -599,89 +554,14 @@ in [
sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs";
})
(fetchNuGet {
- name = "System.Globalization";
- version = "4.0.11";
- sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d";
- })
- (fetchNuGet {
- name = "System.Text.RegularExpressions";
+ name = "System.Diagnostics.Tracing";
version = "4.1.0";
- sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7";
+ sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394";
})
(fetchNuGet {
- name = "System.Reflection";
- version = "4.1.0";
- sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9";
- })
- (fetchNuGet {
- name = "System.Xml.XDocument";
- version = "4.0.11";
- sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18";
- })
- (fetchNuGet {
- name = "System.Threading";
- version = "4.0.11";
- sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls";
- })
- (fetchNuGet {
- name = "System.Threading.Tasks";
- version = "4.0.11";
- sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5";
- })
- (fetchNuGet {
- name = "System.Net.Primitives";
- version = "4.0.11";
- sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r";
- })
- (fetchNuGet {
- name = "System.IO";
- version = "4.1.0";
- sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp";
- })
- (fetchNuGet {
- name = "System.Runtime.Extensions";
- version = "4.1.0";
- sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z";
- })
- (fetchNuGet {
- name = "System.Security.Cryptography.X509Certificates";
- version = "4.1.0";
- sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh";
- })
- (fetchNuGet {
- name = "System.Net.Http";
- version = "4.1.0";
- sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb";
- })
- (fetchNuGet {
- name = "System.Xml.ReaderWriter";
- version = "4.0.11";
- sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5";
- })
- (fetchNuGet {
- name = "System.Runtime.InteropServices";
- version = "4.1.0";
- sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1";
- })
- (fetchNuGet {
- name = "System.Linq.Expressions";
- version = "4.1.0";
- sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg";
- })
- (fetchNuGet {
- name = "System.Runtime";
- version = "4.1.0";
- sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m";
- })
- (fetchNuGet {
- name = "System.Threading.Thread";
+ name = "System.Resources.Writer";
version = "4.0.0";
- sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc";
- })
- (fetchNuGet {
- name = "System.Diagnostics.TraceSource";
- version = "4.0.0";
- sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h";
+ sha256 = "07hp218kjdcvpl27djspnixgnacbp9apma61zz3wsca9fx5g3lmv";
})
(fetchNuGet {
name = "System.Reflection.TypeExtensions";
@@ -689,14 +569,204 @@ in [
sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7";
})
(fetchNuGet {
- name = "System.Runtime.Serialization.Primitives";
- version = "4.1.1";
- sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k";
+ name = "System.Collections.NonGeneric";
+ version = "4.0.1";
+ sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d";
})
(fetchNuGet {
- name = "System.Xml.XmlDocument";
+ name = "System.Console";
+ version = "4.0.0";
+ sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf";
+ })
+ (fetchNuGet {
+ name = "System.Security.Cryptography.Primitives";
+ version = "4.0.0";
+ sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Numerics";
version = "4.0.1";
- sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1";
+ sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn";
+ })
+ (fetchNuGet {
+ name = "Microsoft.Win32.Primitives";
+ version = "4.0.1";
+ sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7";
+ })
+ (fetchNuGet {
+ name = "System.IO.Compression.ZipFile";
+ version = "4.0.1";
+ sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82";
+ })
+ (fetchNuGet {
+ name = "System.Xml.XPath.XmlDocument";
+ version = "4.0.1";
+ sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc";
+ })
+ (fetchNuGet {
+ name = "System.Net.Sockets";
+ version = "4.1.0";
+ sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls";
+ })
+ (fetchNuGet {
+ name = "System.Xml.XDocument";
+ version = "4.0.11";
+ sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Extensions";
+ version = "4.0.1";
+ sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.InteropServices.RuntimeInformation";
+ version = "4.0.0";
+ sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6";
+ })
+ (fetchNuGet {
+ name = "System.Resources.Reader";
+ version = "4.0.0";
+ sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril";
+ })
+ (fetchNuGet {
+ name = "System.Threading.Thread";
+ version = "4.0.0";
+ sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc";
+ })
+ (fetchNuGet {
+ name = "System.Threading.Timer";
+ version = "4.0.1";
+ sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6";
+ })
+ (fetchNuGet {
+ name = "System.IO.FileSystem.Primitives";
+ version = "4.0.1";
+ sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612";
+ })
+ (fetchNuGet {
+ name = "System.IO.FileSystem";
+ version = "4.0.1";
+ sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1";
+ })
+ (fetchNuGet {
+ name = "System.Security.Cryptography.Encoding";
+ version = "4.0.0";
+ sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4";
+ })
+ (fetchNuGet {
+ name = "System.Runtime";
+ version = "4.1.0";
+ sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m";
+ })
+ (fetchNuGet {
+ name = "System.Security.Cryptography.Algorithms";
+ version = "4.2.0";
+ sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85";
+ })
+ (fetchNuGet {
+ name = "System.Reflection.Primitives";
+ version = "4.0.1";
+ sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Handles";
+ version = "4.0.1";
+ sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g";
+ })
+ (fetchNuGet {
+ name = "System.ObjectModel";
+ version = "4.0.12";
+ sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj";
+ })
+ (fetchNuGet {
+ name = "System.Net.Primitives";
+ version = "4.0.11";
+ sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r";
+ })
+ (fetchNuGet {
+ name = "System.Text.Encoding";
+ version = "4.0.11";
+ sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw";
+ })
+ (fetchNuGet {
+ name = "System.Collections.Concurrent";
+ version = "4.0.12";
+ sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc";
+ })
+ (fetchNuGet {
+ name = "System.IO.Compression";
+ version = "4.1.0";
+ sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji";
+ })
+ (fetchNuGet {
+ name = "System.IO";
+ version = "4.1.0";
+ sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp";
+ })
+ (fetchNuGet {
+ name = "System.Reflection";
+ version = "4.1.0";
+ sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9";
+ })
+ (fetchNuGet {
+ name = "System.Collections";
+ version = "4.0.11";
+ sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6";
+ })
+ (fetchNuGet {
+ name = "System.Linq";
+ version = "4.1.0";
+ sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5";
+ })
+ (fetchNuGet {
+ name = "System.Globalization";
+ version = "4.0.11";
+ sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d";
+ })
+ (fetchNuGet {
+ name = "System.Threading";
+ version = "4.0.11";
+ sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls";
+ })
+ (fetchNuGet {
+ name = "System.Text.RegularExpressions";
+ version = "4.1.0";
+ sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7";
+ })
+ (fetchNuGet {
+ name = "System.Security.Cryptography.X509Certificates";
+ version = "4.1.0";
+ sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh";
+ })
+ (fetchNuGet {
+ name = "System.Xml.ReaderWriter";
+ version = "4.0.11";
+ sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5";
+ })
+ (fetchNuGet {
+ name = "System.Net.Http";
+ version = "4.1.0";
+ sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.Extensions";
+ version = "4.1.0";
+ sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z";
+ })
+ (fetchNuGet {
+ name = "System.Threading.Tasks";
+ version = "4.0.11";
+ sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5";
+ })
+ (fetchNuGet {
+ name = "System.Linq.Expressions";
+ version = "4.1.0";
+ sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg";
+ })
+ (fetchNuGet {
+ name = "System.Runtime.InteropServices";
+ version = "4.1.0";
+ sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.App.Runtime.linux-x64";
@@ -709,19 +779,9 @@ in [
sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66";
})
(fetchNuGet {
- name = "System.Collections.NonGeneric";
- version = "4.0.1";
- sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d";
- })
- (fetchNuGet {
- name = "System.Resources.Reader";
- version = "4.0.0";
- sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril";
- })
- (fetchNuGet {
- name = "System.Xml.XPath.XmlDocument";
- version = "4.0.1";
- sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc";
+ name = "Microsoft.CSharp";
+ version = "4.7.0";
+ sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j";
})
(fetchNuGet {
name = "Microsoft.NETCore.Platforms";
@@ -729,14 +789,9 @@ in [
sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j";
})
(fetchNuGet {
- name = "Microsoft.CSharp";
- version = "4.7.0";
- sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j";
- })
- (fetchNuGet {
- name = "System.Xml.XPath";
- version = "4.0.1";
- sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m";
+ name = "Newtonsoft.Json";
+ version = "11.0.1";
+ sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m";
})
(fetchNuGet {
name = "Microsoft.Extensions.Logging.Abstractions";
@@ -744,14 +799,9 @@ in [
sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka";
})
(fetchNuGet {
- name = "System.Security.Principal.Windows";
- version = "4.7.0";
- sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d";
- })
- (fetchNuGet {
- name = "System.Security.AccessControl";
- version = "4.7.0";
- sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz";
+ name = "Newtonsoft.Json.Bson";
+ version = "1.0.2";
+ sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.JsonPatch";
@@ -764,85 +814,40 @@ in [
sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5";
})
(fetchNuGet {
- name = "System.Resources.Writer";
- version = "4.0.0";
- sha256 = "07hp218kjdcvpl27djspnixgnacbp9apma61zz3wsca9fx5g3lmv";
+ name = "System.Security.Principal.Windows";
+ version = "4.7.0";
+ sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d";
})
(fetchNuGet {
- name = "System.Reflection.Metadata";
- version = "1.3.0";
- sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b";
+ name = "System.Security.AccessControl";
+ version = "4.7.0";
+ sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz";
})
(fetchNuGet {
- name = "System.Collections.Immutable";
- version = "1.2.0";
- sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m";
- })
- (fetchNuGet {
- name = "System.Linq.Parallel";
- version = "4.0.1";
- sha256 = "0i33x9f4h3yq26yvv6xnq4b0v51rl5z8v1bm7vk972h5lvf4apad";
- })
- (fetchNuGet {
- name = "System.Diagnostics.Process";
- version = "4.1.0";
- sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s";
- })
- (fetchNuGet {
- name = "System.Runtime.Serialization.Xml";
- version = "4.1.1";
- sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk";
- })
- (fetchNuGet {
- name = "System.Threading.ThreadPool";
- version = "4.0.10";
- sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx";
- })
- (fetchNuGet {
- name = "System.Runtime.Loader";
- version = "4.0.0";
- sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0";
- })
- (fetchNuGet {
- name = "System.Diagnostics.Contracts";
- version = "4.0.1";
- sha256 = "0y6dkd9n5k98vzhc3w14r2pbhf10qjn2axpghpmfr6rlxx9qrb9j";
- })
- (fetchNuGet {
- name = "System.Diagnostics.FileVersionInfo";
- version = "4.0.0";
- sha256 = "1s5vxhy7i09bmw51kxqaiz9zaj9am8wsjyz13j85sp23z267hbv3";
- })
- (fetchNuGet {
- name = "NBitcoin.Secp256k1";
- version = "1.0.1";
- sha256 = "0j3a8iamqh06b7am6k8gh6d41zvrnmsif3525bw742jw5byjypdl";
+ name = "NBitcoin";
+ version = "5.0.47";
+ sha256 = "1plri6q83jn80m95np0zxdg3nk2f36z8v42j4sg5wjv8qppp866d";
})
(fetchNuGet {
name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson";
version = "3.1.1";
sha256 = "1c2lrlp64kkacnjgdyygr6fqdawk10l8j4qgppii6rq61yjwhcig";
})
- (fetchNuGet {
- name = "Newtonsoft.Json.Bson";
- version = "1.0.2";
- sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35";
- })
(fetchNuGet {
name = "Microsoft.Win32.Registry";
version = "4.7.0";
sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs";
})
+ (fetchNuGet {
+ name = "NBitcoin.Secp256k1";
+ version = "1.0.3";
+ sha256 = "08d4db64j1qz8ax9fg8zi6n7g1n53clnkajbbvv2hgaqyfrsnqxj";
+ })
(fetchNuGet {
name = "Microsoft.OpenApi";
version = "1.1.4";
sha256 = "1sn79829nhx6chi2qxsza1801di7zdl5fd983m0jakawzbjhjcb3";
})
- (fetchNuGet {
- name = "NBitcoin";
- version = "5.0.29";
- sha256 = "0a6jvdvnf5h9j6c3ii3pdnkq79shmcm1hf6anaqcwvi3gq19chak";
- })
(fetchNuGet {
name = "Swashbuckle.AspNetCore.SwaggerUI";
version = "5.0.0";
@@ -878,26 +883,11 @@ in [
version = "4.0.11";
sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7";
})
- (fetchNuGet {
- name = "runtime.any.System.Threading.Tasks";
- version = "4.0.11";
- sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk";
- })
(fetchNuGet {
name = "System.Private.Uri";
version = "4.0.1";
sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j";
})
- (fetchNuGet {
- name = "runtime.any.System.Diagnostics.Tracing";
- version = "4.1.0";
- sha256 = "041im8hmp1zdgrx6jzyrdch6kshvbddmkar7r2mlm1ksb5c5kwpq";
- })
- (fetchNuGet {
- name = "runtime.any.System.IO";
- version = "4.1.0";
- sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5";
- })
(fetchNuGet {
name = "runtime.any.System.Runtime.Handles";
version = "4.0.1";
@@ -908,44 +898,59 @@ in [
version = "4.0.1";
sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz";
})
+ (fetchNuGet {
+ name = "runtime.any.System.IO";
+ version = "4.1.0";
+ sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5";
+ })
(fetchNuGet {
name = "runtime.any.System.Runtime";
version = "4.1.0";
sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m";
})
(fetchNuGet {
- name = "runtime.any.System.Resources.ResourceManager";
- version = "4.0.1";
- sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr";
+ name = "runtime.any.System.Threading.Tasks";
+ version = "4.0.11";
+ sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk";
})
(fetchNuGet {
- name = "runtime.any.System.Globalization";
- version = "4.0.11";
- sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286";
- })
- (fetchNuGet {
- name = "runtime.any.System.Collections";
- version = "4.0.11";
- sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0";
- })
- (fetchNuGet {
- name = "runtime.unix.System.Diagnostics.Debug";
- version = "4.0.11";
- sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d";
+ name = "runtime.any.System.Diagnostics.Tracing";
+ version = "4.1.0";
+ sha256 = "041im8hmp1zdgrx6jzyrdch6kshvbddmkar7r2mlm1ksb5c5kwpq";
})
(fetchNuGet {
name = "runtime.unix.System.Runtime.Extensions";
version = "4.1.0";
sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4";
})
+ (fetchNuGet {
+ name = "runtime.any.System.Runtime.InteropServices";
+ version = "4.1.0";
+ sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z";
+ })
(fetchNuGet {
name = "runtime.any.System.Reflection";
version = "4.1.0";
sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6";
})
(fetchNuGet {
- name = "runtime.any.System.Runtime.InteropServices";
- version = "4.1.0";
- sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z";
+ name = "runtime.any.System.Collections";
+ version = "4.0.11";
+ sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0";
})
-]
\ No newline at end of file
+ (fetchNuGet {
+ name = "runtime.any.System.Globalization";
+ version = "4.0.11";
+ sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286";
+ })
+ (fetchNuGet {
+ name = "runtime.any.System.Resources.ResourceManager";
+ version = "4.0.1";
+ sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr";
+ })
+ (fetchNuGet {
+ name = "runtime.unix.System.Diagnostics.Debug";
+ version = "4.0.11";
+ sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d";
+ })
+]
diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index 16bc3c22cb4..eec14f286ba 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "kakoune-unwrapped";
- version = "2020.08.04";
+ version = "2020.09.01";
src = fetchFromGitHub {
repo = "kakoune";
owner = "mawww";
rev = "v${version}";
- sha256 = "1cgkis8bywy5k8k6j4i3prikpmhh1p6zyklliyxbc89mj64kvx4s";
+ sha256 = "091qzk0qs7hql0q51hix99srgma35mhdnjfd5ncfba1bmc1h8x5i";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ncurses asciidoc docbook_xsl libxslt ];
diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix
index 8c7c7687f3d..f045ec067fe 100644
--- a/pkgs/applications/gis/gmt/default.nix
+++ b/pkgs/applications/gis/gmt/default.nix
@@ -9,10 +9,10 @@
stdenv.mkDerivation rec {
pname = "gmt";
- version = "6.1.0";
+ version = "6.1.1";
src = fetchurl {
url = "https://github.com/GenericMappingTools/gmt/releases/download/${version}/gmt-${version}-src.tar.gz";
- sha256 = "0vzxzpvbf1sqma2airsibxvqb9m4sajm7jsfr7rrv6q7924c7ijw";
+ sha256 = "04mdxxcild56jhg9ax522xh78v1wl1x8iqv2f6wv32x9b2lgy1lp";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix
index 1ed5f07c5f0..7fcec93446d 100644
--- a/pkgs/applications/graphics/lightburn/default.nix
+++ b/pkgs/applications/graphics/lightburn/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "lightburn";
- version = "0.9.15";
+ version = "0.9.16";
nativeBuildInputs = [
p7zip
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
- sha256 = "1dwmrili4jfw55gnlnda3imgli7f4jqz9smwlynf7k87lxrhppmh";
+ sha256 = "0xmpglfzff3jpxbr304czsa24fbp497b69yd8kjkjdp2cd0l70qc";
};
buildInputs = [
diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix
index 8e8032a1f31..bde8999eb41 100644
--- a/pkgs/applications/graphics/meshlab/default.nix
+++ b/pkgs/applications/graphics/meshlab/default.nix
@@ -1,4 +1,6 @@
-{ mkDerivation, lib, fetchFromGitHub
+{ mkDerivation
+, lib
+, fetchFromGitHub
, fetchpatch
, libGLU
, qtbase
@@ -17,13 +19,13 @@
mkDerivation rec {
pname = "meshlab";
- version = "2020.03";
+ version = "2020.07";
src = fetchFromGitHub {
owner = "cnr-isti-vclab";
repo = "meshlab";
- rev = "f3568e75c9aed6da8bb105a1c8ac7ebbe00e4536";
- sha256 = "17g9icgy1w67afxiljzxk94dyhj4f336gjxn0bhppd58xfqh8w4g";
+ rev = "Meshlab-${version}";
+ sha256 = "0vj849b57zk3k6lx35zzcjhr9gdy4hxqnnkb8chwy7hw262cm3ri";
fetchSubmodules = true; # for vcglib
};
@@ -44,12 +46,13 @@ mkDerivation rec {
nativeBuildInputs = [ cmake ];
- patches = [ ./no-build-date.patch ];
-
- # MeshLab computes the version based on the build date, remove when https://github.com/cnr-isti-vclab/meshlab/issues/622 is fixed.
- postPatch = ''
- substituteAll ${./fix-version.patch} /dev/stdout | patch -p1 --binary
- '';
+ patches = [
+ # Make cmake use the system qhull. The next meshlab will not need this patch because it is already in master.
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/cnr-isti-vclab/meshlab/pull/747.patch";
+ sha256 = "0wx9f6zn458xz3lsqcgvsbwh1pgi3g0lah93nlbsb0sagng7n565";
+ })
+ ];
preConfigure = ''
substituteAll ${./meshlab.desktop} install/linux/resources/meshlab.desktop
@@ -62,7 +65,7 @@ mkDerivation rec {
"-DALLOW_BUNDLED_LIB3DS=OFF"
"-DALLOW_BUNDLED_MUPARSER=OFF"
"-DALLOW_BUNDLED_QHULL=OFF"
- # disable when available in nixpkgs
+ # disable when available in nixpkgs
"-DALLOW_BUNDLED_OPENCTM=ON"
"-DALLOW_BUNDLED_SSYNTH=ON"
# some plugins are disabled unless these are on
@@ -70,6 +73,11 @@ mkDerivation rec {
"-DALLOW_BUNDLED_LEVMAR=ON"
];
+ postFixup = ''
+ patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped
+ patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlabserver-wrapped
+ '';
+
# Meshlab is not format-security clean; without disabling hardening, we get:
# src/common/GLLogStream.h:61:37: error: format not a string literal and no format arguments [-Werror=format-security]
# 61 | int chars_written = snprintf(buf, buf_size, f, std::forward(ts)...);
@@ -82,7 +90,7 @@ mkDerivation rec {
description = "A system for processing and editing 3D triangular meshes.";
homepage = "http://www.meshlab.net/";
license = lib.licenses.gpl3;
- maintainers = with lib.maintainers; [viric];
+ maintainers = with lib.maintainers; [ viric ];
platforms = with lib.platforms; linux;
};
}
diff --git a/pkgs/applications/graphics/meshlab/fix-version.patch b/pkgs/applications/graphics/meshlab/fix-version.patch
deleted file mode 100644
index 5184dfcba25..00000000000
--- a/pkgs/applications/graphics/meshlab/fix-version.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/src/common/mlapplication.h
-+++ b/src/common/mlapplication.h
-@@ -23 +23 @@ public:
-- return QString::number(compileTimeYear()) + "." + (compileTimeMonth() < 10 ? "0" + QString::number(compileTimeMonth()) : QString::number(compileTimeMonth()));
-+ return "@version@";
diff --git a/pkgs/applications/graphics/meshlab/meshlab.desktop b/pkgs/applications/graphics/meshlab/meshlab.desktop
index a9c7ef79784..aa8de186440 100644
--- a/pkgs/applications/graphics/meshlab/meshlab.desktop
+++ b/pkgs/applications/graphics/meshlab/meshlab.desktop
@@ -10,6 +10,5 @@ Exec=@out@/bin/meshlab %U
TryExec=@out@/bin/meshlab
Icon=@out@/share/icons/hicolor/meshlab.png
Terminal=false
-MimeType=model/mesh;application/x-3ds;image/x-3ds;application/sla;
+MimeType=model/mesh;application/x-3ds;image/x-3ds;model/x-ply;application/sla;model/x-quad-object;model/x-geomview-off;application/x-cyclone-ptx;application/x-vmi;application/x-bre;model/vnd.collada+xml;model/openctm;application/x-expe-binary;application/x-expe-ascii;application/x-xyz;application/x-gts;chemical/x-pdb;application/x-tri;application/x-asc;model/x3d+xml;model/x3d+vrml;model/vrml;model/u3d;model/idtf;
Categories=Graphics;3DGraphics;Viewer;Qt;
-END_DESKTOP
\ No newline at end of file
diff --git a/pkgs/applications/graphics/meshlab/no-build-date.patch b/pkgs/applications/graphics/meshlab/no-build-date.patch
deleted file mode 100644
index 9588596e5b2..00000000000
--- a/pkgs/applications/graphics/meshlab/no-build-date.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/meshlab/mainwindow_RunTime.cpp
-+++ b/src/meshlab/mainwindow_RunTime.cpp
-@@ -3312 +3312 @@ void MainWindow::about()
-- temp.labelMLName->setText(MeshLabApplication::completeName(MeshLabApplication::HW_ARCHITECTURE(QSysInfo::WordSize))+" (built on "+__DATE__+")");
-+ temp.labelMLName->setText(MeshLabApplication::completeName(MeshLabApplication::HW_ARCHITECTURE(QSysInfo::WordSize)));
---- a/src/meshlabplugins/filter_plymc/plymc_main.cpp
-+++ b/src/meshlabplugins/filter_plymc/plymc_main.cpp
-@@ -121 +121 @@ int main(int argc, char *argv[])
-- printf( "\n PlyMC "_PLYMC_VER" ("__DATE__")\n"
-+ printf( "\n PlyMC "_PLYMC_VER"\n"
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index b5d52f5e5f8..ddf68b6f7c3 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -252,4 +252,42 @@ in {
maintainers = with maintainers; [ WhittlesJr ];
};
};
+
+ displaylayerprogress = buildPlugin rec {
+ pname = "OctoPrint-DisplayLayerProgress";
+ version = "1.23.2";
+
+ src = fetchFromGitHub {
+ owner = "OllisGit";
+ repo = pname;
+ rev = version;
+ sha256 = "0yv8gy5dq0rl7zxkvqa98az391aiixl8wbzkyvbmpjar9r6whdzm";
+ };
+
+ meta = with stdenv.lib; {
+ description = "OctoPrint-Plugin that sends the current progress of a print via M117 command";
+ homepage = "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ j0hax ];
+ };
+ };
+
+ octoprint-dashboard = buildPlugin rec {
+ pname = "OctoPrint-Dashboard";
+ version = "1.13.0";
+
+ src = fetchFromGitHub {
+ owner = "StefanCohen";
+ repo = pname;
+ rev = version;
+ sha256 = "1879l05gkkryvhxkmhr3xvd10d4m7i0cr3jk1gdcv47xwyr6q9pf";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A dashboard for Octoprint";
+ homepage = "https://github.com/StefanCohen/OctoPrint-Dashboard";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ j0hax ];
+ };
+ };
}
diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix
index 25cd3a53670..7b1d3c302b1 100644
--- a/pkgs/applications/misc/timewarrior/default.nix
+++ b/pkgs/applications/misc/timewarrior/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "timewarrior";
- version = "1.3.0";
+ version = "1.4.2";
enableParallelBuilding = true;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "GothenburgBitFactory";
repo = "timewarrior";
rev = "v${version}";
- sha256 = "1aijh1ad7gpa61cn7b57w24vy7fyjj0zx5k9z8d6m1ldzbw589cl";
+ sha256 = "0qvhpva0hmhybn0c2aajndw5vnxar1jw4pjjajd2k2cr6vax29dw";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix
index 710d824df11..5c4df9880d9 100644
--- a/pkgs/applications/misc/zola/default.nix
+++ b/pkgs/applications/misc/zola/default.nix
@@ -1,22 +1,24 @@
-{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, CoreServices }:
+{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, oniguruma, CoreServices }:
rustPlatform.buildRustPackage rec {
pname = "zola";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "getzola";
repo = pname;
rev = "v${version}";
- sha256 = "137ak9gzcn3689fmcb90wa4szw43rh2m51mf26l77a5gksn5y6cn";
+ sha256 = "119ikgall6bv1r6h1pqcmc6nxkxld2lch04gk860zzk54jragbrp";
};
- cargoSha256 = "0v40bcqh48dlhdc0kz7wm3q9r3i1m6j9s74bfiv237dqx5dymmsg";
+ cargoSha256 = "1jx5bgfmbv0wljps1yv6yir2pjlb0vwzzba4i2sv32awv9y0q3v6";
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ openssl ]
+ buildInputs = [ openssl oniguruma ]
++ stdenv.lib.optional stdenv.isDarwin CoreServices;
+ RUSTONIG_SYSTEM_LIBONIG = true;
+
postInstall = ''
install -D -m 444 completions/zola.bash \
-t $out/share/bash-completion/completions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index d0937a9c6d4..4e3960ee729 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -1,7 +1,7 @@
-{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar
+{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, fetchurl
# default dependencies
-, bzip2, flac, speex, libopus
+, gnutar, bzip2, flac, speex, libopus
, libevent, expat, libjpeg, snappy
, libpng, libcap
, xdg_utils, yasm, nasm, minizip, libwebp
@@ -39,6 +39,7 @@
, cupsSupport ? true
, pulseSupport ? false, libpulseaudio ? null
+, channel
, upstream-info
}:
@@ -108,7 +109,7 @@ let
versionRange = min-version: upto-version:
let inherit (upstream-info) version;
result = versionAtLeast version min-version && versionOlder version upto-version;
- stable-version = (import ./upstream-info.nix).stable.version;
+ stable-version = (importJSON ./upstream-info.json).stable.version;
in if versionAtLeast stable-version upto-version
then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it."
result
@@ -116,10 +117,13 @@ let
base = rec {
name = "${packageName}-unwrapped-${version}";
- inherit (upstream-info) channel version;
- inherit packageName buildType buildPath;
+ inherit (upstream-info) version;
+ inherit channel packageName buildType buildPath;
- src = upstream-info.main;
+ src = fetchurl {
+ url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
+ inherit (upstream-info) sha256;
+ };
nativeBuildInputs = [
ninja which python2Packages.python perl pkgconfig
@@ -344,9 +348,11 @@ let
origRpath="$(patchelf --print-rpath "$chromiumBinary")"
patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary"
'';
+
+ passthru.updateScript = ./update.py;
};
# Remove some extraAttrs we supplied to the base attributes already.
in stdenv.mkDerivation (base // removeAttrs extraAttrs [
"name" "gnFlags" "buildTargets"
-])
+] // { passthru = base.passthru // (extraAttrs.passthru or {}); })
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index efaaefce65a..b04c3cce776 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,5 +1,5 @@
-{ newScope, config, stdenv, llvmPackages_10, llvmPackages_11
-, makeWrapper, ed, gnugrep, coreutils
+{ newScope, config, stdenv, fetchurl, makeWrapper
+, llvmPackages_10, llvmPackages_11, ed, gnugrep, coreutils
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
, libva ? null
, pipewire_0_2
@@ -31,10 +31,11 @@ let
chromium = rec {
inherit stdenv llvmPackages;
- upstream-info = (callPackage ./update.nix {}).getChannel channel;
+ upstream-info = (lib.importJSON ./upstream-info.json).${channel};
mkChromiumDerivation = callPackage ./common.nix ({
- inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone;
+ inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs
+ cupsSupport pulseSupport useOzone;
# TODO: Remove after we can update gn for the stable channel (backward incompatible changes):
gnChromium = gn.overrideAttrs (oldAttrs: {
version = "2020-05-19";
@@ -63,22 +64,33 @@ let
};
};
+ pkgSuffix = if channel == "dev" then "unstable" else channel;
+ pkgName = "google-chrome-${pkgSuffix}";
+ chromeSrc = fetchurl {
+ urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [
+ "https://dl.google.com/linux/chrome/deb/pool/main/g"
+ "http://95.31.35.30/chrome/pool/main/g"
+ "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g"
+ "http://repo.fdzh.org/chrome/deb/pool/main/g"
+ ];
+ sha256 = chromium.upstream-info.sha256bin64;
+ };
+
mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}";
- widevineCdm = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation {
+ widevineCdm = stdenv.mkDerivation {
name = "chrome-widevine-cdm";
- # The .deb file for Google Chrome
- src = upstream-info.binary;
+ src = chromeSrc;
phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
unpackCmd = let
widevineCdmPath =
- if upstream-info.channel == "stable" then
+ if channel == "stable" then
"./opt/google/chrome/WidevineCdm"
- else if upstream-info.channel == "beta" then
+ else if channel == "beta" then
"./opt/google/chrome-beta/WidevineCdm"
- else if upstream-info.channel == "dev" then
+ else if channel == "dev" then
"./opt/google/chrome-unstable/WidevineCdm"
else
throw "Unknown chromium channel.";
@@ -211,6 +223,7 @@ in stdenv.mkDerivation {
passthru = {
inherit (chromium) upstream-info browser;
mkDerivation = chromium.mkChromiumDerivation;
- inherit sandboxExecutableName;
+ inherit chromeSrc sandboxExecutableName;
+ updateScript = ./update.py;
};
}
diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix
deleted file mode 100644
index 6dff17c69dd..00000000000
--- a/pkgs/applications/networking/browsers/chromium/update.nix
+++ /dev/null
@@ -1,271 +0,0 @@
-let maybePkgs = import ../../../../../. {}; in
-
-{ stdenv ? maybePkgs.stdenv
-, runCommand ? maybePkgs.runCommand
-, fetchurl ? maybePkgs.fetchurl
-, writeText ? maybePkgs.writeText
-, curl ? maybePkgs.curl
-, cacert ? maybePkgs.cacert
-, nix ? maybePkgs.nix
-}:
-
-let
- inherit (stdenv) lib;
-
- sources = if builtins.pathExists ./upstream-info.nix
- then import ./upstream-info.nix
- else {};
-
- bucketURL = "https://commondatastorage.googleapis.com/"
- + "chromium-browser-official";
-
- mkVerURL = version: "${bucketURL}/chromium-${version}.tar.xz";
-
- debURL = "https://dl.google.com/linux/chrome/deb/pool/main/g";
-
- getDebURL = channelName: version: arch: mirror: let
- packageSuffix = if channelName == "dev" then "unstable" else channelName;
- packageName = "google-chrome-${packageSuffix}";
- in "${mirror}/${packageName}/${packageName}_${version}-1_${arch}.deb";
-
- # Untrusted mirrors, don't try to update from them!
- debMirrors = [
- "http://95.31.35.30/chrome/pool/main/g"
- "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g"
- "http://repo.fdzh.org/chrome/deb/pool/main/g"
- ];
-
-in {
- getChannel = channel: let
- chanAttrs = builtins.getAttr channel sources;
- in {
- inherit channel;
- inherit (chanAttrs) version;
-
- main = fetchurl {
- url = mkVerURL chanAttrs.version;
- inherit (chanAttrs) sha256;
- };
-
- binary = fetchurl (let
- mkUrls = arch: let
- mkURLForMirror = getDebURL channel chanAttrs.version arch;
- in map mkURLForMirror ([ debURL ] ++ debMirrors);
- in if stdenv.is64bit && chanAttrs ? sha256bin64 then {
- urls = mkUrls "amd64";
- sha256 = chanAttrs.sha256bin64;
- } else if !stdenv.is64bit && chanAttrs ? sha256bin32 then {
- urls = mkUrls "i386";
- sha256 = chanAttrs.sha256bin32;
- } else throw "No Chrome plugins are available for your architecture.");
- };
-
- update = let
- csv2nix = name: src: import (runCommand "${name}.nix" {
- src = builtins.fetchurl src;
- } ''
- esc() { echo "\"$(echo "$1" | sed -e 's/"\\$/\\&/')\""; } # ohai emacs "
- IFS=, read -r -a headings <<< "$(head -n1 "$src")"
- echo "[" > "$out"
- tail -n +2 "$src" | while IFS=, read -r -a line; do
- echo " {"
- for idx in "''${!headings[@]}"; do
- echo " $(esc "''${headings[idx]}") = $(esc ''${line[$idx]});"
- done
- echo " }"
- done >> "$out"
- echo "]" >> "$out"
- '');
-
- channels = lib.fold lib.recursiveUpdate {} (map (attrs: {
- ${attrs.os}.${attrs.channel} = attrs // {
- history = let
- drvName = "omahaproxy-${attrs.os}.${attrs.channel}-info";
- history = csv2nix drvName "http://omahaproxy.appspot.com/history";
- cond = h: attrs.os == h.os && attrs.channel == h.channel
- && lib.versionOlder h.version attrs.current_version;
- # Note that this is a *reverse* sort!
- sorter = a: b: lib.versionOlder b.version a.version;
- sorted = builtins.sort sorter (lib.filter cond history);
- in map (lib.flip removeAttrs ["os" "channel"]) sorted;
- version = attrs.current_version;
- };
- }) (csv2nix "omahaproxy-info" "http://omahaproxy.appspot.com/all?csv=1"));
-
- /*
- XXX: This is essentially the same as:
-
- builtins.tryEval (builtins.fetchurl url)
-
- ... except that tryEval on fetchurl isn't working and doesn't catch
- errors for fetchurl, so we go for a different approach.
-
- We only have fixed-output derivations that can have networking access, so
- we abuse SHA1 and its weaknesses to forge a fixed-output derivation which
- is not so fixed, because it emits different contents that have the same
- SHA1 hash.
-
- Using this method, we can distinguish whether the URL is available or
- whether it's not based on the actual content.
-
- So let's use tryEval as soon as it's working with fetchurl in Nix.
- */
- tryFetch = url: let
- # SHA1 hash collisions from https://shattered.io/static/shattered.pdf:
- collisions = runCommand "sha1-collisions" {
- outputs = [ "out" "good" "bad" ];
- base64 = ''
- QlpoOTFBWSZTWbL5V5MABl///////9Pv///v////+/////HDdK739/677r+W3/75rUNr4
- Aa/AAAAAAACgEVTRtQDQAaA0AAyGmjTQGmgAAANGgAaMIAYgGgAABo0AAAAAADQAIAGQ0
- MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk
- 0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIAN
- GgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRp
- o0GIGgBoGQAABVTUExEZATTICnkxNR+p6E09JppoyamjGhkm0ammIyaekbUejU9JiGnqZ
- qaaDxJ6m0JkZMQ2oaYmJ6gxqMyE2TUzJqfItligtJQJfYbl9Zy9QjQuB5mHQRdSSXCCTH
- MgmSDYmdOoOmLTBJWiCpOhMQYpQlOYpJjn+wQUJSTCEpOMekaFaaNB6glCC0hKEJdHr6B
- mUIHeph7YxS8WJYyGwgWnMTFJBDFSxSCCYljiEk7HZgJzJVDHJxMgY6tCEIIWgsKSlSZ0
- S8GckoIIF+551Ro4RCw260VCEpWJSlpWx/PMrLyVoyhWMAneDilBcUIeZ1j6NCkus0qUC
- Wnahhk5KT4GpWMh3vm2nJWjTL9Qg+84iExBJhNKpbV9tvEN265t3fu/TKkt4rXFTsV+Nc
- upJXhOhOhJMQQktrqt4K8mSh9M2DAO2X7uXGVL9YQxUtzQmS7uBndL7M6R7vX869VxqPu
- renSuHYNq1yTXOfNWLwgvKlRlFYqLCs6OChDp0HuTzCWscmGudLyqUuwVGG75nmyZhKpJ
- yOE/pOZyHyrZxGM51DYIN+Jc8yVJgAykxKCEtW55MlfudLg3KG6TtozalunXrroSxUpVL
- StWrWLFihMnVpkyZOrQnUrE6xq1CGtJlbAb5ShMbV1CZgqlKC0wCFCpMmUKSEkvFLaZC8
- wHOCVAlvzaJQ/T+XLb5Dh5TNM67p6KZ4e4ZSGyVENx2O27LzrTIteAreTkMZpW95GS0CE
- JYhMc4nToTJ0wQhKEyddaLb/rTqmgJSlkpnALxMhlNmuKEpkEkqhKUoEq3SoKUpIQcDgW
- lC0rYahMmLuPQ0fHqZaF4v2W8IoJ2EhMhYmSw7qql27WJS+G4rUplToFi2rSv0NSrVvDU
- pltQ8Lv6F8pXyxmFBSxiLSxglNC4uvXVKmAtusXy4YXGX1ixedEvXF1aX6t8adYnYCpC6
- rW1ZzdZYlCCxKEv8vpbqdSsXl8v1jCQv0KEPxPTa/5rtWSF1dSgg4z4KjfIMNtgwWoWLE
- sRhKxsSA9ji7V5LRPwtumeQ8V57UtFSPIUmtQdOQfseI2Ly1DMtk4Jl8n927w34zrWG6P
- i4jzC82js/46Rt2IZoadWxOtMInS2xYmcu8mOw9PLYxQ4bdfFw3ZPf/g2pzSwZDhGrZAl
- 9lqky0W+yeanadC037xk496t0Dq3ctfmqmjgie8ln9k6Q0K1krb3dK9el4Xsu44LpGcen
- r2eQZ1s1IhOhnE56WnXf0BLWn9Xz15fMkzi4kpVxiTKGEpffErEEMvEeMZhUl6yD1SdeJ
- YbxzGNM3ak2TAaglLZlDCVnoM6wV5DRrycwF8Zh/fRsdmhkMfAO1duwknrsFwrzePWeMw
- l107DWzymxdQwiSXx/lncnn75jL9mUzw2bUDqj20LTgtawxK2SlQg1CCZDQMgSpEqLjRM
- sykM9zbSIUqil0zNk7Nu+b5J0DKZlhl9CtpGKgX5uyp0idoJ3we9bSrY7PupnUL5eWiDp
- V5mmnNUhOnYi8xyClkLbNmAXyoWk7GaVrM2umkbpqHDzDymiKjetgzTocWNsJ2E0zPcfh
- t46J4ipaXGCfF7fuO0a70c82bvqo3HceIcRlshgu73seO8BqlLIap2z5jTOY+T2ucCnBt
- Atva3aHdchJg9AJ5YdKHz7LoA3VKmeqxAlFyEnQLBxB2PAhAZ8KvmuR6ELXws1Qr13Nd1
- i4nsp189jqvaNzt+0nEnIaniuP1+/UOZdyfoZh57ku8sYHKdvfW/jYSUks+0rK+qtte+p
- y8jWL9cOJ0fV8rrH/t+85/p1z2N67p/ZsZ3JmdyliL7lrNxZUlx0MVIl6PxXOUuGOeArW
- 3vuEvJ2beoh7SGyZKHKbR2bBWO1d49JDIcVM6lQtu9UO8ec8pOnXmkcponBPLNM2CwZ9k
- NC/4ct6rQkPkQHMcV/8XckU4UJCy+VeTA==
- '';
- } ''
- echo "$base64" | base64 -d | tar xj
- mv good.pdf "$good"
- mv bad.pdf "$bad"
- touch "$out"
- '';
-
- cacheVal = let
- urlHash = builtins.hashString "sha256" url;
- timeSlice = builtins.currentTime / 600;
- in "${urlHash}-${toString timeSlice}";
-
- in {
- success = import (runCommand "check-success" {
- result = stdenv.mkDerivation {
- name = "tryfetch-${cacheVal}";
- inherit url;
-
- outputHash = "d00bbe65d80f6d53d5c15da7c6b4f0a655c5a86a";
- outputHashMode = "flat";
- outputHashAlgo = "sha1";
-
- nativeBuildInputs = [ curl ];
- preferLocalBuild = true;
-
- inherit (collisions) good bad;
-
- buildCommand = ''
- if SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" \
- curl -s -L -f -I "$url" > /dev/null; then
- cp "$good" "$out"
- else
- cp "$bad" "$out"
- fi
- '';
-
- impureEnvVars = lib.fetchers.proxyImpureEnvVars;
- };
- inherit (collisions) good;
- } ''
- if cmp -s "$result" "$good"; then
- echo true > "$out"
- else
- echo false > "$out"
- fi
- '');
- value = builtins.fetchurl url;
- };
-
- fetchLatest = channel: let
- result = tryFetch (mkVerURL channel.version);
- in if result.success then result.value else fetchLatest (channel // {
- version = if channel.history != []
- then (lib.head channel.history).version
- else throw "Unfortunately there's no older version than " +
- "${channel.version} available for channel " +
- "${channel.channel} on ${channel.os}.";
- history = lib.tail channel.history;
- });
-
- getHash = path: import (runCommand "gethash.nix" {
- inherit path;
- nativeBuildInputs = [ nix ];
- } ''
- sha256="$(nix-hash --flat --base32 --type sha256 "$path")"
- echo "\"$sha256\"" > "$out"
- '');
-
- isLatest = channel: version: let
- ourVersion = sources.${channel}.version or null;
- in if ourVersion == null then false
- else lib.versionOlder version sources.${channel}.version
- || version == sources.${channel}.version;
-
- # We only support GNU/Linux right now.
- linuxChannels = let
- genLatest = channelName: channel: let
- newUpstream = {
- inherit (channel) version;
- sha256 = getHash (fetchLatest channel);
- };
- keepOld = let
- oldChannel = sources.${channelName};
- in {
- inherit (oldChannel) version sha256;
- } // lib.optionalAttrs (oldChannel ? sha256bin32) {
- inherit (oldChannel) sha256bin32;
- } // lib.optionalAttrs (oldChannel ? sha256bin64) {
- inherit (oldChannel) sha256bin64;
- };
- in if isLatest channelName channel.version then keepOld else newUpstream;
- in lib.mapAttrs genLatest channels.linux;
-
- getLinuxFlash = channelName: channel: let
- inherit (channel) version;
- fetchArch = arch: tryFetch (getDebURL channelName version arch debURL);
- packages = lib.genAttrs ["i386" "amd64"] fetchArch;
- isNew = arch: attr: !(builtins.hasAttr attr channel)
- && packages.${arch}.success;
- in channel // lib.optionalAttrs (isNew "i386" "sha256bin32") {
- sha256bin32 = getHash (packages.i386.value);
- } // lib.optionalAttrs (isNew "amd64" "sha256bin64") {
- sha256bin64 = getHash (packages.amd64.value);
- };
-
- newChannels = lib.mapAttrs getLinuxFlash linuxChannels;
-
- dumpAttrs = indent: attrs: let
- mkVal = val: if lib.isAttrs val then dumpAttrs (indent + 1) val
- else "\"${lib.escape ["$" "\\" "\""] (toString val)}\"";
- mkIndent = level: lib.concatStrings (builtins.genList (_: " ") level);
- mkAttr = key: val: "${mkIndent (indent + 1)}${key} = ${mkVal val};\n";
- attrLines = lib.mapAttrsToList mkAttr attrs;
- in "{\n" + (lib.concatStrings attrLines) + (mkIndent indent) + "}";
- in writeText "chromium-new-upstream-info.nix" ''
- # This file is autogenerated from update.sh in the same directory.
- ${dumpAttrs 0 newChannels}
- '';
-}
diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py
new file mode 100755
index 00000000000..0a0d512004b
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/update.py
@@ -0,0 +1,63 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i python -p python3 nix
+
+import csv
+import json
+import subprocess
+from codecs import iterdecode
+from os.path import abspath, dirname
+from sys import stderr
+from urllib.request import urlopen
+
+HISTORY_URL = 'https://omahaproxy.appspot.com/history?os=linux'
+DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g'
+BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official'
+
+JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json'
+
+def load_json(path):
+ with open(path, 'r') as f:
+ return json.load(f)
+
+def nix_prefetch_url(url, algo='sha256'):
+ print(f'nix-prefetch-url {url}')
+ out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url])
+ return out.decode('utf-8').rstrip()
+
+channels = {}
+last_channels = load_json(JSON_PATH)
+
+print(f'GET {HISTORY_URL}', file=stderr)
+with urlopen(HISTORY_URL) as resp:
+ builds = csv.DictReader(iterdecode(resp, 'utf-8'))
+ for build in builds:
+ channel_name = build['channel']
+
+ # If we've already found a newer build for this channel, we're
+ # no longer interested in it.
+ if channel_name in channels:
+ continue
+
+ # If we're back at the last build we used, we don't need to
+ # keep going -- there's no new version available, and we can
+ # just reuse the info from last time.
+ if build['version'] == last_channels[channel_name]['version']:
+ channels[channel_name] = last_channels[channel_name]
+ continue
+
+ channel = {'version': build['version']}
+ suffix = 'unstable' if channel_name == 'dev' else channel_name
+
+ try:
+ channel['sha256'] = nix_prefetch_url(f'{BUCKET_URL}/chromium-{build["version"]}.tar.xz')
+ channel['sha256bin64'] = nix_prefetch_url(f'{DEB_URL}/google-chrome-{suffix}/google-chrome-{suffix}_{build["version"]}-1_amd64.deb')
+ except subprocess.CalledProcessError:
+ # This build isn't actually available yet. Continue to
+ # the next one.
+ continue
+
+ channels[channel_name] = channel
+
+with open(JSON_PATH, 'w') as out:
+ json.dump(channels, out, indent=2)
+ out.write('\n')
diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh
deleted file mode 100755
index ea67a62c107..00000000000
--- a/pkgs/applications/networking/browsers/chromium/update.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-cd "$(dirname "$0")"
-sp="$(nix-build --builders "" -Q --no-out-link update.nix -A update)"
-cat "$sp" > upstream-info.nix
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
new file mode 100644
index 00000000000..6365a4eafd6
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -0,0 +1,17 @@
+{
+ "beta": {
+ "version": "86.0.4240.22",
+ "sha256": "1qxacdwknrjwfp44mnqmq24n8sw4yaf0d1qnz39km2m4apc39svp",
+ "sha256bin64": "05qdzkq9daqjliqj7zxsa03903rv3kwaj627192ls6m33bacz9gp"
+ },
+ "dev": {
+ "version": "86.0.4240.8",
+ "sha256": "1x0kbc7xp6599jyn461mbmchbixivnxm0jsyfq0snhxz8x81z55q",
+ "sha256bin64": "0y7drzxxfn0vmfq0m426l8xvkgyajb8pjydi0d7kzk6i92sjf45j"
+ },
+ "stable": {
+ "version": "85.0.4183.83",
+ "sha256": "0fz781bxx1rnjwfix2dgzq5w1lg3x6a9vd9k49gh4z5q092slr10",
+ "sha256bin64": "0fa3la2nvqr0w40j2qkbwnh36924fsp2ajsla6aky6hz08mq2q1g"
+ }
+}
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
deleted file mode 100644
index 5639ff2b679..00000000000
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is autogenerated from update.sh in the same directory.
-{
- beta = {
- sha256 = "0fz781bxx1rnjwfix2dgzq5w1lg3x6a9vd9k49gh4z5q092slr10";
- sha256bin64 = "12nm7h70pbzwc5rc7kcwfwgjs0h8cdnys5wlfjkbq6irwb6m1lm6";
- version = "85.0.4183.83";
- };
- dev = {
- sha256 = "16yj47x580i8p88m88f5bcs85qmrfwmyp9na7yrnk0lnq06wbj4i";
- sha256bin64 = "0i81xcfdn65j2i4vfx52v4a9vlar8y9ykqdhshymqfz4qqqk37d1";
- version = "86.0.4238.0";
- };
- stable = {
- sha256 = "0fz781bxx1rnjwfix2dgzq5w1lg3x6a9vd9k49gh4z5q092slr10";
- sha256bin64 = "0fa3la2nvqr0w40j2qkbwnh36924fsp2ajsla6aky6hz08mq2q1g";
- version = "85.0.4183.83";
- };
-}
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index ce9365f72fe..37b36e5e629 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
- ffversion = "80.0";
+ ffversion = "80.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "3rw30gs1wvd6m2sgsp1wm29rrbkxyf3jsdy8i0azfz9w7hqcfwnv76j3cdf18xghh954hpn3q6w1hr7pgab3z9zjxzyfcnh2mbabyvc";
+ sha512 = "081sf41r7ickjij3kfrdq29a0d6wz7qv8950kx116kakh8qxgjy8ahk2mfwlcp6digrl4mimi8rl7ns1wjngsmrjh4lvqzh1xglx9cp";
};
patches = [
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index fa19c4efa9d..4d985e33e6b 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -72,7 +72,7 @@ in stdenv.mkDerivation {
name = "google-chrome${suffix}-${version}";
- src = chromium.upstream-info.binary;
+ src = chromium.chromeSrc;
nativeBuildInputs = [ patchelf makeWrapper ];
buildInputs = [
diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index f713d8a8a6d..3b3794e9538 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helmfile";
- version = "0.125.7";
+ version = "0.128.0";
src = fetchFromGitHub {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
- sha256 = "1m030gjrd98z4vbj7l927qi55vgr11czrb8wmw56ifkqwfi6h9hi";
+ sha256 = "1ihvjbh3v91wxny9jq0x9qi3s2zzdpg96w1vrhiim43nnv0ydg1y";
};
- vendorSha256 = "0w72nlf26k64cq1hrqycks0pyp18y4wh3h40jpn5qnysi5pb2ndj";
+ vendorSha256 = "181iksfadjqrgsia8zy0zf5lr4h732s7hxjjfkr4gac586dlbj0w";
doCheck = false;
diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix
index 52e483424f1..5199bbfaf33 100644
--- a/pkgs/applications/networking/cluster/jx/default.nix
+++ b/pkgs/applications/networking/cluster/jx/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "jx";
- version = "2.1.127";
+ version = "2.1.138";
src = fetchFromGitHub {
owner = "jenkins-x";
repo = "jx";
rev = "v${version}";
- sha256 = "01dfpnqgbrn8b6h2irq080xdm76b4jx6sd80f8x4zmyaz6hf5vlv";
+ sha256 = "1i45gzaql6rfplliky56lrzwjnm2qzv25kgyq7gvn9c7hjaaq65b";
};
- vendorSha256 = "0la92a8720l8my5r4wsbgv74y6m19ikmm0wv3l4m4w5gjyplfsxb";
+ vendorSha256 = "1wvggarakshpw7m8h0x2zvd6bshd2kzbrjynfa113z90pgksvjng";
doCheck = false;
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 00b314b6cbb..b319ee57b95 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -11,9 +11,9 @@
buildGoModule rec {
pname = "minikube";
- version = "1.12.3";
+ version = "1.13.0";
- vendorSha256 = "014zgkh1l6838s5bmcxpvvyap96sd8ammrz5d7fncx0afik7zc4m";
+ vendorSha256 = "09bcp7pqbs9j06z1glpad70dqlsnrf69vn75l00bdjknbrvbzrb9";
doCheck = false;
@@ -21,7 +21,7 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "0z8hinhx521rphcm0cd5lli5jy09lw1jw63q2a4fqlmhpw39qrj9";
+ sha256 = "1xlz07q0nlsq6js58b5ad0wxajwganaqcvwglj4w6fgmiqm9s1ny";
};
nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];
diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index 93356dfb4f8..40b67484360 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rssguard";
- version = "3.7.0";
+ version = "3.7.2";
src = fetchFromGitHub {
owner = "martinrotter";
repo = pname;
rev = version;
- sha256 = "1maiazjsnjalx09rq1l84kd86s48cvljnwynv4rj6cln1h0al030";
+ sha256 = "1l2ra06am6bgwb4q200lhi64sz3np1dzf2vpjh10znxbx0mahbq6";
};
buildInputs = [ qtwebengine qttools ];
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 73f2ab25264..867a49e47b3 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,7 +1,7 @@
{ callPackage, libsForQt5 }:
let
- stableVersion = "2.2.12";
+ stableVersion = "2.2.13";
previewVersion = stableVersion;
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
@@ -26,8 +26,8 @@ let
};
mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
- guiSrcHash = "05nnil8ljyj6h366yrniv6syznhhbnb7nzjkz5785rb9pzjizs19";
- serverSrcHash = "0gmfdnymiw4w13qbcsvd71yj3hc9640n43c305vq39hahvsn7rvc";
+ guiSrcHash = "1vhch8hgbzdfmgpxlzgdasv6lxgl7rs96n5v4mn2pcccvfmbqj66";
+ serverSrcHash = "1vlnhlcnjh0kd623zxjjgkvln0rn5zr43zn00vkvbzwc9cgm2jxz";
in {
guiStable = mkGui {
stable = true;
diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix
index 2abd733b277..68e7282870b 100644
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -59,6 +59,9 @@ rustPlatform.buildRustPackage rec {
gst_all_1.gst-editing-services
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base
+ (gst_all_1.gst-plugins-good.override {
+ gtkSupport = true;
+ })
gst_all_1.gstreamer
gst_all_1.gst-validate
gtk3
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index 66d028144ff..e84e8496741 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -7,11 +7,11 @@
mkDerivation rec {
pname = "skrooge";
- version = "2.22.1";
+ version = "2.23.0";
src = fetchurl {
url = "http://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz";
- sha256 = "194vwnc2fi7cgdhasxpr1gxjqqsiqadhadvv43d0lxaxys6f360h";
+ sha256 = "10k3j67x5xm5whsvb84k9p70bkn4jbbbvdfan7q49dh2mmpair5a";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix
index 3f362e6d46a..c331acbfe70 100644
--- a/pkgs/applications/science/biology/star/default.nix
+++ b/pkgs/applications/science/biology/star/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "star";
- version = "2.7.4a";
+ version = "2.7.5c";
src = fetchFromGitHub {
repo = "STAR";
owner = "alexdobin";
rev = version;
- sha256 = "1y4g7h6f95pa9g8kv1aihrfglavqymdx4mnqh6ascs50ibm7zdmz";
+ sha256 = "1plx9akrzwjk7f2j94l9ss0apg0asqmrf2bp0728d4bvlhnzmjyy";
};
sourceRoot = "source/source";
diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix
index c068225bb6b..65caff82ead 100644
--- a/pkgs/applications/science/math/geogebra/geogebra6.nix
+++ b/pkgs/applications/science/math/geogebra/geogebra6.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec{
name = "geogebra-${version}";
- version = "6-0-598-0";
+ version = "6-0-600-0";
src = fetchurl {
urls = [
"https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
- "https://web.archive.org/web/20200815132422/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
+ "https://web.archive.org/web/20200904093945/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
];
- sha256 = "1klazsgrpmfd6vjzpdcfl5x8qhhbh6vx2g6id4vg16ac4sjdrb0c";
+ sha256 = "1l49rvfkil2cz6r7sa2mi0p6hvb6p66jv3x6xj8hjqls4l3sfhkm";
};
dontConfigure = true;
diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix
index 9a24496c6ad..b868706a05f 100644
--- a/pkgs/applications/science/misc/rink/default.nix
+++ b/pkgs/applications/science/misc/rink/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses }:
rustPlatform.buildRustPackage rec {
- version = "0.5.0";
+ version = "0.5.1";
pname = "rink";
src = fetchFromGitHub {
owner = "tiffany352";
repo = "rink-rs";
rev = "v${version}";
- sha256 = "1z51n25hmgqkn4bm9yj18j8p4pk5i1x3f3z70vl1vx3v109jhff0";
+ sha256 = "1s67drjzd4cf93hpm7b2facfd6y1x0s60aq6pygj7i02bm0cb9l9";
};
- cargoSha256 = "0p63py8q4iqj5rrsir9saj7dvkrafx63z493k7p5xb2mah7b21lb";
+ cargoSha256 = "1wd70y13lly7nccaqlv7w8znxfal0fzyf9d67y5c3aikj7hkzfin";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ncurses ];
diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix
index 12b63f7c387..b3af66c3ffd 100644
--- a/pkgs/applications/version-management/git-and-tools/delta/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "delta";
- version = "0.4.1";
+ version = "0.4.3";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
- sha256 = "15vpmalv2195aff3xd85nr99xn2dbc0k1lmlf7xp293s79kibrz7";
+ sha256 = "0g7jg6bxxihplxzq3ixdm24d36xd7xlwpazz8qj040m981cj123i";
};
- cargoSha256 = "0vgjijrxpfrgwh17dpxhgq8jdr6f9cj0mkr5ni9m3w8qv545a1ix";
+ cargoSha256 = "0q73adygyddjyajwwbkrhwss4f8ynxsga5yz4ac5fk5rzmda75rv";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 70169bd90e5..5005b9137a8 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
buildGoPackage rec {
pname = "gitea";
- version = "1.12.3";
+ version = "1.12.4";
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
- sha256 = "05z1pp2lnbr82pw97wy0j0qk2vv1qv9c46df13d03xdfsc3gsm50";
+ sha256 = "0zz3mwf1yhncvi6pl52lcwbl7k4kkrqyw8q3476akwszjn79n83c";
};
unpackPhase = ''
diff --git a/pkgs/applications/version-management/gitea/static-root-path.patch b/pkgs/applications/version-management/gitea/static-root-path.patch
index 985dbe04082..e486397d9cf 100644
--- a/pkgs/applications/version-management/gitea/static-root-path.patch
+++ b/pkgs/applications/version-management/gitea/static-root-path.patch
@@ -1,13 +1,13 @@
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
-index 714015c47..a2f85337e 100644
+index 45e55a2..9d18ee4 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
-@@ -641,7 +641,7 @@ func NewContext() {
- PortToRedirect = sec.Key("PORT_TO_REDIRECT").MustString("80")
+@@ -667,7 +667,7 @@ func NewContext() {
OfflineMode = sec.Key("OFFLINE_MODE").MustBool()
DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool()
-- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(AppWorkPath)
-+ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@")
+ if len(StaticRootPath) == 0 {
+- StaticRootPath = AppWorkPath
++ StaticRootPath = "@data@"
+ }
+ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(StaticRootPath)
StaticCacheTime = sec.Key("STATIC_CACHE_TIME").MustDuration(6 * time.Hour)
- AppDataPath = sec.Key("APP_DATA_PATH").MustString(path.Join(AppWorkPath, "data"))
- EnableGzip = sec.Key("ENABLE_GZIP").MustBool()
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 6457ac3af0d..dedddb6b39d 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -3,7 +3,7 @@
, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
, nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus
, makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid
-, e2fsprogs, krb5
+, e2fsprogs, krb5, libdrm, mesa
}:
with stdenv.lib;
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "gitkraken";
- version = "7.2.0";
+ version = "7.3.0";
src = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
- sha256 = "0nrrcwikx6dx1j1s0b80gh1s932zvxmijpddqp6a1vh3ddc5v1mp";
+ sha256 = "0q9imaka79p3krmcrxvnxzb2gprczybnw8d4y9p4icbmdbyb6h70";
};
dontBuild = true;
@@ -61,6 +61,8 @@ stdenv.mkDerivation rec {
libuuid
e2fsprogs
krb5
+ libdrm
+ mesa
];
desktopItem = makeDesktopItem {
diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix
index 7f2b8551151..d22657d651c 100644
--- a/pkgs/applications/video/catt/default.nix
+++ b/pkgs/applications/video/catt/default.nix
@@ -1,12 +1,19 @@
-{ buildPythonApplication, fetchPypi, lib
-, youtube-dl
-, PyChromecast
-, click
-, ifaddr
-, requests
-}:
+{ lib, python3 }:
-buildPythonApplication rec {
+let
+ py = python3.override {
+ packageOverrides = self: super: {
+ PyChromecast = super.PyChromecast.overridePythonAttrs (oldAttrs: rec {
+ version = "6.0.0";
+ src = oldAttrs.src.override {
+ inherit version;
+ sha256 = "05f8r3b2pdqbl76hwi5sv2xdi1r7g9lgm69x8ja5g22mn7ysmghm";
+ };
+ });
+ };
+ };
+
+in with py.pkgs; buildPythonApplication rec {
pname = "catt";
version = "0.11.0";
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 4a09cac9344..a1f3b3708a4 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig
-, wayland, libGL, mesa, libxkbcommon, cairo, libxcb
+{ stdenv, fetchurl, meson, ninja, pkg-config, wayland
+, libGL, mesa, libxkbcommon, cairo, libxcb
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev
, colord, lcms2, pipewire ? null
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
@@ -10,14 +10,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "weston";
- version = "8.0.0";
+ version = "9.0.0";
src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
- sha256 = "0j3q0af3595g4wcicldgy749zm2g2b6bswa6ya8k075a5sdv863m";
+ sha256 = "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw";
};
- nativeBuildInputs = [ meson ninja pkgconfig ];
+ nativeBuildInputs = [ meson ninja pkg-config wayland ];
buildInputs = [
wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva
@@ -45,9 +45,19 @@ stdenv.mkDerivation rec {
passthru.providedSessions = [ "weston" ];
meta = {
- description = "Reference implementation of a Wayland compositor";
- homepage = "https://wayland.freedesktop.org/";
- license = licenses.mit;
+ description = "A lightweight and functional Wayland compositor";
+ longDescription = ''
+ Weston is the reference implementation of a Wayland compositor, as well
+ as a useful environment in and of itself.
+ Out of the box, Weston provides a very basic desktop, or a full-featured
+ environment for non-desktop uses such as automotive, embedded, in-flight,
+ industrial, kiosks, set-top boxes and TVs. It also provides a library
+ allowing other projects to build their own full-featured environments on
+ top of Weston's core. A small suite of example or demo clients are also
+ provided.
+ '';
+ homepage = "https://gitlab.freedesktop.org/wayland/weston";
+ license = licenses.mit; # Expat version
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ];
};
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 786f0f9c598..1aab26532a4 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -311,7 +311,7 @@ stdenv.mkDerivation {
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
- substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
+ substituteAll ${if stdenv.isDarwin then ../wrapper-common/utils.bash.darwin else ../wrapper-common/utils.bash} $out/nix-support/utils.bash
''
##
diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix
index 6b9aa9a8c4a..6aaa0338f0c 100644
--- a/pkgs/build-support/release/default.nix
+++ b/pkgs/build-support/release/default.nix
@@ -41,10 +41,6 @@ rec {
doCoverityAnalysis = true;
} // args);
- gcovReport = args: import ./gcov-report.nix (
- { inherit runCommand lcov rsync;
- } // args);
-
rpmBuild = args: import ./rpm-build.nix (
{ inherit vmTools;
} // args);
diff --git a/pkgs/build-support/release/gcov-report.nix b/pkgs/build-support/release/gcov-report.nix
deleted file mode 100644
index 8ce5c0488a7..00000000000
--- a/pkgs/build-support/release/gcov-report.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ runCommand, lcov, rsync, coverageRuns, lcovFilter ? [ "/nix/store/*" ], baseDirHack ? false }:
-
-runCommand "coverage"
- { buildInputs = [ lcov rsync ];
- inherit lcovFilter baseDirHack;
- }
- ''
- mkdir -p $TMPDIR/gcov $out/nix-support $out/coverage
- info=$out/coverage/full.info
-
- for p in ${toString coverageRuns}; do
- if [ -f $p/nix-support/hydra-build-products ]; then
- cat $p/nix-support/hydra-build-products >> $out/nix-support/hydra-build-products
- fi
-
- [ ! -e $p/nix-support/failed ] || touch $out/nix-support/failed
-
- opts=
- for d in $p/coverage-data/*; do
- for i in $(cd $d/nix/store && ls); do
- if ! [ -e /nix/store/$i/.build ]; then continue; fi
- if [ -e $TMPDIR/gcov/nix/store/$i ]; then continue; fi
- echo "copying $i..."
- rsync -a /nix/store/$i/.build/* $TMPDIR/gcov/
- if [ -n "$baseDirHack" ]; then
- opts="-b $TMPDIR/gcov/$(cd /nix/store/$i/.build && ls)"
- fi
- done
-
- for i in $(cd $d/nix/store && ls); do
- rsync -a $d/nix/store/$i/.build/* $TMPDIR/gcov/ --include '*/' --include '*.gcda' --exclude '*'
- done
- done
-
- chmod -R u+w $TMPDIR/gcov
-
- echo "producing info..."
- geninfo --ignore-errors source,gcov $TMPDIR/gcov --output-file $TMPDIR/app.info $opts
- cat $TMPDIR/app.info >> $info
- done
-
- echo "making report..."
- set -o noglob
- lcov --remove $info ''$lcovFilter > $info.tmp
- set +o noglob
- mv $info.tmp $info
- genhtml --show-details $info -o $out/coverage
- echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products
- ''
diff --git a/pkgs/build-support/wrapper-common/utils.bash.darwin b/pkgs/build-support/wrapper-common/utils.bash.darwin
new file mode 100644
index 00000000000..8c4680a8e44
--- /dev/null
+++ b/pkgs/build-support/wrapper-common/utils.bash.darwin
@@ -0,0 +1,92 @@
+# Accumulate suffixes for taking in the right input parameters with the `mangle*`
+# functions below. See setup-hook for details.
+accumulateRoles() {
+ declare -ga role_suffixes=()
+ if [ "${NIX_@wrapperName@_TARGET_BUILD_@suffixSalt@:-}" ]; then
+ role_suffixes+=('_FOR_BUILD')
+ fi
+ if [ "${NIX_@wrapperName@_TARGET_HOST_@suffixSalt@:-}" ]; then
+ role_suffixes+=('')
+ fi
+ if [ "${NIX_@wrapperName@_TARGET_TARGET_@suffixSalt@:-}" ]; then
+ role_suffixes+=('_FOR_TARGET')
+ fi
+}
+
+mangleVarList() {
+ local var="$1"
+ shift
+ local -a role_suffixes=("$@")
+
+ local outputVar="${var}_@suffixSalt@"
+ declare -gx ${outputVar}+=''
+ # For each role we serve, we accumulate the input parameters into our own
+ # cc-wrapper-derivation-specific environment variables.
+ for suffix in "${role_suffixes[@]}"; do
+ local inputVar="${var}${suffix}"
+ if [ -v "$inputVar" ]; then
+ export ${outputVar}+="${!outputVar:+ }${!inputVar}"
+ fi
+ done
+}
+
+mangleVarBool() {
+ local var="$1"
+ shift
+ local -a role_suffixes=("$@")
+
+ local outputVar="${var}_@suffixSalt@"
+ declare -gxi ${outputVar}+=0
+ for suffix in "${role_suffixes[@]}"; do
+ local inputVar="${var}${suffix}"
+ if [ -v "$inputVar" ]; then
+ # "1" in the end makes `let` return success error code when
+ # expression itself evaluates to zero.
+ # We don't use `|| true` because that would silence actual
+ # syntax errors from bad variable values.
+ let "${outputVar} |= ${!inputVar:-0}" "1"
+ fi
+ done
+}
+
+skip () {
+ if (( "${NIX_DEBUG:-0}" >= 1 )); then
+ echo "skipping impure path $1" >&2
+ fi
+}
+
+
+# Checks whether a path is impure. E.g., `/lib/foo.so' is impure, but
+# `/nix/store/.../lib/foo.so' isn't.
+badPath() {
+ local p=$1
+
+ # Relative paths are okay (since they're presumably relative to
+ # the temporary build directory).
+ if [ "${p:0:1}" != / ]; then return 1; fi
+
+ # Otherwise, the path should refer to the store or some temporary
+ # directory (including the build directory).
+ test \
+ "$p" != "/dev/null" -a \
+ "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \
+ "${p:0:4}" != "/tmp" -a \
+ "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP"
+}
+
+expandResponseParams() {
+ declare -ga params=("$@")
+ local arg
+ for arg in "$@"; do
+ if [[ "$arg" == @* ]]; then
+ # phase separation makes this look useless
+ # shellcheck disable=SC2157
+ if [ -x "@expandResponseParams@" ]; then
+ # params is used by caller
+ #shellcheck disable=SC2034
+ readarray -d '' params < <("@expandResponseParams@" "$@")
+ return 0
+ fi
+ fi
+ done
+}
diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix
index 01443578057..8fe21aabe36 100644
--- a/pkgs/data/icons/iconpack-obsidian/default.nix
+++ b/pkgs/data/icons/iconpack-obsidian/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }:
+{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, mint-x-icons, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "iconpack-obsidian";
- version = "4.12";
+ version = "4.13";
src = fetchFromGitHub {
owner = "madmaxms";
repo = pname;
rev = "v${version}";
- sha256 = "0139ps707mh1zkypaxsqzy58mmsm5whdxxx2nbsmqfswb7qisz2b";
+ sha256 = "1hh0hnd2d08l4n5r73fkngv08f8230pp94k9qq8xgmchvjfg6j8y";
};
nativeBuildInputs = [ gtk3 ];
- propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ];
- # still missing parent themes: Ambiant-MATE, Mint-X, Faenza-Dark, KFaenza
+ propagatedBuildInputs = [ gnome-icon-theme mint-x-icons hicolor-icon-theme ];
+ # still missing parent themes: Ambiant-MATE, Faenza-Dark, KFaenza
dontDropIconThemeCache = true;
diff --git a/pkgs/data/icons/iso-flags/default.nix b/pkgs/data/icons/iso-flags/default.nix
new file mode 100644
index 00000000000..b329a151c72
--- /dev/null
+++ b/pkgs/data/icons/iso-flags/default.nix
@@ -0,0 +1,47 @@
+{ stdenv
+, fetchFromGitHub
+, perl
+, perlPackages
+, inkscape
+, pngcrush
+, librsvg
+, targets ? [ "all" ]
+}:
+
+stdenv.mkDerivation {
+ pname = "iso-flags";
+ version = "unstable-18012020";
+
+ src = fetchFromGitHub {
+ owner = "joielechong";
+ repo = "iso-country-flags-svg-collection";
+ rev = "9ebbd577b9a70fbfd9a1931be80c66e0d2f31a9d";
+ sha256 = "17bm7w4md56xywixfvp7vr3d6ihvxk3383i9i4rpmgm6qa9dyxdl";
+ };
+
+ nativeBuildInputs = [
+ perl
+ inkscape
+ librsvg
+ (perl.withPackages(pp: with pp; [ JSON XMLLibXML ]))
+ ];
+
+ postPatch = ''
+ patchShebangs .
+ '';
+
+ buildFlags = targets;
+
+ installPhase = ''
+ mkdir -p $out/share
+ mv build $out/share/iso-flags
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/joielechong/iso-country-flags-svg-collection";
+ description = "248 country flag SVG & PNG icons with different icon styles";
+ license = [ licenses.publicDomain ];
+ platforms = platforms.linux; # the output assets should work anywhere, but unsure about the tools to build them...
+ maintainers = [ maintainers.mkg20001 ];
+ };
+}
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
new file mode 100644
index 00000000000..a67f04473c8
--- /dev/null
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@@ -0,0 +1,156 @@
+{ atk
+, autoreconfHook
+, cacert
+, fetchpatch
+, dbus
+, cinnamon-control-center
+, cinnamon-desktop
+, cinnamon-menus
+, cjs
+, fetchFromGitHub
+, gdk-pixbuf
+, libgnomekbd
+, glib
+, gobject-introspection
+, gtk3
+, intltool
+, json-glib
+, callPackage
+, libsoup
+, libstartup_notification
+, libXtst
+, muffin
+, networkmanager
+, pkgconfig
+, polkit
+, stdenv
+, wrapGAppsHook
+, libxml2
+, gtk-doc
+, gnome3
+, python3
+, keybinder3
+, cairo
+, xapps
+, upower
+, nemo
+, libnotify
+, accountsservice
+, gnome-online-accounts
+, glib-networking
+, pciutils
+, timezonemap
+}:
+
+let
+ libcroco = callPackage ./libcroco.nix { };
+in
+stdenv.mkDerivation rec {
+ pname = "cinnamon-common";
+ version = "4.4.1";
+
+ src = fetchFromGitHub {
+ owner = "linuxmint";
+ repo = "cinnamon";
+ rev = version;
+ sha256 = "0sv7nqd1l6c727qj30dcgdkvfh1wxpszpgmbdyh58ilmc8xklnqd";
+ };
+
+ patches = [
+ # remove dbus-glib
+ (fetchpatch {
+ url = "https://github.com/linuxmint/cinnamon/commit/ce99760fa15c3de2e095b9a5372eeaca646fbed1.patch";
+ sha256 = "0p2sbdi5w7sgblqbgisb6f8lcj1syzq5vlk0ilvwaqayxjylg8gz";
+ })
+ ];
+
+ buildInputs = [
+ # TODO: review if we really need this all
+ (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss pam pexpect ]))
+ atk
+ cacert
+ cinnamon-control-center
+ cinnamon-desktop
+ cinnamon-menus
+ cjs
+ dbus
+ gdk-pixbuf
+ glib
+ gtk3
+ json-glib
+ libcroco
+ libsoup
+ libstartup_notification
+ libXtst
+ muffin
+ networkmanager
+ pkgconfig
+ polkit
+ libxml2
+ libgnomekbd
+
+ # bindings
+ cairo
+ gnome3.caribou
+ keybinder3
+ upower
+ xapps
+ timezonemap
+ nemo
+ libnotify
+ accountsservice
+
+ # gsi bindings
+ gnome-online-accounts
+ glib-networking # for goa
+ ];
+
+ nativeBuildInputs = [
+ gobject-introspection
+ autoreconfHook
+ wrapGAppsHook
+ intltool
+ gtk-doc
+ ];
+
+ autoreconfPhase = ''
+ GTK_DOC_CHECK=false NOCONFIGURE=1 bash ./autogen.sh
+ '';
+
+ configureFlags = [ "--disable-static" "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt" "--with-libxml=${libxml2.dev}/include/libxml2" "--enable-gtk-doc=no" ];
+
+ postPatch = ''
+ substituteInPlace src/Makefile.am \
+ --replace "\$(libdir)/muffin" "${muffin}/lib/muffin"
+ patchShebangs autogen.sh
+
+ find . -type f -exec sed -i \
+ -e s,/usr/share/cinnamon,$out/share/cinnamon,g \
+ -e s,/usr/share/locale,/run/current-system/sw/share/locale,g \
+ {} +
+
+ sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py
+
+ sed "s|/usr/bin/upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
+ sed "s|upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
+
+ sed "s|/usr/bin/cinnamon-control-center|${cinnamon-control-center}/bin/cinnamon-control-center|g" -i ./files/usr/bin/cinnamon-settings
+ # this one really IS optional
+ sed "s|/usr/bin/gnome-control-center|/run/current-system/sw/bin/gnome-control-center|g" -i ./files/usr/bin/cinnamon-settings
+
+ sed "s|\"/usr/lib\"|\"${cinnamon-control-center}/lib\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
+
+ # another bunch of optional stuff
+ sed "s|/usr/bin|/run/current-system/sw/bin|g" -i ./files/usr/bin/cinnamon-launcher
+
+ sed 's|"lspci"|"${pciutils}/bin/lspci"|g' -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/linuxmint/cinnamon";
+ description = "The Cinnamon desktop environment";
+ license = [ licenses.gpl2 ];
+ platforms = platforms.linux;
+ maintainers = [ maintainers.mkg20001 ];
+ };
+}
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix b/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix
new file mode 100644
index 00000000000..c6f6e350c9f
--- /dev/null
+++ b/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, glib, gnome3 }:
+
+stdenv.mkDerivation rec {
+ pname = "libcroco";
+ version = "0.6.13";
+
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn";
+ };
+
+ outputs = [ "out" "dev" ];
+ outputBin = "dev";
+
+ configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libxml2 glib ];
+
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
+
+ meta = with stdenv.lib; {
+ description = "GNOME CSS2 parsing and manipulation toolkit";
+ homepage = https://gitlab.gnome.org/GNOME/libcroco;
+ license = licenses.lgpl2;
+ platforms = platforms.unix;
+ };
+}
+
diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
new file mode 100644
index 00000000000..97f0138de98
--- /dev/null
+++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
@@ -0,0 +1,111 @@
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, autoreconfHook
+, glib
+, dbus
+, gettext
+, cinnamon-desktop
+, cinnamon-common
+, intltool
+, libxslt
+, gtk3
+, libnotify
+, libxkbfile
+, cinnamon-menus
+, libgnomekbd
+, libxklavier
+, networkmanager
+, libwacom
+, gnome3
+, libtool
+, wrapGAppsHook
+, tzdata
+, glibc
+, gobject-introspection
+, python3
+, pam
+, accountsservice
+, cairo
+, xapps
+, xorg
+, iso-flags-png-320x420
+}:
+
+stdenv.mkDerivation rec {
+ pname = "cinnamon-screensaver";
+ version = "4.4.0";
+
+ src = fetchFromGitHub {
+ owner = "linuxmint";
+ repo = pname;
+ rev = version;
+ sha256 = "03v41wk1gmgmyl31j7a3pav52gfv2faibj1jnpj3ycwcv4cch5w5";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+ autoreconfHook
+ wrapGAppsHook
+ gettext
+ intltool
+ dbus # for configure.ac
+ libxslt
+ libtool
+ ];
+
+ buildInputs = [
+ # from configure.ac
+ gobject-introspection
+ gtk3
+ glib
+
+ xorg.libXext
+ xorg.libXinerama
+ xorg.libX11
+ xorg.libXrandr
+
+ (python3.withPackages (pp: with pp; [ pygobject3 setproctitle xapp pycairo ]))
+ xapps
+ pam
+ accountsservice
+ cairo
+ cinnamon-desktop
+ cinnamon-common
+ gnome3.libgnomekbd
+ gnome3.caribou
+
+ # things
+ iso-flags-png-320x420
+ ];
+
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; # TODO: https://github.com/NixOS/nixpkgs/issues/36468
+
+ postPatch = ''
+ patchShebangs autogen.sh
+
+ sed ${stdenv.lib.escapeShellArg "s&DBUS_SESSION_SERVICE_DIR=.*&DBUS_SESSION_SERVICE_DIR=`$PKG_CONFIG --variable session_bus_services_dir dbus-1 | sed -e 's,/usr/share,\${datarootdir},g' | sed 's|^|$out|'`&g"} -i configure.ac
+
+ # cscreensaver hardcodes absolute paths everywhere. Nuke from orbit.
+ find . -type f -exec sed -i \
+ -e s,/usr/share/locale,/run/current-system/sw/share/locale,g \
+ -e s,/usr/lib/cinnamon-screensaver,$out/lib,g \
+ -e s,/usr/share/cinnamon-screensaver,$out/share,g \
+ -e s,/usr/share/iso-flag-png,${iso-flags-png-320x420}/share/iso-flags-png,g \
+ {} +
+
+ sed "s|/usr/share/locale|/run/current-system/sw/share/locale|g" -i ./src/cinnamon-screensaver-main.py
+ '';
+
+ autoreconfPhase = ''
+ NOCONFIGURE=1 bash ./autogen.sh
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/linuxmint/cinnamon-screensaver";
+ description = "The Cinnamon screen locker and screensaver program";
+ license = [ licenses.gpl2 licenses.lgpl2 ];
+ platforms = platforms.linux;
+ maintainers = [ maintainers.mkg20001 ];
+ };
+}
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index b08c9e468f8..5d054e4646d 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -1,10 +1,23 @@
{ pkgs, lib }:
lib.makeScope pkgs.newScope (self: with self; {
+ iso-flags-png-320x420 = pkgs.iso-flags.overrideAttrs(p: p // {
+ buildPhase = "make png-country-320x240-fancy";
+ # installPhase = "mkdir -p $out/share && mv build/png-country-4x2-fancy/res-320x240 $out/share/iso-flags-png-320x420";
+ installPhase = "mkdir -p $out/share && mv build/png-country-4x2-fancy/res-320x240 $out/share/iso-flags-png";
+ });
+
+ iso-flags-svg = pkgs.iso-flags.overrideAttrs(p: p // {
+ buildPhase = "mkdir -p $out/share";
+ installPhase = "mv svg $out/share/iso-flags-svg";
+ });
+
+ cinnamon-common = callPackage ./cinnamon-common { };
cinnamon-control-center = callPackage ./cinnamon-control-center { };
cinnamon-desktop = callPackage ./cinnamon-desktop { };
cinnamon-menus = callPackage ./cinnamon-menus { };
cinnamon-translations = callPackage ./cinnamon-translations { };
+ cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
cinnamon-session = callPackage ./cinnamon-session { };
cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { };
cjs = callPackage ./cjs { };
diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix
index 24323893838..18ee7bdd844 100644
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix
@@ -31,13 +31,13 @@
stdenv.mkDerivation rec {
pname = "appcenter";
- version = "3.4.1";
+ version = "3.4.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1bwkjxl4k49hvy88llif82hdancda9692vjwkw4bxy2cbz8444zx";
+ sha256 = "sha256-8r0DlmG8xlCQ1uFHZQjXG2ls4VBrsRzrVY8Ey3/OYAU=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
index 058148e07c8..0695b6e4006 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "1csxsr2c8qvl97xz9ahwn91z095nzgr0i1mbcb1spljll2sr9lkj";
+ sha256 = "sha256-ctKUtaBU0qvDYquGCPL7tiTwQ7IcqvT7SXRjxETWXbM=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
index cdb5e860650..e8f0e37620e 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@@ -26,7 +26,7 @@
stdenv.mkDerivation rec {
pname = "elementary-calendar";
- version = "5.0.6";
+ version = "5.1.0";
repoName = "calendar";
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "0lmadk4yzf1kiiqshwqcxzcyia1haq1avv6pyzvsaywxhqwdsini";
+ sha256 = "sha256-b72BmChl/Ql0ljLRcPMNbJcOV4cVqz5D2j+5BGUi4Go=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
index 9874d87eae9..e7bb60a062d 100644
--- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "13jg224h2436swd6kdkfs22icg0ja9lshvxwg5bqnb5fshspkjba";
+ sha256 = "sha256-asl5NdSuLItXebxvqGlSEjwWhdButmka12YQAYkQT44=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index 635b5cfc735..3454ff086c9 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "158zrzyyy507rxcbsb5am9768zbakpwrl61ixab57zla7z51l0g0";
+ sha256 = "sha256-4AEayj+K/lOW6jEYmvmdan1kTqqqLL1YzwcU7/3PH5U=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
index 1e3db99bab5..7cc34f8c82c 100644
--- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
+, fetchpatch
, vala
, atk
, cairo
@@ -40,6 +41,14 @@ stdenv.mkDerivation rec {
sha256 = "01vinik73s0vmk56samgf49zr2bl4wjv44x15sz2cmh744llckja";
};
+ patches = [
+ # Fix double includedir path in plank.pc
+ (fetchpatch {
+ url = "https://github.com/elementary/dock/commit/3bc368e2c4fafcd5b8baca2711c773b0e2441c7c.patch";
+ sha256 = "0gg35phi1cg7ixljc388i0h70w323r1gqzjhanccnsbjpqsgvs3k";
+ })
+ ];
+
nativeBuildInputs = [
gettext
meson
diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
index 3b257b0812f..29b897012e7 100644
--- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "0rc4ifs4hd4cj0v028bzc45v64pwx21xylwrhb20jpw61ainfi8s";
+ sha256 = "sha256-GkVnowqGXwnEgplT34Po/BKzC2F/IQE2kIw0SLSLhGU=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/0001-filechooser-module-hardcode-gsettings-for-nixos.patch b/pkgs/desktops/pantheon/apps/elementary-files/0001-filechooser-module-hardcode-gsettings-for-nixos.patch
new file mode 100644
index 00000000000..9bcedac3f03
--- /dev/null
+++ b/pkgs/desktops/pantheon/apps/elementary-files/0001-filechooser-module-hardcode-gsettings-for-nixos.patch
@@ -0,0 +1,35 @@
+From f51974c9736c3e28755245d15729578214652343 Mon Sep 17 00:00:00 2001
+Message-Id:
+From: worldofpeace
+Date: Thu, 3 Sep 2020 20:08:15 -0400
+Subject: [PATCH] filechooser-module: hardcode gsettings for nixos
+
+---
+ filechooser-module/FileChooserDialog.vala | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/filechooser-module/FileChooserDialog.vala b/filechooser-module/FileChooserDialog.vala
+index a70fe10..08fde2c 100644
+--- a/filechooser-module/FileChooserDialog.vala
++++ b/filechooser-module/FileChooserDialog.vala
+@@ -60,10 +60,14 @@ public class CustomFileChooserDialog : Object {
+ /* If not local only during creation, strange bug occurs on fresh installs */
+ chooser_dialog.local_only = true;
+
+- var files_preferences = new Settings ("io.elementary.files.preferences");
++ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@ELEMENTARY_FILES_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
++ SettingsSchema preferences_schema = sss.lookup ("io.elementary.files.preferences", false);
++ SettingsSchema chooser_schema = sss.lookup ("io.elementary.files.file-chooser", false);
++
++ var files_preferences = new Settings.full (preferences_schema, null, null);
+ is_single_click = files_preferences.get_boolean ("single-click");
+
+- var chooser_settings = new Settings ("io.elementary.files.file-chooser");
++ var chooser_settings = new Settings.full (chooser_schema, null, null);
+
+ assign_container_box ();
+ remove_gtk_widgets ();
+
+base-commit: 57cb89b64fd2d5c08f4aaf23e8c74bfaa5d0384f
+--
+git-series 0.9.1
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index f6215e5025b..9433edc9ce5 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -17,7 +17,7 @@
, libnotify
, libunity
, pango
-, plank
+, elementary-dock
, bamf
, sqlite
, libdbusmenu-gtk3
@@ -31,7 +31,7 @@
stdenv.mkDerivation rec {
pname = "elementary-files";
- version = "4.4.4";
+ version = "4.5.0";
repoName = "files";
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "1hsh9kg30l90r2aqrrap1nfmgjf0la8mfd8h4xm6d7acailcnhmb";
+ sha256 = "sha256-wtQW1poX791DAlSFdVV9psnCfBDeVXI2fDZ2GcvvNn8=";
};
passthru = {
@@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bamf
+ elementary-dock
elementary-icon-theme
granite
gtk3
@@ -75,13 +76,12 @@ stdenv.mkDerivation rec {
libnotify
libunity
pango
- plank
sqlite
zeitgeist
];
patches = [
- ./hardcode-gsettings.patch
+ ./0001-filechooser-module-hardcode-gsettings-for-nixos.patch
];
postPatch = ''
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/hardcode-gsettings.patch b/pkgs/desktops/pantheon/apps/elementary-files/hardcode-gsettings.patch
deleted file mode 100644
index 3191f4e3cb2..00000000000
--- a/pkgs/desktops/pantheon/apps/elementary-files/hardcode-gsettings.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/filechooser-module/FileChooserDialog.vala b/filechooser-module/FileChooserDialog.vala
-index cb7c3c49..8b1899d1 100644
---- a/filechooser-module/FileChooserDialog.vala
-+++ b/filechooser-module/FileChooserDialog.vala
-@@ -57,10 +57,15 @@ public class CustomFileChooserDialog : Object {
- chooser_dialog.deletable = false;
- chooser_dialog.local_only = false;
-
-- var settings = new Settings ("io.elementary.files.preferences");
-+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@ELEMENTARY_FILES_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
-+ SettingsSchema preferences_schema = sss.lookup ("io.elementary.files.preferences", false);
-+ SettingsSchema chooser_schema = sss.lookup ("io.elementary.files.file-chooser", false);
-+
-+ var settings = new Settings.full (preferences_schema, null, null);
-+
- is_single_click = settings.get_boolean ("single-click");
-
-- var chooser_settings = new Settings ("io.elementary.files.file-chooser");
-+ var chooser_settings = new Settings.full (chooser_schema, null, null);
-
- assign_container_box ();
- remove_gtk_widgets ();
diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index 8849965edde..0e34b29f1de 100644
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "0cb0mwsp5w2bmjq8ap9mi0jvaqr9fgq00gfrkj0mzb5x5c26hrnw";
+ sha256 = "sha256-3GZoBCu9rF+BnNk9APBzKWO1JYg1XYWwrEvwcjWvYDE=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index 252791df1d5..d3d931e44fc 100644
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "09jjic165rmprc2cszsgj2m3j3f5p8v9pxx5mj66a0gj3ar3hfbd";
+ sha256 = "sha256-bTk4shryAWWMrKX3mza6xQ05qpBPf80Ey7fmYgKLUiY=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
index 611e683491f..da67ac0aed8 100644
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "179ib2ldvhdx3hks5lqyx2cvlkk3j1qccvlfwh2yd2bl79zpk3ma";
+ sha256 = "sha256-qo55fzp0ieYF5I5uxnCQY066mege06InHL3B3ahYMZ0=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index c7c1c8780ed..ddd5c0a0eac 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "119iwmzbpkj4nmxinqfsh73lx23g8gbl6ha6wc4mc4fq9hpnc9c2";
+ sha256 = "sha256-giVmL0zYEVYJ40ZBQ9dDb4hOx4HaYRt7tUTOu37lMYU=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
index 03b730cecac..f51c6c0090d 100644
--- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "07dwhshdc78wia0fsbzz6iv651znzzasfil91w60v29kgc4s2b1i";
+ sha256 = "sha256-MSyhCXsziQ0MD4lGp9X/9odidjT/L+2Aihwd1qCGvB0=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix
index 05f0f40db4a..2fc5d560da0 100644
--- a/pkgs/desktops/pantheon/apps/sideload/default.nix
+++ b/pkgs/desktops/pantheon/apps/sideload/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0mlc3nm2navzxm8k1rwpbw4w6mv30lmhqybm8jqxd4v8x7my73vq";
+ sha256 = "sha256-eI/j6+lok9axRHV5DCsFY1fDCV+X5zBR7X8rK6odjFY=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
index d7a50fc7e5c..9937edc22b5 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0g8lhdwv9g16kjn7yxnl6x4rscjl2206ljfnghpxc4b5lwhqxxnw";
+ sha256 = "sha256-3PaOIadlEdYvfNZJaoAQVDKdSTfUdn+snCa8tHmDFD0=";
};
patches = [
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index 3c810a5f4f3..86db11a3dc3 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1zs2qmglh85ami07dnlq3lfwl5ikc4abvz94a35k6fhfs703lay2";
+ sha256 = "sha256-wis6wNEOOjPLUCT9vRRhMxbKHR2Y2nZArKogSF/FQv8=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
index e5f423bea8a..b5a8cc76651 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0wzm390g8di4ks3w637a0wl4j7g89j321xkz5msd9058gksvaaxs";
+ sha256 = "sha256-uiu19XyogNR0LX/2IIZM6B1JKAfqDMOHniQ29EAa9XM=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
index 425d2785878..ab1e0b5280a 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0ksxx45mm0cvnb5jphyxsf843rn2rgb0yxv9j0ydh2xp4qgvvyva";
+ sha256 = "sha256-avu9Hya3C9g8kGl3D9bLwuZBkNPdwyvLspuBWgvpXU8=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
index ee714e1962e..95a454b36f4 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1kkd75kp24zq84wfmc00brqxximfsi4sqyx8a7rbl7zaspf182xa";
+ sha256 = "sha256-qgsU3NXqH7ryUah7rEnUrsbecV4AsOo4QfgTcWc5bc4=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
index 568d9bd24c8..490c8c57a67 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0ijzm91gycx8iaf3sd8i07b5899gbryxd6klzjh122d952wsyfcs";
+ sha256 = "sha256-mjmvuSipCRGg/HSa1n1eLyVU1gERNT2ciqgz/0KqX0Y=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch
new file mode 100644
index 00000000000..42900c38062
--- /dev/null
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch
@@ -0,0 +1,700 @@
+From 4fd6da39ab33a6eef46ee2c64eb4f5595c7fe633 Mon Sep 17 00:00:00 2001
+Message-Id: <4fd6da39ab33a6eef46ee2c64eb4f5595c7fe633.1599180249.git-series.worldofpeace@protonmail.ch>
+From: worldofpeace
+Date: Thu, 3 Sep 2020 20:43:25 -0400
+Subject: [PATCH] Remove Install Unlisted Engines function
+
+https://github.com/elementary/switchboard-plug-keyboard/issues/324
+---
+ src/Dialogs/InstallEngineDialog.vala | 140 +------------------
+ src/Dialogs/ProgressDialog.vala | 82 +----------
+ src/InputMethod/Installer/InstallList.vala | 73 +---------
+ src/InputMethod/Installer/UbuntuInstaller.vala | 142 +------------------
+ src/InputMethod/Installer/aptd-client.vala | 93 +------------
+ src/Widgets/InputMethod/AddEnginesPopover.vala | 12 +--
+ src/Widgets/InputMethod/LanguagesRow.vala | 43 +-----
+ src/meson.build | 6 +-
+ 8 files changed, 591 deletions(-)
+ delete mode 100644 src/Dialogs/InstallEngineDialog.vala
+ delete mode 100644 src/Dialogs/ProgressDialog.vala
+ delete mode 100644 src/InputMethod/Installer/InstallList.vala
+ delete mode 100644 src/InputMethod/Installer/UbuntuInstaller.vala
+ delete mode 100644 src/InputMethod/Installer/aptd-client.vala
+ delete mode 100644 src/Widgets/InputMethod/LanguagesRow.vala
+
+diff --git a/src/Dialogs/InstallEngineDialog.vala b/src/Dialogs/InstallEngineDialog.vala
+deleted file mode 100644
+index ffba3a8..0000000
+--- a/src/Dialogs/InstallEngineDialog.vala
++++ /dev/null
+@@ -1,140 +0,0 @@
+-/*
+-* Copyright 2019-2020 elementary, Inc. (https://elementary.io)
+-*
+-* This program is free software: you can redistribute it and/or modify
+-* it under the terms of the GNU General Public License as published by
+-* the Free Software Foundation, either version 3 of the License, or
+-* (at your option) any later version.
+-*
+-* This program is distributed in the hope that it will be useful,
+-* but WITHOUT ANY WARRANTY; without even the implied warranty of
+-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-* GNU General Public License for more details.
+-*
+-* You should have received a copy of the GNU General Public License
+-* along with this program. If not, see .
+-*/
+-
+-public class Pantheon.Keyboard.InputMethodPage.InstallEngineDialog : Granite.MessageDialog {
+- private InstallList? engines_filter;
+-
+- public InstallEngineDialog (Gtk.Window parent) {
+- Object (
+- primary_text: _("Choose an engine to install"),
+- secondary_text: _("Select an engine from the list to install and use."),
+- image_icon: new ThemedIcon ("extension"),
+- transient_for: parent,
+- buttons: Gtk.ButtonsType.CANCEL
+- );
+- }
+-
+- construct {
+- var languages_list = new Gtk.ListBox () {
+- activate_on_single_click = true,
+- expand = true,
+- selection_mode = Gtk.SelectionMode.NONE
+- };
+-
+- foreach (var language in InstallList.get_all ()) {
+- var lang = new LanguagesRow (language);
+- languages_list.add (lang);
+- }
+-
+- var back_button = new Gtk.Button.with_label (_("Languages")) {
+- halign = Gtk.Align.START,
+- margin = 6
+- };
+- back_button.get_style_context ().add_class (Granite.STYLE_CLASS_BACK_BUTTON);
+-
+- var language_title = new Gtk.Label ("");
+-
+- var language_header = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+- language_header.pack_start (back_button);
+- language_header.set_center_widget (language_title);
+-
+- var listbox = new Gtk.ListBox () {
+- expand = true
+- };
+- listbox.set_filter_func (filter_function);
+- listbox.set_sort_func (sort_function);
+-
+- foreach (var language in InstallList.get_all ()) {
+- foreach (var engine in language.get_components ()) {
+- listbox.add (new EnginesRow (engine));
+- }
+- }
+-
+- var scrolled = new Gtk.ScrolledWindow (null, null);
+- scrolled.add (listbox);
+-
+- var engine_list_grid = new Gtk.Grid () {
+- orientation = Gtk.Orientation.VERTICAL
+- };
+- engine_list_grid.get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);
+- engine_list_grid.add (language_header);
+- engine_list_grid.add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
+- engine_list_grid.add (scrolled);
+-
+- var stack = new Gtk.Stack () {
+- height_request = 200,
+- width_request = 300,
+- transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT
+- };
+- stack.add (languages_list);
+- stack.add (engine_list_grid);
+-
+- var frame = new Gtk.Frame (null);
+- frame.add (stack);
+-
+- custom_bin.add (frame);
+- custom_bin.show_all ();
+-
+- var install_button = add_button (_("Install"), Gtk.ResponseType.OK);
+- install_button.sensitive = false;
+- install_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);
+-
+- languages_list.row_activated.connect ((row) => {
+- stack.visible_child = engine_list_grid;
+- language_title.label = ((LanguagesRow) row).language.get_name ();
+- engines_filter = ((LanguagesRow) row).language;
+- listbox.invalidate_filter ();
+- var adjustment = scrolled.get_vadjustment ();
+- adjustment.set_value (adjustment.lower);
+- });
+-
+- back_button.clicked.connect (() => {
+- stack.visible_child = languages_list;
+- install_button.sensitive = false;
+- });
+-
+- listbox.selected_rows_changed.connect (() => {
+- foreach (var engines_row in listbox.get_children ()) {
+- ((EnginesRow) engines_row).selected = false;
+- }
+-
+- ((EnginesRow) listbox.get_selected_row ()).selected = true;
+- install_button.sensitive = true;
+- });
+-
+- response.connect ((response_id) => {
+- if (response_id == Gtk.ResponseType.OK) {
+- string engine_to_install = ((EnginesRow) listbox.get_selected_row ()).engine_name;
+- UbuntuInstaller.get_default ().install (engine_to_install);
+- }
+- });
+- }
+-
+- [CCode (instance_pos = -1)]
+- private bool filter_function (Gtk.ListBoxRow row) {
+- if (InstallList.get_language_from_engine_name (((EnginesRow) row).engine_name) == engines_filter) {
+- return true;
+- }
+-
+- return false;
+- }
+-
+- [CCode (instance_pos = -1)]
+- private int sort_function (Gtk.ListBoxRow row1, Gtk.ListBoxRow row2) {
+- return ((EnginesRow) row1).engine_name.collate (((EnginesRow) row1).engine_name);
+- }
+-}
+diff --git a/src/Dialogs/ProgressDialog.vala b/src/Dialogs/ProgressDialog.vala
+deleted file mode 100644
+index f110aca..0000000
+--- a/src/Dialogs/ProgressDialog.vala
++++ /dev/null
+@@ -1,82 +0,0 @@
+-/*
+-* Copyright 2011-2020 elementary, Inc. (https://elementary.io)
+-*
+-* This program is free software: you can redistribute it
+-* and/or modify it under the terms of the GNU Lesser General Public License as
+-* published by the Free Software Foundation, either version 3 of the
+-* License, or (at your option) any later version.
+-*
+-* This program is distributed in the hope that it will be
+-* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+-* Public License for more details.
+-*
+-* You should have received a copy of the GNU General Public License along
+-* with this program. If not, see http://www.gnu.org/licenses/.
+-*/
+-
+-public class Pantheon.Keyboard.InputMethodPage.ProgressDialog : Gtk.Dialog {
+- public int progress {
+- set {
+- if (value >= 100) {
+- destroy ();
+- }
+-
+- progress_bar.fraction = value / 100.0;
+- }
+- }
+-
+- private Gtk.ProgressBar progress_bar;
+-
+- construct {
+- var image = new Gtk.Image.from_icon_name ("preferences-desktop-locale", Gtk.IconSize.DIALOG) {
+- valign = Gtk.Align.START
+- };
+-
+- var primary_label = new Gtk.Label (null) {
+- max_width_chars = 50,
+- wrap = true,
+- xalign = 0
+- };
+- primary_label.get_style_context ().add_class (Granite.STYLE_CLASS_PRIMARY_LABEL);
+-
+- unowned UbuntuInstaller installer = UbuntuInstaller.get_default ();
+- switch (installer.transaction_mode) {
+- case UbuntuInstaller.TransactionMode.INSTALL:
+- primary_label.label = _("Installing %s").printf (installer.engine_to_address);
+- break;
+- case UbuntuInstaller.TransactionMode.REMOVE:
+- primary_label.label = _("Removing %s").printf (installer.engine_to_address);
+- break;
+- }
+-
+- progress_bar = new Gtk.ProgressBar () {
+- hexpand = true,
+- valign = Gtk.Align.START,
+- width_request = 300
+- };
+-
+- var cancel_button = (Gtk.Button) add_button (_("Cancel"), 0);
+-
+- installer.bind_property ("install-cancellable", cancel_button, "sensitive");
+-
+- var grid = new Gtk.Grid () {
+- column_spacing = 12,
+- margin = 6,
+- row_spacing = 6
+- };
+- grid.attach (image, 0, 0, 1, 2);
+- grid.attach (primary_label, 1, 0);
+- grid.attach (progress_bar, 1, 1);
+- grid.show_all ();
+-
+- border_width = 6;
+- deletable = false;
+- get_content_area ().add (grid);
+-
+- cancel_button.clicked.connect (() => {
+- installer.cancel_install ();
+- destroy ();
+- });
+- }
+-}
+diff --git a/src/InputMethod/Installer/InstallList.vala b/src/InputMethod/Installer/InstallList.vala
+deleted file mode 100644
+index 275c302..0000000
+--- a/src/InputMethod/Installer/InstallList.vala
++++ /dev/null
+@@ -1,73 +0,0 @@
+-/*
+-* 2019-2020 elementary, Inc. (https://elementary.io)
+-*
+-* This program is free software: you can redistribute it and/or modify
+-* it under the terms of the GNU General Public License as published by
+-* the Free Software Foundation, either version 3 of the License, or
+-* (at your option) any later version.
+-*
+-* This program is distributed in the hope that it will be useful,
+-* but WITHOUT ANY WARRANTY; without even the implied warranty of
+-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-* GNU General Public License for more details.
+-*
+-* You should have received a copy of the GNU General Public License
+-* along with this program. If not, see .
+-*/
+-
+-public enum Pantheon.Keyboard.InputMethodPage.InstallList {
+- JA,
+- KO,
+- ZH;
+-
+- public string get_name () {
+- switch (this) {
+- case JA:
+- return _("Japanese");
+- case KO:
+- return _("Korean");
+- case ZH:
+- return _("Chinese");
+- default:
+- assert_not_reached ();
+- }
+- }
+-
+- public string[] get_components () {
+- switch (this) {
+- case JA:
+- return { "ibus-anthy", "ibus-mozc", "ibus-skk" };
+- case KO:
+- return { "ibus-hangul" };
+- case ZH:
+- return { "ibus-cangjie", "ibus-chewing", "ibus-pinyin" };
+- default:
+- assert_not_reached ();
+- }
+- }
+-
+- public static InstallList get_language_from_engine_name (string engine_name) {
+- switch (engine_name) {
+- case "ibus-anthy":
+- return JA;
+- case "ibus-mozc":
+- return JA;
+- case "ibus-skk":
+- return JA;
+- case "ibus-hangul":
+- return KO;
+- case "ibus-cangjie":
+- return ZH;
+- case "ibus-chewing":
+- return ZH;
+- case "ibus-pinyin":
+- return ZH;
+- default:
+- assert_not_reached ();
+- }
+- }
+-
+- public static InstallList[] get_all () {
+- return { JA, KO, ZH };
+- }
+-}
+diff --git a/src/InputMethod/Installer/UbuntuInstaller.vala b/src/InputMethod/Installer/UbuntuInstaller.vala
+deleted file mode 100644
+index b65aa1f..0000000
+--- a/src/InputMethod/Installer/UbuntuInstaller.vala
++++ /dev/null
+@@ -1,142 +0,0 @@
+-/*
+-* Copyright 2011-2020 elementary, Inc. (https://elementary.io)
+-*
+-* This program is free software: you can redistribute it
+-* and/or modify it under the terms of the GNU Lesser General Public License as
+-* published by the Free Software Foundation, either version 3 of the
+-* License, or (at your option) any later version.
+-*
+-* This program is distributed in the hope that it will be
+-* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+-* Public License for more details.
+-*
+-* You should have received a copy of the GNU General Public License along
+-* with this program. If not, see http://www.gnu.org/licenses/.
+-*/
+-
+-public class Pantheon.Keyboard.InputMethodPage.UbuntuInstaller : Object {
+- private AptdProxy aptd;
+- private AptdTransactionProxy proxy;
+-
+- public bool install_cancellable { get; private set; }
+- public TransactionMode transaction_mode { get; private set; }
+- public string engine_to_address { get; private set; }
+-
+- public signal void install_finished (string langcode);
+- public signal void install_failed ();
+- public signal void remove_finished (string langcode);
+- public signal void progress_changed (int progress);
+-
+- public enum TransactionMode {
+- INSTALL,
+- REMOVE,
+- INSTALL_MISSING,
+- }
+-
+- Gee.HashMap transactions;
+-
+- private static GLib.Once instance;
+- public static unowned UbuntuInstaller get_default () {
+- return instance.once (() => {
+- return new UbuntuInstaller ();
+- });
+- }
+-
+- private UbuntuInstaller () {}
+-
+- construct {
+- transactions = new Gee.HashMap ();
+- aptd = new AptdProxy ();
+-
+- try {
+- aptd.connect_to_aptd ();
+- } catch (Error e) {
+- warning ("Could not connect to APT daemon");
+- }
+- }
+-
+- public void install (string engine_name) {
+- transaction_mode = TransactionMode.INSTALL;
+- engine_to_address = engine_name;
+- string[] packages = {};
+- packages += engine_to_address;
+-
+- foreach (var packet in packages) {
+- message ("Packet: %s", packet);
+- }
+-
+- aptd.install_packages.begin (packages, (obj, res) => {
+- try {
+- var transaction_id = aptd.install_packages.end (res);
+- transactions.@set (transaction_id, "i-" + engine_name);
+- run_transaction (transaction_id);
+- } catch (Error e) {
+- warning ("Could not queue downloads: %s", e.message);
+- }
+- });
+- }
+-
+- public void cancel_install () {
+- if (install_cancellable) {
+- warning ("cancel_install");
+- try {
+- proxy.cancel ();
+- } catch (Error e) {
+- warning ("cannot cancel installation:%s", e.message);
+- }
+- }
+- }
+-
+- private void run_transaction (string transaction_id) {
+- proxy = new AptdTransactionProxy ();
+- proxy.finished.connect (() => {
+- on_apt_finshed (transaction_id, true);
+- });
+-
+- proxy.property_changed.connect ((prop, val) => {
+- if (prop == "Progress") {
+- progress_changed ((int) val.get_int32 ());
+- }
+-
+- if (prop == "Cancellable") {
+- install_cancellable = val.get_boolean ();
+- }
+- });
+-
+- try {
+- proxy.connect_to_aptd (transaction_id);
+- proxy.simulate ();
+-
+- proxy.run ();
+- } catch (Error e) {
+- on_apt_finshed (transaction_id, false);
+- warning ("Could no run transaction: %s", e.message);
+- }
+- }
+-
+- private void on_apt_finshed (string id, bool success) {
+- if (!success) {
+- install_failed ();
+- transactions.unset (id);
+- return;
+- }
+-
+- if (!transactions.has_key (id)) { //transaction already removed
+- return;
+- }
+-
+- var action = transactions.get (id);
+- var lang = action[2:action.length];
+-
+- message ("ID %s -> %s", id, success ? "success" : "failed");
+-
+- if (action[0:1] == "i") { // install
+- install_finished (lang);
+- } else {
+- remove_finished (lang);
+- }
+-
+- transactions.unset (id);
+- }
+-}
+diff --git a/src/InputMethod/Installer/aptd-client.vala b/src/InputMethod/Installer/aptd-client.vala
+deleted file mode 100644
+index ee5c3f5..0000000
+--- a/src/InputMethod/Installer/aptd-client.vala
++++ /dev/null
+@@ -1,93 +0,0 @@
+-/*
+- * Copyright (C) 2012 Canonical Ltd
+- *
+- * This program is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License version 3 as
+- * published by the Free Software Foundation.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program. If not, see .
+- *
+- * Authored by Pawel Stolowski
+- */
+-
+-namespace Pantheon.Keyboard.InputMethodPage {
+- private const string APTD_DBUS_NAME = "org.debian.apt";
+- private const string APTD_DBUS_PATH = "/org/debian/apt";
+-
+- /**
+- * Expose a subset of org.debian.apt interfaces -- only what's needed by applications lens.
+- */
+- [DBus (name = "org.debian.apt")]
+- public interface AptdService : GLib.Object {
+- public abstract async string install_packages (string[] packages) throws GLib.Error;
+- public abstract async string remove_packages (string[] packages) throws GLib.Error;
+- public abstract async void quit () throws GLib.Error;
+- }
+-
+- [DBus (name = "org.debian.apt.transaction")]
+- public interface AptdTransactionService : GLib.Object {
+- public abstract void run () throws GLib.Error;
+- public abstract void simulate () throws GLib.Error;
+- public abstract void cancel () throws GLib.Error;
+- public signal void finished (string exit_state);
+- public signal void property_changed (string property, Variant val);
+- }
+-
+- public class AptdProxy : GLib.Object {
+- private AptdService _aptd_service;
+-
+- public void connect_to_aptd () throws GLib.Error {
+- _aptd_service = Bus.get_proxy_sync (BusType.SYSTEM, APTD_DBUS_NAME, APTD_DBUS_PATH);
+- }
+-
+- public async string install_packages (string[] packages) throws GLib.Error {
+- string res = yield _aptd_service.install_packages (packages);
+- return res;
+- }
+-
+- public async string remove_packages (string[] packages) throws GLib.Error {
+- string res = yield _aptd_service.remove_packages (packages);
+- return res;
+- }
+-
+- public async void quit () throws GLib.Error {
+- yield _aptd_service.quit ();
+- }
+- }
+-
+- public class AptdTransactionProxy : GLib.Object {
+- public signal void finished (string transaction_id);
+- public signal void property_changed (string property, Variant variant);
+-
+- private AptdTransactionService _aptd_service;
+-
+- public void connect_to_aptd (string transaction_id) throws GLib.Error {
+- _aptd_service = Bus.get_proxy_sync (BusType.SYSTEM, APTD_DBUS_NAME, transaction_id);
+- _aptd_service.finished.connect ((exit_state) => {
+- debug ("aptd transaction finished: %s\n", exit_state);
+- finished (transaction_id);
+- });
+- _aptd_service.property_changed.connect ((prop, variant) => {
+- property_changed (prop, variant);
+- });
+- }
+-
+- public void simulate () throws GLib.Error {
+- _aptd_service.simulate ();
+- }
+-
+- public void run () throws GLib.Error {
+- _aptd_service.run ();
+- }
+-
+- public void cancel () throws GLib.Error {
+- _aptd_service.cancel ();
+- }
+- }
+-}
+diff --git a/src/Widgets/InputMethod/AddEnginesPopover.vala b/src/Widgets/InputMethod/AddEnginesPopover.vala
+index 46e005d..6b56c6b 100644
+--- a/src/Widgets/InputMethod/AddEnginesPopover.vala
++++ b/src/Widgets/InputMethod/AddEnginesPopover.vala
+@@ -49,8 +49,6 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover {
+ };
+ scrolled.add (listbox);
+
+- var install_button = new Gtk.Button.with_label (_("Install Unlisted Engines…"));
+-
+ var cancel_button = new Gtk.Button.with_label (_("Cancel"));
+
+ var add_button = new Gtk.Button.with_label (_("Add Engine"));
+@@ -61,10 +59,8 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover {
+ margin = 12,
+ spacing = 6
+ };
+- button_box.add (install_button);
+ button_box.add (cancel_button);
+ button_box.add (add_button);
+- button_box.set_child_secondary (install_button, true);
+
+ var grid = new Gtk.Grid ();
+ grid.attach (search_entry, 0, 0);
+@@ -92,14 +88,6 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover {
+ listbox.invalidate_filter ();
+ });
+
+- install_button.clicked.connect (() => {
+- popdown ();
+-
+- var install_dialog = new InstallEngineDialog ((Gtk.Window) get_toplevel ());
+- install_dialog.run ();
+- install_dialog.destroy ();
+- });
+-
+ cancel_button.clicked.connect (() => {
+ popdown ();
+ });
+diff --git a/src/Widgets/InputMethod/LanguagesRow.vala b/src/Widgets/InputMethod/LanguagesRow.vala
+deleted file mode 100644
+index dc064ae..0000000
+--- a/src/Widgets/InputMethod/LanguagesRow.vala
++++ /dev/null
+@@ -1,43 +0,0 @@
+-/*
+-* 2019-2020 elementary, Inc. (https://elementary.io)
+-*
+-* This program is free software: you can redistribute it and/or modify
+-* it under the terms of the GNU General Public License as published by
+-* the Free Software Foundation, either version 3 of the License, or
+-* (at your option) any later version.
+-*
+-* This program is distributed in the hope that it will be useful,
+-* but WITHOUT ANY WARRANTY; without even the implied warranty of
+-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-* GNU General Public License for more details.
+-*
+-* You should have received a copy of the GNU General Public License
+-* along with this program. If not, see .
+-*/
+-
+-public class Pantheon.Keyboard.InputMethodPage.LanguagesRow : Gtk.ListBoxRow {
+- public InstallList language { get; construct; }
+-
+- public LanguagesRow (InstallList language) {
+- Object (language: language);
+- }
+-
+- construct {
+- var label = new Gtk.Label (language.get_name ()) {
+- halign = Gtk.Align.START,
+- hexpand = true
+- };
+-
+- var caret = new Gtk.Image.from_icon_name ("pan-end-symbolic", Gtk.IconSize.MENU);
+-
+- var grid = new Gtk.Grid () {
+- margin = 3,
+- margin_start = 6,
+- margin_end = 6
+- };
+- grid.add (label);
+- grid.add (caret);
+-
+- add (grid);
+- }
+-}
+diff --git a/src/meson.build b/src/meson.build
+index 28f07c1..a515419 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -16,7 +16,6 @@ plug_files = files(
+ 'Widgets/Shortcuts/CustomTree.vala',
+ 'Widgets/Layout/Display.vala',
+ 'Widgets/Layout/AddLayoutPopover.vala',
+- 'Widgets/InputMethod/LanguagesRow.vala',
+ 'Widgets/InputMethod/EnginesRow.vala',
+ 'Widgets/InputMethod/AddEnginesPopover.vala',
+ 'Views/Shortcuts.vala',
+@@ -36,11 +35,6 @@ plug_files = files(
+ 'Layout/AdvancedSettingsGrid.vala',
+ 'InputMethod/Utils.vala',
+ 'InputMethod/AddEnginesList.vala',
+- 'InputMethod/Installer/UbuntuInstaller.vala',
+- 'InputMethod/Installer/InstallList.vala',
+- 'InputMethod/Installer/aptd-client.vala',
+- 'Dialogs/ProgressDialog.vala',
+- 'Dialogs/InstallEngineDialog.vala',
+ 'Dialogs/ConflictDialog.vala',
+ )
+
+
+base-commit: 9d9eddeb7da8450a309496c25066f4f78a9d4070
+--
+git-series 0.9.1
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
index 5f55edb77c7..d1180f37ed0 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
@@ -15,20 +15,25 @@
, libgnomekbd
, libxklavier
, xorg
+, ibus
, switchboard
}:
stdenv.mkDerivation rec {
pname = "switchboard-plug-keyboard";
- version = "2.3.6";
+ version = "2.4.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "08zpw7ygrqmwwznvxkf4xbrgwbjkbwc95sw1ikikg3143ql9qclp";
+ sha256 = "sha256-iuv5NZ7v+rXyFsKB/PvGa/7hm9MIV8E6JnTzEGROlhM=";
};
+ patches = [
+ ./0001-Remove-Install-Unlisted-Engines-function.patch
+ ];
+
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
@@ -46,6 +51,7 @@ stdenv.mkDerivation rec {
buildInputs = [
granite
gtk3
+ ibus
libgee
libgnomekbd
libxklavier
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
index 27c7db368da..78a74c59e9e 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0jfykvdpjlymnks8mhlv9957ybq7srqqq23isjvh0jvc2r3cd7sq";
+ sha256 = "sha256-WJ/GRhZsSwC31HEIjHHWBy9/Skqbwor0tNVTedue3kk=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index f6a22af75d7..2ce9aad5666 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-network";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1k7925qrgjvh1x8ijhkh3p0z4ypgmx3lg21ygr8qhlp7xr3zm8d5";
+ sha256 = "sha256-PYgewxBblhOfOJQSeRaq8xD7qZ3083EvgUjpi92FqyI=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
index 09c61e1625d..37f69a3cc14 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "02amm2j6blpfc16p5rm64p8shnppzsg49hz4v196mli5xr1r441h";
+ sha256 = "sha256-MBCSQ+4l0mpS2OTDRJ7+91qo0SWm5nJNYO7SZaSoVQk=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
index cbe65e68a61..16e8c7e66c1 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "03h8ii8zz59fpp4fwlvyx3m3550096fn7a6w612b1rbj3dqhlmh9";
+ sha256 = "sha256-CVYKcRty5bBEMNyoY51JAJQy6uh+U+7IvS6V/1GMCA4=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
index af65327fb82..d877d43d137 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, nix-update-script, pantheon, meson, ninja, pkgconfig, vala, glib
, libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop
-, gala, wingpanel, plank, switchboard, gettext, bamf, fetchpatch }:
+, gala, wingpanel, elementary-dock, switchboard, gettext, bamf, fetchpatch }:
stdenv.mkDerivation rec {
pname = "switchboard-plug-pantheon-shell";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1nnsv745inbdqk3xnbcaqmj87vr3kzh5hazbh8v3ib33cpi7wy88";
+ sha256 = "sha256-CHl+4mVjrDg2gusrWOCfI++DZMWKLdvHxG3ZWMjZ2to=";
};
passthru = {
@@ -29,17 +29,17 @@ stdenv.mkDerivation rec {
buildInputs = [
bamf
+ elementary-dock
elementary-settings-daemon
+ gala
gexiv2
glib
gnome-desktop
granite
gtk3
libgee
- gala
- wingpanel
- plank
switchboard
+ wingpanel
];
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index 1405fb698d1..0549a797dbc 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0zbqv3bnwxapp9b442fjg9fizxmndva8vby5qicx0yy7l68in1xk";
+ sha256 = "sha256-swcbkaHHe9BZxMWvjdRutvYfXXrSCUJWuld1btfYeH0=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
index fcb1f26eb96..2e8f05d8416 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1jxpq4rvkrii85imnipbw44zjinq1sc0cq39lssprzfd4g5hjw5n";
+ sha256 = "sha256-tnAJyyPN/Xy1pmlgBpgO2Eb5CeHrRltjQTHmuTPBt8s=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
index df62a0b34b6..fd2a24db3e8 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0177lsly8qpqsfas3qc263as77h2k35avhw9708h1v8bllb3l2sb";
+ sha256 = "sha256-Sws6FqUL7QAROInDrcqYAp6j1TCC4aGV0/hi5Kmm5wQ=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
index 515660739d3..47c4928c08b 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1awkz16nydlgi8a2dd6agfnd3qwl2qsvv6wnn8bhaz1kbv1v9kpw";
+ sha256 = "sha256-/M60w14zfAUXspabvTUWlOPRrHvKtCYUio82b034k6s=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
index 6f89331593c..cab47c94cb9 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-sound";
- version = "2.2.4";
+ version = "2.2.5";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1kwd3cj6kk5dnmhcrmf13adqrhhjv2j6j2i78cpqbi9yv2h7sv9y";
+ sha256 = "sha256-ITgxLZSB4zhSaFKX7Vbf89DGI8ibIcGEQTtLjcGN2tA=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix
index 99018790053..1327c4739eb 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "12xir2gssr0x21sgm5m620bvd6b6y8dcm26cj4s1wsn8qb59jx9p";
+ sha256 = "sha256-N3WZysLIah40kcyIyhryZpm2FxCmlvp0EB1krZ/IsYs=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
index 78267e1bdd4..05f1f10a5a7 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "0aqq0d21mqgrfiyhpfa8k51wxw2pia0qlsgp0sli79v7nwn3ykbq";
+ sha256 = "sha256-eE0/LLdnpxOpBvdpioGKV/DOQ5lIuQt9dPnhGkQDGCs=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index 39d23c05b74..a12101c04d0 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "0rs68cb39r9vq85pr8h3mgmyjpj8bkhkxr5cz4cn5947kf776wg9";
+ sha256 = "sha256-6XFzjpuHpGIZ+azkPuFcSF7p66sDonwLwjvlNBZDRmc=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
index 2abe677d748..e18cac7d4ab 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "1dc583lq61c361arjl3s44d2k72c46bqvcqv1c3s69f2ndsnxjdz";
+ sha256 = "sha256-v8ludbPCJaMHCxuzjZchTJwpGiF6UJlVMIMFg+lAhbU=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
index 2d54580d3e6..975497cb9e4 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "0c63nds2ylqgcp39s13mfwhipgyw8cirn0bhybp291l5g86ii6s3";
+ sha256 = "sha256-Q5sYDXqFhiTu8nABmyND3L8bIXd1BJ3GZQ9TL3SzwzA=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
index 81cb4b51dc4..a8cf30e9732 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "00z31alwn2skhksrhp2jk75f6jlaipzk91hclx7na4gbcyrw7ahw";
+ sha256 = "sha256-HKrDs2frEWVPpwyGNP+NikrjyplSXJj1hFMLy6kK4wM=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index 42eb8fb3771..de93b0d3683 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "1zrsvbd386f7r3jbvjf8j08v1n5cpzkbjjaj2lxvjn8b81xgwy8j";
+ sha256 = "sha256-Enn+ekALWbk7FVJJuea/rNiwEZDIyb3kyMcZNNraOv8=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
index 2580907a592..f435104b320 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
@@ -8,7 +8,7 @@
, epiphany
, elementary-settings-daemon
, gtk3
-, plank
+, elementary-dock
, gsettings-desktop-schemas
, extraGSettingsOverrides ? ""
, extraGSettingsOverridePackages ? []
@@ -17,13 +17,13 @@
let
gsettingsOverridePackages = [
+ elementary-dock
elementary-settings-daemon
epiphany
gala
- mutter
gsettings-desktop-schemas
gtk3
- plank
+ mutter
] ++ extraGSettingsOverridePackages;
in
diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
index 2bfa1c22088..31ed7f3672a 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "1cq9smvrnzc12gp6rzcdxc3x0sbgcch246r5m2c7m2561mfg1d5l";
+ sha256 = "sha256-tLTwXA2miHqYqCUbIiBjb2nQB+uN/WzuE4F9m3fVCbM=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
index 0d6de8a77d5..7610551fb9c 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "1w3cfap7j42x14mqpfqdm46hk5xc0v5kv8r6wxcnknr3sfxi8qlp";
+ sha256 = "sha256-l2IUu9Mj22lZ5yajPcsGrJcJDakNu4srCV0Qea5ybPA=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
index 798757ba726..4e6afb9ff89 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "0v8fx58fn309glxi2zxxlnddw8lkmjr025f22ml3p483zkvbcm2c";
+ sha256 = "sha256-TFS29vwDkTtoFcIVAbKskyLemqW9fxE7fQkM61DpDm0=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index eb865d695e2..349b4cd63b5 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -20,7 +20,7 @@
, gnome-desktop
, mutter
, clutter
-, plank
+, elementary-dock
, elementary-icon-theme
, elementary-settings-daemon
, wrapGAppsHook
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1qd8ynn04rzkki68w4x3ryq6fhlbi6mk359rx86a8ni084fsprh4";
+ sha256 = "sha256-BOarHUEgWqQM6jmVMauJi0JnsM+jE45MnPNnAqz1qOE=";
};
passthru = {
@@ -58,16 +58,16 @@ stdenv.mkDerivation rec {
buildInputs = [
bamf
clutter
+ elementary-dock
elementary-icon-theme
- gnome-desktop
elementary-settings-daemon
+ gnome-desktop
granite
gtk3
libcanberra
libcanberra-gtk3
libgee
mutter
- plank
];
patches = [
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
index 45141dc1d3d..3e58a2a101a 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
@@ -15,7 +15,7 @@
, appstream
, gnome-menus
, json-glib
-, plank
+, elementary-dock
, bamf
, switchboard
, libunity
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "0wsfvyp0z6c612nl348dr6sar0qghhfcgkzcx3108x8v743v7rim";
+ sha256 = "sha256-NeazBzkbdQTC6OzPxxyED4OstMkNkUGtCIaZD67fTnM=";
};
passthru = {
@@ -57,6 +57,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bamf
+ elementary-dock
gnome-menus
granite
gtk3
@@ -65,7 +66,6 @@ stdenv.mkDerivation rec {
libhandy
libsoup
libunity
- plank
switchboard
wingpanel
zeitgeist
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
index 310f908d35d..51c87d5f34b 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0ylbpai05b300h07b94xcmw9xi7qx13l1q38zlg2n95d3c5264dp";
+ sha256 = "sha256-txEjChutJCse/WjgQEfo+MSeeGWdpHUABGCsAqK6i3o=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index 1d2d94ad01a..09583877fb1 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0z5a4jkmg8jw3yjdq89njhqcpms2rbq7rnsh83q9gh8v3qidk75d";
+ sha256 = "sha256-rZzZIh4bwZfwQFDbfPDKQtfLMJQ2IdykH1yiV6ckqnw=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
index 838c592c989..712b25d22f4 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0q32qc6jh5w0i1ixkl59pys8r3hxmbig8854q7sxi07vlk9g3i7y";
+ sha256 = "sha256-/sTx0qT7gNj1waQg9OKqHY6MtL+p0NljiIAXKA3DYmA=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
index 76d6368fceb..7f1ee7fbfba 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1ja789m4d3akm3i9fl3kazfcny376xl4apv445mrwkwlvcfyylf1";
+ sha256 = "sha256-wVHvHduUT55rIWRfRWg3Z3jL3FdzUJfiqFONRmpCR8k=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
index 30456eee461..05d0b0a0beb 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-nightlight";
- version = "2.0.3";
+ version = "2.0.4";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1ihg5iz69jgcbyzdkcc2fqmr5l34h2d1jjsx7y86ag1jvhljb82r";
+ sha256 = "sha256-0f03XO74ezzS/Uy0mXT4raoazETL/SOVh58sAo9bEIA=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
index bf206868f94..99ba52212a2 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0qp13iaf2956ss4d6w6vwnzdvb7izqmyh6xrdii7j8gxxwjd4lxm";
+ sha256 = "sha256-tVPSJO/9IXlibLkb6Cv+8azdvuXbcNOI1qYk4VQc4WI=";
};
patches = [
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
index ac9f07232f1..3ad4ab4d662 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-power";
- version = "2.1.5";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "19zhgzyivf3y416r5xaajx81h87zdhvrrcsagli00gp1f2169q5m";
+ sha256 = "sha256-wjYZXFnzvPSukzh1BNvyaFxKpYm+kNNFm5AsthLXGVE=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
index 410acc37330..4812e2bc91d 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "02inp8xdxfx8qxjdf2nazw46ahp1gv3skd922ma6kgx5w4wxh5l8";
+ sha256 = "sha256-iBbYOeGlv2lUFSK1qcd+4UJlCP/KCtdkx6i73jq6Ngo=";
};
patches = [
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
index eb1d4807325..02f7984eee9 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-sound";
- version = "2.1.5";
+ version = "2.1.6";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0nla8qgn5gb1g2gn7c47m9zw42sarjd0030x3h5kckapsbaxknhp";
+ sha256 = "sha256-WGkxLsbdJ7Z7kolymYpggsVy4cN4CicNKdfCbunklSI=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
index 0c456b13111..08eda9aa368 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0sz3m64s5clirmiamx67iq42spba7sggcb29sny44z9f939vly4r";
+ sha256 = "sha256-mXi600gufUK81Uks9p4+al0tCI7H9KpizZGyoomp42s=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix
index 69b53c78ed2..8b5ad8d5e6b 100644
--- a/pkgs/desktops/pantheon/granite/default.nix
+++ b/pkgs/desktops/pantheon/granite/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "13qfhq8xndikk6kmybibs6a4ddyp6mhvbsp2yy4qr7aiiyxf7mna";
+ sha256 = "sha256-ytbjuo9RnYyJ9+LqtWE117dGlNErLl+nmTM22xGGDo8=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix
index 11152defc65..76874878ff7 100644
--- a/pkgs/desktops/pantheon/services/contractor/default.nix
+++ b/pkgs/desktops/pantheon/services/contractor/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1jzqv7pglhhyrkj1pfk1l624zn1822wyl5dp6gvwn4sk3iqxwwhl";
+ sha256 = "sha256-FHLecRxTE8v3M7cV6rkQKNhPhKFhuhvkzB5C+u7Z+Ms=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
index 2f7bfaa155b..2213bcb4e37 100644
--- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "09pl1ynrmqjj844np4ww2i18z7kgx5kmj5ggfp8lqmxgsny7g8m3";
+ sha256 = "sha256-o6J3vNWvV0zRde8VWWfpb56PQhSck2sJQVLimq0P9CY=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
index b8c87cfd546..3bb68475096 100644
--- a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "0svfp0qyb6nx4mjl3jx4aqmb4x24m25jpi75mdis3yfr3c1xz9nh";
+ sha256 = "sha256-0KbfAxvZ+aFjq+XEK4uoRHSyKlaky0FlJd2a5TG4bms=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
index 4b9be31015a..11e0aaee3ad 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1lky7pw47d5mdza3bhq0ahdhgdv159ixngdsc1ys6j1kszsfxc1f";
+ sha256 = "sha256-LrDu9NczSKN9YLo922MqYbcHG1QAwzXUb7W0Q/g9ftI=";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
index 61679320505..ad8cf7e82e9 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1kd6spwfwy5r2mrf7xh5l2wrazqia8vr4j3g27s97vn7fcg4pgb0";
+ sha256 = "sha256-YL1LHnPH7pP0EW9IkjdSEX+VuaAF9uNyFbl47vjVps0=";
};
passthru = {
diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
index e7d9287e0d5..a40065fe579 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "gleam";
- version = "0.10.1";
+ version = "0.11.2";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "v${version}";
- sha256 = "0cgs0halxhp2hh3sf0nvy5ybllhraxircxxbfj9jbs3446dzflbk";
+ sha256 = "1g8yfp1xpkv1lqz8azam40cvrs5cggxlyrb72h8k88br75qmi6hj";
};
nativeBuildInputs = [ pkg-config ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++
stdenv.lib.optionals stdenv.isDarwin [ Security ];
- cargoSha256 = "12lpxighjk3ydfa288llj6xqas7z9fbfjpwnl870189awvp2fjxx";
+ cargoSha256 = "1gfr6c4i5kx8x3q23s4b4n25z2k6xkxpk12acr4ry97pyj2lr5wq";
meta = with stdenv.lib; {
description = "A statically typed language for the Erlang VM";
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 676af26adab..0a61c0accb4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -212,7 +212,7 @@ self: super: {
# https://github.com/haskell-nix/hnix/issues/676
# Once neat-interpolation >= 0.4 is in our stack release,
# (which should happen soon), we can remove this override
- neat-interpolation = self.neat-interpolation_0_5_1_1;
+ neat-interpolation = self.neat-interpolation_0_5_1_2;
});
# Fails for non-obvious reasons while attempting to use doctest.
@@ -1017,11 +1017,6 @@ self: super: {
})];
});
- # 2020-06-05: HACK: In Nixpkgs currently this is
- # old pandoc version 2.7.4 to current 2.9.2.1,
- # test suite failures: https://github.com/jgm/pandoc/issues/5582
- pandoc = dontCheck super.pandoc;
-
# Fix build with attr-2.4.48 (see #53716)
xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch;
@@ -1214,7 +1209,15 @@ self: super: {
# this will probably need to get updated with every ghcide update,
# we need an override because ghcide is tracking haskell-lsp closely.
- ghcide = dontCheck (super.ghcide.override { ghc-check = self.ghc-check_0_3_0_1; });
+ ghcide = dontCheck (appendPatch (super.ghcide.override {
+ hie-bios = dontCheck super.hie-bios_0_7_1;
+ lsp-test = dontCheck self.lsp-test_0_11_0_4;
+ }) (pkgs.fetchpatch {
+ # This patch loosens the hie-bios upper bound.
+ # It is already merged into upstream and won‘t be needed for ghcide 0.4.0
+ url = "https://github.com/haskell/ghcide/commit/3e1b3620948870a4da8808ca0c0897fbd3ecad16.patch";
+ sha256 = "1jwn7jgi740x6wwv1k0mz9d4z0b9p3mzs54pdg4nfq0h2v7zxchz";
+ }));
# hasn‘t bumped upper bounds
# upstream: https://github.com/obsidiansystems/which/pull/6
@@ -1236,13 +1239,6 @@ self: super: {
x509-validation = dontCheck super.x509-validation;
tls = dontCheck super.tls;
- # Upstream PR: https://github.com/bgamari/monoidal-containers/pull/62
- # Bump these version bound
- monoidal-containers = appendPatch super.monoidal-containers (pkgs.fetchpatch {
- url = "https://github.com/bgamari/monoidal-containers/commit/715093b22a015398a1390f636be6f39a0de83254.patch";
- sha256="1lfxvwp8g55ljxvj50acsb0wjhrvp2hvir8y0j5pfjkd1kq628ng";
- });
-
patch = appendPatches super.patch [
# Upstream PR: https://github.com/reflex-frp/patch/pull/20
# Makes tests work with hlint 3
@@ -1385,43 +1381,51 @@ self: super: {
# https://github.com/jgm/commonmark-hs/issues/55
commonmark-extensions = dontCheck super.commonmark-extensions;
- # The overrides in the following lines all have the following causes:
- # * neuron needs commonmark-pandoc
- # * which needs a newer pandoc-types (>= 1.21)
- # * which means we need a newer pandoc (>= 2.10)
- # * which needs a newer hslua (1.1.2) and a newer jira-wiki-markup (1.3.2)
- # Then we need to apply those overrides to all transitive dependencies
- # All of this will be obsolete, when pandoc 2.10 hits stack lts.
- commonmark-pandoc = super.commonmark-pandoc.override {
- pandoc-types = self.pandoc-types_1_21;
- };
- reflex-dom-pandoc = super.reflex-dom-pandoc.override {
- pandoc-types = self.pandoc-types_1_21;
- };
- pandoc_2_10_1 = super.pandoc_2_10_1.overrideScope (self: super: {
- pandoc-types = self.pandoc-types_1_21;
- hslua = self.hslua_1_1_2;
- jira-wiki-markup = self.jira-wiki-markup_1_3_2;
- });
-
# Apply version-bump patch that is not contained in released version yet.
# Upstream PR: https://github.com/srid/neuron/pull/304
- neuron = (appendPatch super.neuron (pkgs.fetchpatch {
+ neuron = appendPatch super.neuron (pkgs.fetchpatch {
url= "https://github.com/srid/neuron/commit/9ddcb7e9d63b8266d1372ef7c14c13b6b5277990.patch";
sha256 = "01f9v3jnl05fnpd624wv3a0j5prcbnf62ysa16fbc0vabw19zv1b";
excludes = [ "commonmark-hs/github.json" ];
stripLen = 2;
extraPrefix = "";
- }))
- # See comment about overrides above commonmark-pandoc
- .overrideScope (self: super: {
- pandoc = self.pandoc_2_10_1;
- pandoc-types = self.pandoc-types_1_21;
});
# Testsuite trying to run `which haskeline-examples-Test`
haskeline_0_8_1_0 = dontCheck super.haskeline_0_8_1_0;
+ # Tests for list-t, superbuffer, and stm-containers
+ # depend on HTF and it is broken, 2020-08-23
+ list-t = dontCheck super.list-t;
+ superbuffer = dontCheck super.superbuffer;
+ stm-containers = dontCheck super.stm-containers;
+
+ # Fails with "supports custom headers"
+ Spock-core = dontCheck super.Spock-core;
+
+ # Needed by Hasura 1.3.1
+ dependent-map_0_2_4_0 = super.dependent-map_0_2_4_0.override {
+ dependent-sum = self.dependent-sum_0_4;
+ };
+
+ # Hasura 1.3.1
+ # Because of ghc-heap-view, profiling needs to be disabled.
+ graphql-engine = disableLibraryProfiling( overrideCabal (super.graphql-engine.override {
+ immortal = self.immortal_0_2_2_1;
+ dependent-map = self.dependent-map_0_2_4_0;
+ dependent-sum = self.dependent-sum_0_4;
+ witherable = self.witherable_0_3_2;
+ }) (drv: {
+ # version in cabal file is invalid
+ version = "1.3.1-beta1";
+ # hasura needs VERSION env exported during build
+ preBuild = "export VERSION=1.3.1-beta1";
+ }));
+
+ graphql-parser = super.graphql-parser.override {
+ protolude = self.protolude_0_3_0;
+ };
+
# Requires repline 0.4 which is the default only for ghc8101, override for the rest
zre = super.zre.override {
repline = self.repline_0_4_0_0.override {
@@ -1457,15 +1461,25 @@ self: super: {
# resolving https://github.com/NixOS/nixpkgs/issues/81915.
cryptonite = self.cryptonite_0_27;
+ # We want the latest version of Pandoc.
+ hslua = self.hslua_1_1_2;
+ jira-wiki-markup = self.jira-wiki-markup_1_3_2;
+ pandoc = self.pandoc_2_10_1;
+ pandoc-citeproc = self.pandoc-citeproc_0_17_0_2;
+ pandoc-plot = self.pandoc-plot_0_9_2_0;
+ pandoc-types = self.pandoc-types_1_21;
+ rfc5051 = self.rfc5051_0_2;
+
# INSERT NEW OVERRIDES ABOVE THIS LINE
} // (let
+ inherit (self) hls-ghcide;
hlsScopeOverride = self: super: {
# haskell-language-server uses its own fork of ghcide
# Test disabled: it seems to freeze (is it just that it takes a long time ?)
- ghcide = dontCheck super.hls-ghcide;
+ ghcide = hls-ghcide;
# we are faster than stack here
- hie-bios = dontCheck super.hie-bios_0_7_0;
+ hie-bios = dontCheck super.hie-bios_0_7_1;
lsp-test = dontCheck super.lsp-test_0_11_0_4;
# fourmolu can‘t compile with an older aeson
aeson = dontCheck super.aeson_1_5_2_0;
@@ -1475,7 +1489,13 @@ self: super: {
in {
# jailbreaking for hie-bios 0.7.0 (upstream PR: https://github.com/haskell/haskell-language-server/pull/357)
haskell-language-server = dontCheck (doJailbreak (super.haskell-language-server.overrideScope hlsScopeOverride));
- hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride);
+ hls-ghcide = appendPatch (dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride))
+ (pkgs.fetchpatch {
+ # This patch loosens the hie-bios upper bound.
+ # It is already merged into upstream and won‘t be needed for ghcide 0.4.0
+ url = "https://github.com/haskell/ghcide/commit/3e1b3620948870a4da8808ca0c0897fbd3ecad16.patch";
+ sha256 = "1jwn7jgi740x6wwv1k0mz9d4z0b9p3mzs54pdg4nfq0h2v7zxchz";
+ });
fourmolu = super.fourmolu.overrideScope hlsScopeOverride;
}
) // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 5fcff7d9df9..35a7d425a5b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -76,6 +76,16 @@ self: super: {
singletons = self.singletons_2_7;
th-desugar = self.th-desugar_1_11;
+ insert-ordered-containers = super.insert-ordered-containers.override {
+ optics-core = self.optics-core_0_3_0_1;
+ optics-extra = self.optics-extra_0_3.override {
+ optics-core = self.optics-core_0_3_0_1;
+ };
+ };
+
+ # Jailbreaking because monoidal-containers hasn‘t bumped it's base dependency for 8.10.
+ monoidal-containers = doJailbreak super.monoidal-containers;
+
# `ghc-lib-parser-ex` (see conditionals in its `.cabal` file) does not need
# the `ghc-lib-parser` dependency on GHC >= 8.8. However, because we have
# multiple verions of `ghc-lib-parser(-ex)` available, and the default ones
@@ -119,10 +129,4 @@ self: super: {
executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ];
}));
- # We want the latest version of Pandoc.
- pandoc = self.pandoc_2_10_1;
- pandoc-citeproc = self.pandoc-citeproc_0_17_0_2;
- pandoc-plot = self.pandoc-plot_0_9_2_0;
- pandoc-types = self.pandoc-types_1_21;
-
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 204b5d5a08c..a2562e44527 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -41,6 +41,13 @@ self: super: {
unix = null;
xhtml = null;
+ # Hasura 1.3.1
+ # Because of ghc-heap-view, profiling needs to be disabled.
+ graphql-engine = overrideCabal (super.graphql-engine) (drv: {
+ # GHC 8.8.x needs a revert of https://github.com/hasura/graphql-engine/commit/a77bb0570f4210fb826985e17a84ddcc4c95d3ea
+ patches = [ ./patches/hasura-884-compat.patch ];
+ });
+
# GHC 8.8.x can build haddock version 2.23.*
haddock = self.haddock_2_23_1;
haddock-api = self.haddock-api_2_23_1;
@@ -107,4 +114,16 @@ self: super: {
# cabal-fmt requires Cabal3
cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_0_0; };
+ # liquidhaskell does not support ghc version 8.8.x.
+ liquid = markBroken super.liquid;
+ liquid-base = markBroken super.liquid-base;
+ liquid-bytestring = markBroken super.liquid-bytestring;
+ liquid-containers = markBroken super.liquid-containers;
+ liquid-ghc-prim = markBroken super.liquid-ghc-prim;
+ liquid-parallel = markBroken super.liquid-parallel;
+ liquid-platform = markBroken super.liquid-platform;
+ liquid-prelude = markBroken super.liquid-prelude;
+ liquid-vector = markBroken super.liquid-vector;
+ liquidhaskell = markBroken super.liquidhaskell;
+
}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 82dbdcf9334..c62e3a160e8 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -72,7 +72,7 @@ default-package-overrides:
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs
- gi-gdkx11 < 4
- # LTS Haskell 16.11
+ # LTS Haskell 16.12
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Angle ==1.0
@@ -512,7 +512,7 @@ default-package-overrides:
- constraints ==0.12
- constraint-tuples ==0.1.2
- contravariant ==1.5.2
- - contravariant-extras ==0.3.5.1
+ - contravariant-extras ==0.3.5.2
- control-bool ==0.2.1
- control-monad-free ==0.6.2
- control-monad-omega ==0.3.2
@@ -760,7 +760,7 @@ default-package-overrides:
- extended-reals ==0.2.4.0
- extensible-effects ==5.0.0.1
- extensible-exceptions ==0.1.1.4
- - extra ==1.7.6
+ - extra ==1.7.7
- extractable-singleton ==0.0.1
- extrapolate ==0.4.2
- fail ==4.9.0.0
@@ -931,7 +931,7 @@ default-package-overrides:
- gi-graphene ==1.0.1
- gi-gtk ==3.0.33
- gi-gtk-hs ==0.3.8.1
- - ginger ==0.10.0.5
+ - ginger ==0.10.1.0
- gingersnap ==0.3.1.0
- gi-pango ==1.0.22
- giphy-api ==0.7.0.0
@@ -1190,7 +1190,7 @@ default-package-overrides:
- ieee754 ==0.8.0
- if ==0.1.0.0
- iff ==0.0.6
- - ihaskell ==0.10.1.1
+ - ihaskell ==0.10.1.2
- ihs ==0.1.0.3
- ilist ==0.4.0.1
- imagesize-conduit ==1.1
@@ -1242,7 +1242,7 @@ default-package-overrides:
- iproute ==1.7.9
- IPv6Addr ==1.1.5
- ipynb ==0.1.0.1
- - ipython-kernel ==0.10.2.0
+ - ipython-kernel ==0.10.2.1
- irc ==0.6.1.0
- irc-client ==1.1.1.1
- irc-conduit ==0.3.0.4
@@ -1369,7 +1369,7 @@ default-package-overrides:
- logging ==3.0.5
- logging-facade ==0.3.0
- logging-facade-syslog ==1
- - logict ==0.7.0.2
+ - logict ==0.7.0.3
- loop ==0.3.0
- loopbreaker ==0.1.1.1
- lrucache ==1.2.0.1
@@ -1906,7 +1906,7 @@ default-package-overrides:
- safe-exceptions-checked ==0.1.0
- safe-foldable ==0.1.0.0
- safeio ==0.0.5.0
- - safe-json ==1.1.0
+ - safe-json ==1.1.1
- safe-money ==0.9
- SafeSemaphore ==0.10.1
- salak ==0.3.6
@@ -1996,7 +1996,7 @@ default-package-overrides:
- sexp-grammar ==2.1.0
- SHA ==1.6.4.4
- shake-plus ==0.1.10.0
- - shakespeare ==2.0.24.1
+ - shakespeare ==2.0.25
- shared-memory ==0.2.0.0
- shell-conduit ==4.7.0
- shell-escape ==0.2.0
@@ -2182,7 +2182,7 @@ default-package-overrides:
- TCache ==0.12.1
- tce-conf ==1.3
- tdigest ==0.2.1
- - template-haskell-compat-v0208 ==0.1.2.1
+ - template-haskell-compat-v0208 ==0.1.4
- temporary ==1.3
- temporary-rc ==1.2.0.3
- temporary-resourcet ==0.1.0.1
@@ -2463,7 +2463,7 @@ default-package-overrides:
- writer-cps-transformers ==0.5.6.1
- wss-client ==0.3.0.0
- wuss ==1.1.17
- - X11 ==1.9.1
+ - X11 ==1.9.2
- X11-xft ==0.3.1
- x11-xim ==0.0.9.0
- x509 ==1.7.5
@@ -2563,7 +2563,6 @@ extra-packages:
- Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
- doctemplates == 0.8 # required by pandoc-2.9.x
- generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x
- - ghc-check == 0.3.0.1 # only version compatible with ghcide 0.2.0
- ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0
- gi-gdk == 3.0.23 # required for gi-pango 1.0.23
- gi-gtk == 3.0.35 # required for gi-pango 1.0.23
@@ -2575,8 +2574,6 @@ extra-packages:
- happy <1.19.6 # newer versions break Agda
- happy == 1.19.9 # for purescript
- haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support
- - haskell-lsp == 0.22.* # required for ghcide 0.2.0
- - haskell-lsp-types == 0.22.* # required for ghcide 0.2.0
- haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode
- hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
- hoogle == 5.0.14 # required by hie-hoogle
@@ -2617,6 +2614,13 @@ extra-packages:
- yesod-persistent < 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227
- yesod-static ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227
- yesod-test ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227
+ - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20
+ - 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
+ - witherable == 0.3.2 # required by Hasura 1.3.1, 2020-08-20
+ - protolude == 0.3.0 # required by Hasura 1.3.1, 2020-08-20
+ - optics-core == 0.3.0.1 # required by Hasura 1.3.1, 2020-08-20
+ - base-compat == 0.11.1 # required by Hasura 1.3.1, 2020-08-20
package-maintainers:
peti:
@@ -3912,6 +3916,7 @@ broken-packages:
- codemonitor
- codepad
- codeworld-api
+ - codex
- codo-notation
- coin
- coinbase-exchange
@@ -4086,6 +4091,7 @@ broken-packages:
- Control-Monad-ST2
- contstuff-monads-tf
- contstuff-transformers
+ - conversions
- convert
- convert-annotation
- convertible-ascii
@@ -4181,6 +4187,7 @@ broken-packages:
- cryptocipher
- cryptocompare
- cryptoconditions
+ - cryptoids
- cryptol
- cryptsy-api
- crystalfontz
@@ -4723,6 +4730,7 @@ broken-packages:
- enchant
- encoding
- encoding-io
+ - encryptable
- engine-io
- engine-io-growler
- engine-io-snap
@@ -4969,6 +4977,7 @@ broken-packages:
- FileManip
- FileManipCompat
- fileneglect
+ - filepath-crypto
- filepath-io-access
- FilePather
- filepather
@@ -5459,10 +5468,12 @@ broken-packages:
- google-drive
- google-html5-slide
- google-mail-filters
+ - google-maps-geocoding
- google-oauth2
- google-oauth2-easy
- google-search
- google-server-api
+ - google-static-maps
- google-translate
- GoogleCodeJam
- GoogleDirections
@@ -5655,18 +5666,25 @@ broken-packages:
- hakismet
- hakka
- hako
+ - hakyll
- hakyll-agda
- hakyll-blaze-templates
- hakyll-contrib
- hakyll-contrib-csv
- hakyll-contrib-elm
+ - hakyll-contrib-hyphenation
- hakyll-contrib-links
- hakyll-convert
+ - hakyll-dhall
- hakyll-dir-list
+ - hakyll-favicon
- hakyll-filestore
+ - hakyll-images
- hakyll-ogmarkup
- hakyll-R
+ - hakyll-sass
- hakyll-series
+ - hakyll-shakespeare
- hakyll-shortcode
- hakyll-shortcut-links
- hakyll-typescript
@@ -6228,6 +6246,7 @@ broken-packages:
- HLogger
- hlogger
- hlongurl
+ - hlrdb
- hls
- hlwm
- hly
@@ -6740,8 +6759,20 @@ broken-packages:
- ignore
- igraph
- igrf
+ - ihaskell
+ - ihaskell-aeson
- ihaskell-basic
+ - ihaskell-blaze
+ - ihaskell-charts
+ - ihaskell-diagrams
- ihaskell-display
+ - ihaskell-gnuplot
+ - ihaskell-graphviz
+ - ihaskell-hatex
+ - ihaskell-hvega
+ - ihaskell-inline-r
+ - ihaskell-juicypixels
+ - ihaskell-magic
- ihaskell-parsec
- ihaskell-plot
- ihaskell-rlangqq
@@ -7214,6 +7245,8 @@ broken-packages:
- latest-npm-version
- latex-formulae-hakyll
- latex-formulae-pandoc
+ - latex-svg-hakyll
+ - latex-svg-pandoc
- LATS
- launchdarkly-server-sdk
- launchpad-control
@@ -7368,7 +7401,6 @@ broken-packages:
- list-mux
- list-prompt
- list-remote-forwards
- - list-t
- list-t-attoparsec
- list-t-html-parser
- list-t-http-client
@@ -7475,6 +7507,7 @@ broken-packages:
- lp-diagrams
- lp-diagrams-svg
- LRU
+ - lrucaching-haxl
- ls-usb
- lscabal
- LslPlus
@@ -8335,10 +8368,11 @@ broken-packages:
- pam
- pan-os-syslog
- panda
- - pandoc-crossref
+ - pandoc-csv2table
- pandoc-emphasize-code
- pandoc-filter-graphviz
- pandoc-include
+ - pandoc-include-code
- pandoc-japanese-filters
- pandoc-lens
- pandoc-markdown-ghci-filter
@@ -8348,6 +8382,7 @@ broken-packages:
- pandoc-pyplot
- pandoc-sidenote
- pandoc-unlit
+ - pandoc-utils
- PandocAgda
- pang-a-lambda
- pangraph
@@ -8640,6 +8675,7 @@ broken-packages:
- polysemy-http
- polysemy-optics
- polysemy-RandomFu
+ - polysemy-test
- polysemy-webserver
- polysemy-zoo
- polyseq
@@ -8741,8 +8777,9 @@ broken-packages:
- prim
- prim-array
- prim-ref
+ - primal
+ - primal-memory
- primes-type
- - primitive-extras
- primitive-indexed
- primitive-maybe
- primitive-simd
@@ -9042,6 +9079,7 @@ broken-packages:
- redis-hs
- redis-io
- redis-simple
+ - rediscaching-haxl
- redland
- Redmine
- reduce-equations
@@ -9393,6 +9431,7 @@ broken-packages:
- scotty-fay
- scotty-format
- scotty-hastache
+ - scotty-haxl
- scotty-resource
- scotty-rest
- scotty-session
@@ -9673,6 +9712,7 @@ broken-packages:
- siphon
- siren-json
- sirkel
+ - sitepipe
- sixfiguregroup
- sized-grid
- sized-types
@@ -9875,7 +9915,6 @@ broken-packages:
- Spock-api-ghcjs
- Spock-api-server
- Spock-auth
- - Spock-core
- Spock-digestive
- Spock-lucid
- Spock-worker
@@ -9983,9 +10022,7 @@ broken-packages:
- STL
- STLinkUSB
- stm-chunked-queues
- - stm-containers
- stm-firehose
- - stm-hamt
- stm-promise
- stm-stats
- stm-supply
@@ -10041,6 +10078,8 @@ broken-packages:
- stripe-haskell
- stripe-http-client
- stripe-http-streams
+ - stripe-scotty
+ - stripe-signature
- stripe-tests
- strongswan-sql
- structural-induction
@@ -10076,7 +10115,6 @@ broken-packages:
- sunroof-server
- super-user-spark
- superbubbles
- - superbuffer
- supercollider-ht
- supercollider-midi
- superconstraints
@@ -10236,6 +10274,7 @@ broken-packages:
- tellbot
- tempi
- template-default
+ - template-haskell-optics
- template-haskell-util
- template-hsml
- template-yj
@@ -10384,6 +10423,7 @@ broken-packages:
- timeseries
- timespan
- timeutils
+ - timezone-detect
- timezone-olson-th
- timezone-unix
- tini
@@ -10734,6 +10774,7 @@ broken-packages:
- uuagc-diagrams
- uuid-aeson
- uuid-bytes
+ - uuid-crypto
- uvector
- uvector-algorithms
- uxadt
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 36c45377d97..513ef0fc21c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -8892,8 +8892,8 @@ self: {
}:
mkDerivation {
pname = "HPDF";
- version = "1.5.0";
- sha256 = "0bwj0haxw9a061xzn5zh2qc5d958n0g9izbnn0w08dazfjyl8v46";
+ version = "1.5.1";
+ sha256 = "0kqbfzcqapxvkg52mixqjhxb79ziyfsfvazbzrwjvhp9nqhikn6y";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -10781,6 +10781,21 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {inherit (pkgs) openssl;};
+ "HsOpenSSL_0_11_4_19" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
+ mkDerivation {
+ pname = "HsOpenSSL";
+ version = "0.11.4.19";
+ sha256 = "0iy3qrir13kp1c7a0xwj2ngfwhqxqbc5j0vj5mi0w3arv7w0x6ds";
+ setupHaskellDepends = [ base Cabal ];
+ libraryHaskellDepends = [ base bytestring network time ];
+ librarySystemDepends = [ openssl ];
+ testHaskellDepends = [ base bytestring ];
+ description = "Partial OpenSSL binding for Haskell";
+ license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) openssl;};
+
"HsOpenSSL-x509-system" = callPackage
({ mkDerivation, base, bytestring, HsOpenSSL, unix }:
mkDerivation {
@@ -12770,8 +12785,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "LiterateMarkdown";
- version = "0.1.0.0";
- sha256 = "0v9j7kqjvkrafxl4ahfqj1xvigim9vnd3kflgqagzccrgx9kz5gv";
+ version = "0.1.0.1";
+ sha256 = "0rgjf6blrg8rq75872bpwp6cn3bg89718cy6ik2m22881zfvr2m7";
isLibrary = false;
isExecutable = true;
libraryHaskellDepends = [ base ];
@@ -18961,8 +18976,6 @@ self: {
];
description = "Another Haskell web framework for rapid development";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"Spock-digestive" = callPackage
@@ -21304,24 +21317,6 @@ self: {
}) {};
"X11" = callPackage
- ({ mkDerivation, base, data-default, libX11, libXext, libXinerama
- , libXrandr, libXrender, libXScrnSaver
- }:
- mkDerivation {
- pname = "X11";
- version = "1.9.1";
- sha256 = "0gg6852mrlgl8zng1j84fismz7k81jr5fk92glgkscf8q6ryg0bm";
- libraryHaskellDepends = [ base data-default ];
- librarySystemDepends = [
- libX11 libXext libXinerama libXrandr libXrender libXScrnSaver
- ];
- description = "A binding to the X11 graphics library";
- license = stdenv.lib.licenses.bsd3;
- }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver;
- inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama;
- inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
-
- "X11_1_9_2" = callPackage
({ mkDerivation, base, data-default, libX11, libXext, libXinerama
, libXrandr, libXrender, libXScrnSaver
}:
@@ -21335,7 +21330,6 @@ self: {
];
description = "A binding to the X11 graphics library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver;
inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama;
inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
@@ -22570,8 +22564,10 @@ self: {
}:
mkDerivation {
pname = "accelerate-kullback-liebler";
- version = "0.1.2.0";
- sha256 = "16psmn0wakrrym8m98ing4nrh8r7qvbn04b28sicl5jdbfhg1fdn";
+ version = "0.1.2.1";
+ sha256 = "1pvgm5w8m7226wa139h49fd0f5bsrz3a7x30wx3mzjn80acgsm63";
+ revision = "1";
+ editedCabalFile = "1255a274j1ssiy934kl507giyv6zjmwiipqfj72gjik6ss0ih2vz";
libraryHaskellDepends = [ accelerate base mwc-random-accelerate ];
testHaskellDepends = [
accelerate accelerate-llvm-native accelerate-llvm-ptx base
@@ -24102,7 +24098,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "aeson_1_5_3_0" = callPackage
+ "aeson_1_5_4_0" = callPackage
({ mkDerivation, attoparsec, base, base-compat
, base-compat-batteries, base-orphans, base16-bytestring
, bytestring, containers, data-fix, deepseq, Diff, directory, dlist
@@ -24114,8 +24110,8 @@ self: {
}:
mkDerivation {
pname = "aeson";
- version = "1.5.3.0";
- sha256 = "0slqxmm4rikndzq2rmgydaqgf9qqnni62bgr0zihf25d65mgk3lm";
+ version = "1.5.4.0";
+ sha256 = "17qgrli6xy3cds5k9ijdsmnl89h48w89mgqqy6kfah1bjlzs3l40";
libraryHaskellDepends = [
attoparsec base base-compat-batteries bytestring containers
data-fix deepseq dlist ghc-prim hashable primitive scientific
@@ -24838,6 +24834,8 @@ self: {
pname = "aeson-schemas";
version = "1.2.0";
sha256 = "1fc8zzpkq6alkbl0v473h8diin8lqpliq6d3bsrh5bfny8yapvpk";
+ revision = "1";
+ editedCabalFile = "1kcsnpb4img9a122yz9lf7s0ils7ppbjyknbck2m8ip977kv04dp";
libraryHaskellDepends = [
aeson base bytestring first-class-families megaparsec
template-haskell text unordered-containers
@@ -25983,15 +25981,18 @@ self: {
}) {};
"algebra-driven-design" = callPackage
- ({ mkDerivation, base, containers, file-embed, JuicyPixels, mtl
- , QuickCheck, quickspec
+ ({ mkDerivation, base, bytestring, containers, dlist, file-embed
+ , generic-data, hashable, JuicyPixels, monoid-subclasses
+ , monoidal-containers, mtl, multiset, QuickCheck, quickspec
}:
mkDerivation {
pname = "algebra-driven-design";
- version = "0.1.0.1";
- sha256 = "0jydvrmrz6kvrbk8hv0mb01g67j0bdxi519s7blwf3gfkxfjvyyv";
+ version = "0.1.1.1";
+ sha256 = "0dp622a70biscjh1r0yyr9mz65g8p2wz60jrzrq8yhs1y4gsigs0";
libraryHaskellDepends = [
- base containers file-embed JuicyPixels mtl QuickCheck quickspec
+ base bytestring containers dlist file-embed generic-data hashable
+ JuicyPixels monoid-subclasses monoidal-containers mtl multiset
+ QuickCheck quickspec
];
description = "Companion library for the book Algebra-Driven Design by Sandy Maguire";
license = stdenv.lib.licenses.bsd3;
@@ -26222,6 +26223,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ally-invest" = callPackage
+ ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
+ , http-client, http-client-tls, safe, text, time
+ }:
+ mkDerivation {
+ pname = "ally-invest";
+ version = "0.1.0.0";
+ sha256 = "0n6vz0xd4y4div0p63mnbpng2dqwrsmrdhs25r10xw2wc2bznl79";
+ libraryHaskellDepends = [
+ aeson authenticate-oauth base bytestring http-client
+ http-client-tls safe text time
+ ];
+ testHaskellDepends = [
+ aeson authenticate-oauth base bytestring http-client
+ http-client-tls safe text time
+ ];
+ description = "Ally Invest integration library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"almost-fix" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -31838,6 +31859,8 @@ self: {
pname = "arbtt";
version = "0.10.2";
sha256 = "02izfga7nv2saq4d1xwigq41hhbc02830sjppqsqw6vcb8082vs1";
+ revision = "1";
+ editedCabalFile = "10b6ax854a4ig33iwcg21vad4gpgibfpb6xqkxd80hvkrj4gqd62";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -37525,15 +37548,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "base16_0_3_0_0" = callPackage
+ "base16_0_3_0_1" = callPackage
({ mkDerivation, base, base16-bytestring, bytestring, criterion
, deepseq, primitive, QuickCheck, random-bytestring, tasty
, tasty-hunit, tasty-quickcheck, text, text-short
}:
mkDerivation {
pname = "base16";
- version = "0.3.0.0";
- sha256 = "151g3lxma65z0hqi3pqy57bidkhibvdsppkl37p1cldg7whvc708";
+ version = "0.3.0.1";
+ sha256 = "10id9h9mas4kb4kfiz7hhp2hhwnb9mh92pr327c53jqxi4hazgnd";
libraryHaskellDepends = [
base bytestring deepseq primitive text text-short
];
@@ -46447,8 +46470,8 @@ self: {
}:
mkDerivation {
pname = "bv-sized";
- version = "1.0.1";
- sha256 = "12l69p95z1ihwbfhlm0wyr1bdhs52ng4fvdsqxhgn0bpx9skzw73";
+ version = "1.0.2";
+ sha256 = "0lx7cm7404r71ciksv8g58797k6x02zh337ra88syhj7nzlnij5w";
libraryHaskellDepends = [
base bitwise bytestring panic parameterized-utils th-lift
];
@@ -48005,8 +48028,8 @@ self: {
}:
mkDerivation {
pname = "cabal-fmt";
- version = "0.1.3";
- sha256 = "1d91kmx2q6ygx2avwgi9ihkdazngjf7i3ajyp3cmry5ahvv62x7z";
+ version = "0.1.4";
+ sha256 = "0akc63g7h21nyyr9m0dwjlnxqw8k26zx5s2mzn8zak2q9i88ds1b";
isLibrary = false;
isExecutable = true;
libraryHaskellDepends = [
@@ -48017,7 +48040,8 @@ self: {
base bytestring directory filepath optparse-applicative
];
testHaskellDepends = [
- base bytestring Cabal filepath process tasty tasty-golden
+ base bytestring Cabal containers filepath process tasty
+ tasty-golden
];
doHaddock = false;
description = "Format .cabal files";
@@ -49363,7 +49387,7 @@ self: {
"calamity" = callPackage
({ mkDerivation, aeson, async, base, bytestring, colour
, concurrent-extra, containers, data-default-class, data-flags
- , deepseq, deque, df1, di-polysemy, exceptions, fmt, focus
+ , deepseq, deque, df1, di-core, di-polysemy, exceptions, fmt, focus
, generic-lens, generic-override, generic-override-aeson, hashable
, http-date, http-types, lens, lens-aeson, megaparsec, mime-types
, mtl, polysemy, polysemy-plugin, reflection, safe-exceptions
@@ -49373,11 +49397,11 @@ self: {
}:
mkDerivation {
pname = "calamity";
- version = "0.1.19.2";
- sha256 = "14vw42zsyzcdi5nmgfl2mi4zxqbkvmd525ybsx324qj3cp3k8mn6";
+ version = "0.1.20.0";
+ sha256 = "0b11nkh4wynb8rdhn8qym5422l0nc49shkkp2mfbwh7yhmzaqwrh";
libraryHaskellDepends = [
aeson async base bytestring colour concurrent-extra containers
- data-default-class data-flags deepseq deque df1 di-polysemy
+ data-default-class data-flags deepseq deque df1 di-core di-polysemy
exceptions fmt focus generic-lens generic-override
generic-override-aeson hashable http-date http-types lens
lens-aeson megaparsec mime-types mtl polysemy polysemy-plugin
@@ -56723,6 +56747,8 @@ self: {
];
description = "A ctags file generator for cabal project dependencies";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"codo-notation" = callPackage
@@ -58171,14 +58197,16 @@ self: {
}) {};
"compact-sequences" = callPackage
- ({ mkDerivation, base, containers, primitive, transformers }:
+ ({ mkDerivation, base, mtl, primitive, QuickCheck, tasty
+ , tasty-quickcheck, transformers
+ }:
mkDerivation {
pname = "compact-sequences";
- version = "0.1.0.0";
- sha256 = "148zjnnnn82vgn4ybs5z6nx9xv2wd73q2cavaa2nyjn1kcqqw7a8";
- libraryHaskellDepends = [ base containers primitive transformers ];
- testHaskellDepends = [ base ];
- description = "Stacks and queues with compact representations";
+ version = "0.2.0.0";
+ sha256 = "0v7s99d7syspgc8z8mhdykyrsjyx0r0vjyf64plidndld2zg0swn";
+ libraryHaskellDepends = [ base mtl primitive transformers ];
+ testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+ description = "Stacks, queues, and deques with compact representations";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -59742,6 +59770,35 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "conduit_1_3_2_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq, directory
+ , exceptions, filepath, gauge, hspec, kan-extensions
+ , mono-traversable, mtl, mwc-random, primitive, QuickCheck
+ , resourcet, safe, silently, split, text, transformers, unix
+ , unliftio, unliftio-core, vector
+ }:
+ mkDerivation {
+ pname = "conduit";
+ version = "1.3.2.1";
+ sha256 = "0kyl1zspkp14vrgxgc2zpy9rd9h6aa7m9f385sgshysnhbc7hbg5";
+ libraryHaskellDepends = [
+ base bytestring directory exceptions filepath mono-traversable mtl
+ primitive resourcet text transformers unix unliftio-core vector
+ ];
+ testHaskellDepends = [
+ base bytestring containers directory exceptions filepath hspec
+ mono-traversable mtl QuickCheck resourcet safe silently split text
+ transformers unliftio vector
+ ];
+ benchmarkHaskellDepends = [
+ base containers deepseq gauge hspec kan-extensions mwc-random
+ transformers vector
+ ];
+ description = "Streaming data processing library";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"conduit-algorithms" = callPackage
({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
, conduit-combinators, conduit-extra, conduit-zstd, containers
@@ -61891,21 +61948,6 @@ self: {
}) {};
"contravariant-extras" = callPackage
- ({ mkDerivation, base, contravariant, template-haskell
- , template-haskell-compat-v0208
- }:
- mkDerivation {
- pname = "contravariant-extras";
- version = "0.3.5.1";
- sha256 = "0r9bg6mrm5whv7inpp9m2agwbnk70vg0v7nrflpxkif81scpq0z9";
- libraryHaskellDepends = [
- base contravariant template-haskell template-haskell-compat-v0208
- ];
- description = "Extras for the \"contravariant\" package";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "contravariant-extras_0_3_5_2" = callPackage
({ mkDerivation, base, contravariant, template-haskell
, template-haskell-compat-v0208
}:
@@ -61918,7 +61960,6 @@ self: {
];
description = "Extras for the \"contravariant\" package";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"control" = callPackage
@@ -62278,6 +62319,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "conversions" = callPackage
+ ({ mkDerivation, base, bytestring, control-bool, devtools
+ , exceptions, mtl, source-constraints, template-haskell, text
+ , unliftio-core
+ }:
+ mkDerivation {
+ pname = "conversions";
+ version = "0.0.3";
+ sha256 = "1fn7ras17maswl7fw5hdbw02b8wjlzs2gcfwdxrw9xipjbw81hir";
+ libraryHaskellDepends = [
+ base bytestring control-bool devtools exceptions mtl
+ source-constraints template-haskell text unliftio-core
+ ];
+ testHaskellDepends = [
+ base bytestring control-bool devtools exceptions mtl
+ source-constraints template-haskell text unliftio-core
+ ];
+ description = "Injective explicit total and partial conversions";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"convert" = callPackage
({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
, data-default, impossible, lens, template-haskell, text
@@ -64998,6 +65062,8 @@ self: {
];
description = "Reversable and secure encoding of object ids as a bytestring";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"cryptoids-class" = callPackage
@@ -65041,8 +65107,8 @@ self: {
}:
mkDerivation {
pname = "cryptol";
- version = "2.9.0";
- sha256 = "0bxx4pslmyjaqhskbi95a67fmpjhnbmgcys68xzs2y8ndjnz9jrb";
+ version = "2.9.1";
+ sha256 = "0c484pla89igj77x5n2n50a1la8j4jaqpc0pc58c1pcijffxac5l";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -65883,8 +65949,8 @@ self: {
pname = "cue-sheet";
version = "2.0.1";
sha256 = "0papll3xcq2ipmya61jr71gf3zx2swmys829x5sbz7lv6abj9r3i";
- revision = "1";
- editedCabalFile = "0md9051a0jp4vkss15dyyf1w7ylpqmvzfdj9xb1rgj95s1x7cx2g";
+ revision = "2";
+ editedCabalFile = "0kblqr8mjmps56a7pbjwnby5ik8grmj15l1qir7q9kbn44x4s8l3";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers exceptions megaparsec mtl QuickCheck
@@ -66366,15 +66432,15 @@ self: {
}) {};
"cut-the-crap" = callPackage
- ({ mkDerivation, base, exceptions, generic-lens, hspec, hspec-core
- , lens, optparse-applicative, pocketsphinx, QuickCheck
+ ({ mkDerivation, base, c2hs, exceptions, generic-lens, hspec
+ , hspec-core, lens, optparse-applicative, pocketsphinx, QuickCheck
, quickcheck-classes, regex-tdfa, shelly, sphinxbase
, system-filepath, temporary, text, time, unliftio-core
}:
mkDerivation {
pname = "cut-the-crap";
- version = "1.4.0";
- sha256 = "03xip8a9inqir8zm244ffv92ag5r7z8hlh0qz7z4vfdmg54mhhnq";
+ version = "1.4.2";
+ sha256 = "16l8ar38nl2sgsbwjslhxd8z2wyjmdgmi51sic3vvyv7n6b9mr51";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -66382,17 +66448,20 @@ self: {
shelly system-filepath temporary text time unliftio-core
];
libraryPkgconfigDepends = [ pocketsphinx sphinxbase ];
+ libraryToolDepends = [ c2hs ];
executableHaskellDepends = [
base exceptions generic-lens lens optparse-applicative regex-tdfa
shelly system-filepath temporary text time unliftio-core
];
executablePkgconfigDepends = [ pocketsphinx sphinxbase ];
+ executableToolDepends = [ c2hs ];
testHaskellDepends = [
base exceptions generic-lens hspec hspec-core lens
optparse-applicative QuickCheck quickcheck-classes regex-tdfa
shelly system-filepath temporary text time unliftio-core
];
testPkgconfigDepends = [ pocketsphinx sphinxbase ];
+ testToolDepends = [ c2hs ];
description = "Cuts out uninteresting parts of videos by detecting silences";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -71211,6 +71280,20 @@ self: {
broken = true;
}) {};
+ "dependent-map_0_2_4_0" = callPackage
+ ({ mkDerivation, base, containers, dependent-sum }:
+ mkDerivation {
+ pname = "dependent-map";
+ version = "0.2.4.0";
+ sha256 = "0il2naf6gdkvkhscvqd8kg9v911vdhqp9h10z5546mninnyrdcsx";
+ revision = "1";
+ editedCabalFile = "0a5f35d1sgfq1cl1r5bgb5pwfjniiycxiif4ycxglaizp8g5rlr1";
+ libraryHaskellDepends = [ base containers dependent-sum ];
+ description = "Dependent finite maps (partial dependent products)";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dependent-map" = callPackage
({ mkDerivation, base, constraints-extras, containers
, dependent-sum
@@ -71258,6 +71341,18 @@ self: {
broken = true;
}) {};
+ "dependent-sum_0_4" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "dependent-sum";
+ version = "0.4";
+ sha256 = "07hs9s78wiybwjwkal2yq65hdavq0gg1h2ld7wbph61s2nsfrpm8";
+ libraryHaskellDepends = [ base ];
+ description = "Dependent sum type";
+ license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dependent-sum" = callPackage
({ mkDerivation, base, constraints-extras, some }:
mkDerivation {
@@ -71965,8 +72060,8 @@ self: {
}:
mkDerivation {
pname = "devtools";
- version = "0.0.2";
- sha256 = "1p5695sgp48mznk9pb9kl24j9wa9gwq344hr3cdzzsvabfi1pkz2";
+ version = "0.0.3";
+ sha256 = "09lwvi4mbwkhazzmngpblxh2bvvxz1j4ndzsh3bp3nwwwa0xiihm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -72870,8 +72965,8 @@ self: {
({ mkDerivation, base, df1, di-core, di-df1, di-handle, polysemy }:
mkDerivation {
pname = "di-polysemy";
- version = "0.1.4.0";
- sha256 = "0p9wyli73skjbdbb0dgqb3p37rbijpadywsi0dwjdwdzpddjarcm";
+ version = "0.2.0.0";
+ sha256 = "09n9kjfv6zx016zkglr0ya0gmi18xdgl08iv7pvh41h0mp435aaq";
libraryHaskellDepends = [
base df1 di-core di-df1 di-handle polysemy
];
@@ -81418,8 +81513,8 @@ self: {
}:
mkDerivation {
pname = "elynx";
- version = "0.3.4";
- sha256 = "0pm8gwaz6yzdhqw4cs98kbardcc6qsnvzx67f48hamrqvnvqa2ym";
+ version = "0.4.0";
+ sha256 = "0qhq3h1va7pfcz58mkdw690v88jr3ynk2rrwl0s5qdz8xxvs5n3a";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -81439,8 +81534,8 @@ self: {
}:
mkDerivation {
pname = "elynx-markov";
- version = "0.3.4";
- sha256 = "0kd92zkafnx6bbzpn9xswl2wnkzzgjwmd7l6ycj43vrlgigp27v6";
+ version = "0.4.0";
+ sha256 = "0ikk9xk71xyn1fmhzx59lfyk9skjkvhg19xb2afhcylnbg41f3wz";
libraryHaskellDepends = [
async attoparsec base bytestring containers elynx-seq hmatrix
integration math-functions mwc-random parallel primitive statistics
@@ -81459,8 +81554,8 @@ self: {
({ mkDerivation, attoparsec, base, bytestring, hspec }:
mkDerivation {
pname = "elynx-nexus";
- version = "0.3.4";
- sha256 = "16ckh34xywxggq0vf4aig912zb8n1fybz52k1vchrj0y0rxbvsa4";
+ version = "0.4.0";
+ sha256 = "02g67w8xracbasnkha383vz0ls1haxr78ia27k292lx572l17dvv";
libraryHaskellDepends = [ attoparsec base bytestring ];
testHaskellDepends = [ base hspec ];
description = "Import and export Nexus files";
@@ -81476,8 +81571,8 @@ self: {
}:
mkDerivation {
pname = "elynx-seq";
- version = "0.3.4";
- sha256 = "1zz0b2p8znigy5m12qacsdb52h09c2khc3l7i8glirhca74flsif";
+ version = "0.4.0";
+ sha256 = "03dh4rjdgn580niljgrl0cfw5h2mah8q1252jq3jx8349jxgpcmh";
libraryHaskellDepends = [
aeson attoparsec base bytestring containers matrices mwc-random
parallel primitive vector vector-th-unbox word8
@@ -81500,8 +81595,8 @@ self: {
}:
mkDerivation {
pname = "elynx-tools";
- version = "0.3.4";
- sha256 = "0nldyxbj3ym4nnq62asi70w9c8h79s10g50gr7dkhdgbr07v47vs";
+ version = "0.4.0";
+ sha256 = "0n8rf7y4qxhx35fhbhj4yc541ydsx8qvy66d11sl5a836gmsv0rr";
libraryHaskellDepends = [
aeson attoparsec base base16-bytestring bytestring
cryptohash-sha256 deepseq directory fast-logger hmatrix
@@ -81523,8 +81618,8 @@ self: {
}:
mkDerivation {
pname = "elynx-tree";
- version = "0.3.4";
- sha256 = "1xhrmpnqg4gjr262xqi31rc406l40v0f5yfj0ah7jb1z45m23hsk";
+ version = "0.4.0";
+ sha256 = "1j22gkg1971wrih4gs4bxzkghvd3ddj85s6s5mcqhrfxmdnpsn2c";
libraryHaskellDepends = [
aeson attoparsec base bytestring comonad containers deepseq
double-conversion elynx-nexus math-functions mwc-random primitive
@@ -81989,6 +82084,31 @@ self: {
broken = true;
}) {};
+ "encryptable" = callPackage
+ ({ mkDerivation, base, bytestring, cryptonite, esqueleto
+ , generic-arbitrary, hspec, persistent, persistent-template
+ , QuickCheck, quickcheck-instances, text, universum
+ }:
+ mkDerivation {
+ pname = "encryptable";
+ version = "0.1";
+ sha256 = "0svvzk2js91qzcmbsfjcs2qs65a2b5ywgbpnyqidz53dlnbbk2r1";
+ libraryHaskellDepends = [
+ base bytestring cryptonite esqueleto generic-arbitrary hspec
+ persistent persistent-template QuickCheck quickcheck-instances text
+ universum
+ ];
+ testHaskellDepends = [
+ base bytestring cryptonite esqueleto generic-arbitrary hspec
+ persistent persistent-template QuickCheck quickcheck-instances text
+ universum
+ ];
+ description = "Typed encryption with persistent support";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"endo" = callPackage
({ mkDerivation, base, between, data-default-class, mtl
, transformers
@@ -82995,6 +83115,20 @@ self: {
broken = true;
}) {};
+ "errata" = callPackage
+ ({ mkDerivation, base, containers, text }:
+ mkDerivation {
+ pname = "errata";
+ version = "0.1.0.0";
+ sha256 = "193m9c0409jvk6s8acqad3dg5x97mr6814gq0diyc3yc7b7mdmvf";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers text ];
+ executableHaskellDepends = [ base containers text ];
+ description = "Source code error pretty printing";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"errno" = callPackage
({ mkDerivation, base, mtl }:
mkDerivation {
@@ -83462,6 +83596,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "esqueleto_3_3_3_3" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
+ , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql
+ , mysql-simple, persistent, persistent-mysql, persistent-postgresql
+ , persistent-sqlite, persistent-template, postgresql-libpq
+ , postgresql-simple, resourcet, tagged, text, time, transformers
+ , unliftio, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "esqueleto";
+ version = "3.3.3.3";
+ sha256 = "14h6x4bj39ffz7arn9ddyjabb5s2a8ynphjvha606lz4mcv3mxkv";
+ libraryHaskellDepends = [
+ aeson attoparsec base blaze-html bytestring conduit containers
+ monad-logger persistent resourcet tagged text time transformers
+ unliftio unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson attoparsec base blaze-html bytestring conduit containers
+ exceptions hspec monad-logger mtl mysql mysql-simple persistent
+ persistent-mysql persistent-postgresql persistent-sqlite
+ persistent-template postgresql-libpq postgresql-simple resourcet
+ tagged text time transformers unliftio unordered-containers vector
+ ];
+ description = "Type-safe EDSL for SQL queries on persistent backends";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ess" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -86118,24 +86281,6 @@ self: {
}) {};
"extra" = callPackage
- ({ mkDerivation, base, clock, directory, filepath, process
- , QuickCheck, quickcheck-instances, time, unix
- }:
- mkDerivation {
- pname = "extra";
- version = "1.7.6";
- sha256 = "1mdqw88crblabxz4sg803ww6pkl5prnjnpjwh11n32y2npky5ask";
- libraryHaskellDepends = [
- base clock directory filepath process time unix
- ];
- testHaskellDepends = [
- base directory filepath QuickCheck quickcheck-instances unix
- ];
- description = "Extra functions I use";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "extra_1_7_7" = callPackage
({ mkDerivation, base, clock, directory, filepath, process
, QuickCheck, quickcheck-instances, time, unix
}:
@@ -86151,7 +86296,6 @@ self: {
];
description = "Extra functions I use";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"extract-dependencies" = callPackage
@@ -88982,6 +89126,8 @@ self: {
];
description = "Reversable and secure encoding of object ids as filepaths";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"filepath-io-access" = callPackage
@@ -89192,15 +89338,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "filtrable_0_1_5_0" = callPackage
- ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck
- , transformers
+ "filtrable_0_1_6_0" = callPackage
+ ({ mkDerivation, base, containers, smallcheck, tasty
+ , tasty-smallcheck, transformers
}:
mkDerivation {
pname = "filtrable";
- version = "0.1.5.0";
- sha256 = "0glarxd5yaflyhy8ni6q0kzrhgwi8msr3q4zf6by80g2qd33kvh8";
- libraryHaskellDepends = [ base transformers ];
+ version = "0.1.6.0";
+ sha256 = "058jl7wjaxzvcayc9qzpikxvi9x42civ4sb02jh66rcvpndbfh5y";
+ libraryHaskellDepends = [ base containers transformers ];
testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
description = "Class of filtrable containers";
license = stdenv.lib.licenses.bsd3;
@@ -96806,12 +96952,12 @@ self: {
}) {};
"generic-match" = callPackage
- ({ mkDerivation, base }:
+ ({ mkDerivation, base, generics-sop }:
mkDerivation {
pname = "generic-match";
- version = "0.2.0.2";
- sha256 = "16r43gzl3a8ycxbhggqk09mrm63r9db85nk1j2x4j4lzcwap7bid";
- libraryHaskellDepends = [ base ];
+ version = "0.3.0.0";
+ sha256 = "1h27gd7f0px3xgan9liqwav8xhl0smn6nhdmi7ggd18mjafa1ngv";
+ libraryHaskellDepends = [ base generics-sop ];
description = "First class pattern matching";
license = stdenv.lib.licenses.mit;
}) {};
@@ -98326,22 +98472,6 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "ghc-check_0_3_0_1" = callPackage
- ({ mkDerivation, base, filepath, ghc, ghc-paths, process
- , template-haskell, transformers
- }:
- mkDerivation {
- pname = "ghc-check";
- version = "0.3.0.1";
- sha256 = "180xqs4g90v9sdjb0b3baqk62gbnw1xkv76wdq5ap49q0730s3vz";
- libraryHaskellDepends = [
- base filepath ghc ghc-paths process template-haskell transformers
- ];
- description = "detect mismatches between compile-time and run-time versions of the ghc api";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"ghc-check" = callPackage
({ mkDerivation, base, containers, directory, filepath, ghc
, ghc-paths, process, safe-exceptions, template-haskell
@@ -99710,46 +99840,52 @@ self: {
"ghcide" = callPackage
({ mkDerivation, aeson, array, async, base, base16-bytestring
- , binary, bytestring, containers, cryptohash-sha1, data-default
- , deepseq, directory, extra, filepath, fuzzy, ghc, ghc-boot
- , ghc-boot-th, ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev
+ , binary, bytestring, Chart, Chart-diagrams, containers
+ , cryptohash-sha1, data-default, deepseq, diagrams, diagrams-svg
+ , directory, extra, filepath, fuzzy, ghc, ghc-boot, ghc-boot-th
+ , ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev
, haddock-library, hashable, haskell-lsp, haskell-lsp-types
, hie-bios, hslogger, lens, lsp-test, mtl, network-uri
- , optparse-applicative, parser-combinators, prettyprinter
- , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances
- , regex-tdfa, rope-utf16-splay, safe-exceptions, shake, sorted-list
- , stm, syb, tasty, tasty-expected-failure, tasty-hunit
- , tasty-quickcheck, tasty-rerun, text, time, transformers, unix
- , unordered-containers, utf8-string
+ , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
+ , process, QuickCheck, quickcheck-instances, regex-tdfa
+ , rope-utf16-splay, safe, safe-exceptions, shake, sorted-list, stm
+ , syb, tasty, tasty-expected-failure, tasty-hunit, tasty-quickcheck
+ , tasty-rerun, text, time, transformers, unix, unordered-containers
+ , utf8-string, yaml
}:
mkDerivation {
pname = "ghcide";
- version = "0.2.0";
- sha256 = "1zadj34583qp8xz0iv2r0anqh96r94jv13iary5bk1m9zbhf4f7v";
+ version = "0.3.0";
+ sha256 = "001g3240qd9q9j00cmvz9d0b73mbf8mv5204cyf5jh04xcd09908";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson array async base binary bytestring containers data-default
- deepseq directory extra filepath fuzzy ghc ghc-boot ghc-boot-th
- haddock-library hashable haskell-lsp haskell-lsp-types hslogger mtl
- network-uri prettyprinter prettyprinter-ansi-terminal regex-tdfa
- rope-utf16-splay safe-exceptions shake sorted-list stm syb text
- time transformers unix unordered-containers utf8-string
+ aeson array async base base16-bytestring binary bytestring
+ containers cryptohash-sha1 data-default deepseq directory extra
+ filepath fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-paths
+ haddock-library hashable haskell-lsp haskell-lsp-types hie-bios
+ hslogger mtl network-uri prettyprinter prettyprinter-ansi-terminal
+ regex-tdfa rope-utf16-splay safe safe-exceptions shake sorted-list
+ stm syb text time transformers unix unordered-containers
+ utf8-string
];
executableHaskellDepends = [
- aeson async base base16-bytestring binary bytestring containers
- cryptohash-sha1 data-default deepseq directory extra filepath ghc
- ghc-check ghc-paths gitrev hashable haskell-lsp haskell-lsp-types
- hie-bios hslogger optparse-applicative shake text time
+ aeson base bytestring containers data-default directory extra
+ filepath gitrev hashable haskell-lsp haskell-lsp-types hie-bios
+ lsp-test optparse-applicative process safe-exceptions text
unordered-containers
];
testHaskellDepends = [
- aeson base bytestring containers directory extra filepath ghc
- ghc-typelits-knownnat haddock-library haskell-lsp haskell-lsp-types
- lens lsp-test network-uri parser-combinators QuickCheck
- quickcheck-instances rope-utf16-splay shake tasty
- tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun
- text
+ aeson base binary bytestring containers directory extra filepath
+ ghc ghc-typelits-knownnat haddock-library haskell-lsp
+ haskell-lsp-types lens lsp-test network-uri optparse-applicative
+ process QuickCheck quickcheck-instances rope-utf16-splay safe
+ safe-exceptions shake tasty tasty-expected-failure tasty-hunit
+ tasty-quickcheck tasty-rerun text
+ ];
+ benchmarkHaskellDepends = [
+ aeson base Chart Chart-diagrams diagrams diagrams-svg directory
+ extra filepath shake text yaml
];
description = "The core of an IDE";
license = stdenv.lib.licenses.asl20;
@@ -101536,38 +101672,6 @@ self: {
}) {};
"ginger" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, base, bytestring
- , data-default, filepath, http-types, mtl, optparse-applicative
- , parsec, process, regex-tdfa, safe, scientific, tasty, tasty-hunit
- , tasty-quickcheck, text, time, transformers, unordered-containers
- , utf8-string, vector, yaml
- }:
- mkDerivation {
- pname = "ginger";
- version = "0.10.0.5";
- sha256 = "187118g5fs97msdab4jmhrwy28hhi81ihyc1v6rfb535bsnm70sw";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- aeson aeson-pretty base bytestring data-default filepath http-types
- mtl parsec regex-tdfa safe scientific text time transformers
- unordered-containers utf8-string vector
- ];
- executableHaskellDepends = [
- aeson base bytestring data-default optparse-applicative process
- text transformers unordered-containers utf8-string yaml
- ];
- testHaskellDepends = [
- aeson base bytestring data-default mtl tasty tasty-hunit
- tasty-quickcheck text time transformers unordered-containers
- utf8-string
- ];
- description = "An implementation of the Jinja2 template language in Haskell";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "ginger_0_10_1_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring
, data-default, filepath, http-types, mtl, optparse-applicative
, parsec, process, regex-tdfa, safe, scientific, tasty, tasty-hunit
@@ -101597,7 +101701,6 @@ self: {
];
description = "An implementation of the Jinja2 template language in Haskell";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gingersnap" = callPackage
@@ -104321,8 +104424,8 @@ self: {
pname = "godot-haskell";
version = "0.1.0.0";
sha256 = "02nvs84bq4nif235iycjwkxmabvs0avwm2xilpwv8kddv95z1f8i";
- revision = "3";
- editedCabalFile = "0dpvraw31gpzzlsy7j7mv99jvmwhldycll1hnbw2iscb5zs2g409";
+ revision = "4";
+ editedCabalFile = "06mb33ll7m24dr6mvzi2r6v0bl6k0680y751563zhz0ybrjypckk";
libraryHaskellDepends = [
aeson ansi-wl-pprint base bytestring casing colour containers lens
linear mtl parsec parsers stm template-haskell text
@@ -106762,6 +106865,8 @@ self: {
];
description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"google-oauth2" = callPackage
@@ -106894,6 +106999,8 @@ self: {
];
description = "Bindings to the Google Maps Static API (formerly Static Maps API)";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"google-translate" = callPackage
@@ -108134,9 +108241,8 @@ self: {
}:
mkDerivation {
pname = "graphql";
- version = "0.9.0.0";
- sha256 = "1lyzrnbf1w3j60wwi8cwbh1hxzvsw8vn9aymy1qzxgjgmi2wx94g";
- enableSeparateDataOutput = true;
+ version = "0.10.0.0";
+ sha256 = "0j0l8jmfnn3aw9vmk5z571ly9vk711hsz7cdklc243539vfnsywn";
libraryHaskellDepends = [
aeson base conduit containers exceptions hspec-expectations
megaparsec parser-combinators scientific text transformers
@@ -109414,7 +109520,7 @@ self: {
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;};
+ }) {gst-plugins-base = null; gstreamer = null;};
"gt-tools" = callPackage
({ mkDerivation, base, containers, extensible-exceptions, haskeline
@@ -111374,8 +111480,8 @@ self: {
pname = "hackage-security";
version = "0.6.0.1";
sha256 = "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli";
- revision = "2";
- editedCabalFile = "12m1a5jggzjz3d1q5j41dcs51hi1vwqqxrba0h9jiajv11f3hb39";
+ revision = "3";
+ editedCabalFile = "03cc99ynscxhmw1mxm2xn2ywvfnl1zfb3rdbbcc7fvm92nznzpyi";
libraryHaskellDepends = [
base base16-bytestring base64-bytestring bytestring Cabal
containers cryptohash-sha256 directory ed25519 filepath ghc-prim
@@ -112449,6 +112555,8 @@ self: {
testToolDepends = [ utillinux ];
description = "A static website compiler library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {inherit (pkgs) utillinux;};
"hakyll-R" = callPackage
@@ -112562,6 +112670,8 @@ self: {
libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ];
description = "automatic hyphenation for Hakyll";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hakyll-contrib-links" = callPackage
@@ -112626,6 +112736,8 @@ self: {
executableHaskellDepends = [ base dhall hakyll ];
description = "Dhall compiler for Hakyll";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hakyll-dir-list" = callPackage
@@ -112670,6 +112782,8 @@ self: {
executableHaskellDepends = [ base hakyll ];
testHaskellDepends = [ base ];
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hakyll-filestore" = callPackage
@@ -112707,6 +112821,8 @@ self: {
];
description = "Hakyll utilities to work with images";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hakyll-ogmarkup" = callPackage
@@ -112735,6 +112851,8 @@ self: {
];
description = "Hakyll SASS compiler over hsass";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hakyll-series" = callPackage
@@ -112765,6 +112883,8 @@ self: {
];
description = "Hakyll Hamlet compiler";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hakyll-shortcode" = callPackage
@@ -121699,8 +121819,8 @@ self: {
}:
mkDerivation {
pname = "headed-megaparsec";
- version = "0.1.0.4";
- sha256 = "1nl66j4fqmjcxkrmhm7jnbqqpw48727wfbb9xn0cz4yy1brivjrb";
+ version = "0.2";
+ sha256 = "1s2alhwmkk5czilm1m2dp72xpbdjhn7yhghrs1aca2js71x5j7qj";
libraryHaskellDepends = [
base case-insensitive megaparsec parser-combinators selective
];
@@ -121803,6 +121923,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "heapsize" = callPackage
+ ({ mkDerivation, base, criterion, deepseq, ghc-heap, hashable
+ , primitive, unordered-containers
+ }:
+ mkDerivation {
+ pname = "heapsize";
+ version = "0.1";
+ sha256 = "0cmzmz6f572is70sp79fxriywl5d19rcb8c32x22c2yazyl6c6d9";
+ libraryHaskellDepends = [
+ base deepseq ghc-heap hashable primitive unordered-containers
+ ];
+ benchmarkHaskellDepends = [ base criterion deepseq primitive ];
+ description = "Determine the size of runtime data structures";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"heapsort" = callPackage
({ mkDerivation, array, base }:
mkDerivation {
@@ -124917,7 +125053,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hie-bios_0_7_0" = callPackage
+ "hie-bios_0_7_1" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, bytestring
, conduit, conduit-extra, containers, cryptohash-sha1, deepseq
, directory, extra, file-embed, filepath, ghc, hslogger
@@ -124927,8 +125063,8 @@ self: {
}:
mkDerivation {
pname = "hie-bios";
- version = "0.7.0";
- sha256 = "17jfiyxq1m0n1i9a565niczivkkxdd36l9gxqbhfafxsykggliab";
+ version = "0.7.1";
+ sha256 = "00gkr4dbbs70vnd6y90iirss88j8ax714l9jmwdfkmslwd4m2ml8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -126659,10 +126795,8 @@ self: {
}:
mkDerivation {
pname = "hledger";
- version = "1.18.1";
- sha256 = "1yl6akcbmz5qy559m0k0cndwb6wdzvq2jqn7ahc46v3ai6hwk20c";
- revision = "1";
- editedCabalFile = "1fz1wwpxf6scr8nnrd2n1g92vya9bd0l54fcx3sqhyk5kaf8kp2z";
+ version = "1.19";
+ sha256 = "0kbvdpplc7h2xi1kzyk78wnmdxa32psn8swgk1apyzz36m03pax1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -126754,23 +126888,23 @@ self: {
}) {};
"hledger-flow" = callPackage
- ({ mkDerivation, base, containers, foldl, HUnit
- , optparse-applicative, stm, text, time, turtle
+ ({ mkDerivation, base, containers, exceptions, foldl, HUnit
+ , optparse-applicative, path, path-io, stm, text, time, turtle
}:
mkDerivation {
pname = "hledger-flow";
- version = "0.13.2.0";
- sha256 = "1zajlqbayr6vm45y3901xwgg6acjn8fwx73mm9bnbsbxfzxn4g7d";
+ version = "0.14.1.0";
+ sha256 = "0xw2dqlvfi898d89f3srszylx9p3pasg3mmj6qqnwr5ng612pf4b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base containers foldl stm text time turtle
+ base containers exceptions foldl path path-io stm text time turtle
];
executableHaskellDepends = [
- base optparse-applicative text turtle
+ base optparse-applicative path text turtle
];
testHaskellDepends = [
- base containers foldl HUnit stm text turtle
+ base containers foldl HUnit path path-io stm text turtle
];
description = "An hledger workflow focusing on automated statement import and classification";
license = stdenv.lib.licenses.gpl3;
@@ -126785,8 +126919,8 @@ self: {
}:
mkDerivation {
pname = "hledger-iadd";
- version = "1.3.11";
- sha256 = "1pqjyybbnhckz16in6skx3582aykk2yq5bf4ghbhj8iqbm3cczqf";
+ version = "1.3.12";
+ sha256 = "0klrqss2ch4yi50m1rybznzsjg4ahbx7rg9n8w5svpf34fdlp048";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -126814,8 +126948,8 @@ self: {
}:
mkDerivation {
pname = "hledger-interest";
- version = "1.5.5";
- sha256 = "1rsi0mpdgi0g7m07y8bd3gpw5jc8saxw15ab7yhxif4m7dfwjgmg";
+ version = "1.6.0";
+ sha256 = "0s0pmdm1vk4ib5ncs9mxyzr3dx5m6ji9778kddzqwxc9y9gvq5sq";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -126850,35 +126984,33 @@ self: {
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base
, base-compat-batteries, blaze-markup, bytestring, call-stack
, cassava, cassava-megaparsec, cmdargs, containers, data-default
- , Decimal, deepseq, directory, doctest, extra, fgl, file-embed
- , filepath, Glob, hashtables, megaparsec, mtl, old-time, parsec
+ , Decimal, directory, doctest, extra, fgl, file-embed, filepath
+ , Glob, hashtables, megaparsec, mtl, old-time, parsec
, parser-combinators, pretty-show, regex-tdfa, safe, split, tabular
, tasty, tasty-hunit, template-haskell, text, time, timeit
- , transformers, uglymemo, utf8-string
+ , transformers, uglymemo, unordered-containers, utf8-string
}:
mkDerivation {
pname = "hledger-lib";
- version = "1.18.1";
- sha256 = "16fd3412n4vdnjacngjx5078yzmypn389m91308kgbd8anv6bhj4";
- revision = "1";
- editedCabalFile = "1icjbfzdq2yd3h6qx245xyb4qahxih97rx63qhxx3vaicvph40pk";
+ version = "1.19";
+ sha256 = "0asg5zxi664p1csjs70c40jnrq8z4fhawbjm0v6sl8sbx7pn1rj1";
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal array base base-compat-batteries
blaze-markup bytestring call-stack cassava cassava-megaparsec
- cmdargs containers data-default Decimal deepseq directory extra fgl
+ cmdargs containers data-default Decimal directory extra fgl
file-embed filepath Glob hashtables megaparsec mtl old-time parsec
parser-combinators pretty-show regex-tdfa safe split tabular tasty
tasty-hunit template-haskell text time timeit transformers uglymemo
- utf8-string
+ unordered-containers utf8-string
];
testHaskellDepends = [
aeson aeson-pretty ansi-terminal array base base-compat-batteries
blaze-markup bytestring call-stack cassava cassava-megaparsec
- cmdargs containers data-default Decimal deepseq directory doctest
- extra fgl file-embed filepath Glob hashtables megaparsec mtl
- old-time parsec parser-combinators pretty-show regex-tdfa safe
- split tabular tasty tasty-hunit template-haskell text time timeit
- transformers uglymemo utf8-string
+ cmdargs containers data-default Decimal directory doctest extra fgl
+ file-embed filepath Glob hashtables megaparsec mtl old-time parsec
+ parser-combinators pretty-show regex-tdfa safe split tabular tasty
+ tasty-hunit template-haskell text time timeit transformers uglymemo
+ unordered-containers utf8-string
];
description = "A reusable library providing the core functionality of hledger";
license = stdenv.lib.licenses.gpl3;
@@ -126937,8 +127069,8 @@ self: {
}:
mkDerivation {
pname = "hledger-ui";
- version = "1.18.1";
- sha256 = "0ggfz93f14znnjzkznzblsdk6iqbwwj2yxzx5rgsr0xcjzm8gx64";
+ version = "1.19";
+ sha256 = "1xi67k28b63cbg38771dqncwdh6qrcnb0gr31r5hwkglznk3ajss";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -126985,10 +127117,8 @@ self: {
}:
mkDerivation {
pname = "hledger-web";
- version = "1.18.1";
- sha256 = "1s10xyiqs77xl949m7rc71a4511i755yiv88jb0pc32xba7a2b1y";
- revision = "1";
- editedCabalFile = "01amhyjlw6xjh97zhxx8j05jszw0c0wnv7ka835n7rjnnv8199l3";
+ version = "1.19";
+ sha256 = "1nmacg23smaagfwzr7qwnlwiswdr4gb8zkscgxkiyfl5z97gy58y";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -127217,6 +127347,8 @@ self: {
];
description = "High-level Redis Database";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hlrdb-core" = callPackage
@@ -134156,6 +134288,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec_2_7_4" = callPackage
+ ({ mkDerivation, base, hspec-core, hspec-discover
+ , hspec-expectations, QuickCheck
+ }:
+ mkDerivation {
+ pname = "hspec";
+ version = "2.7.4";
+ sha256 = "0zql8cl025ai3yx2dhp1sgvmw8n4ngqbrlmb42hcgv26q8qnvhmi";
+ libraryHaskellDepends = [
+ base hspec-core hspec-discover hspec-expectations QuickCheck
+ ];
+ description = "A Testing Framework for Haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hspec-attoparsec" = callPackage
({ mkDerivation, attoparsec, base, bytestring, hspec
, hspec-expectations, text
@@ -134238,6 +134386,34 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec-core_2_7_4" = callPackage
+ ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
+ , deepseq, directory, filepath, hspec-expectations, hspec-meta
+ , HUnit, process, QuickCheck, quickcheck-io, random, setenv
+ , silently, stm, temporary, tf-random, transformers
+ }:
+ mkDerivation {
+ pname = "hspec-core";
+ version = "2.7.4";
+ sha256 = "1k0rs9399m6bzmndc9ybs26mxrzkl9pifrijvknysbaqfcifmq35";
+ libraryHaskellDepends = [
+ ansi-terminal array base call-stack clock deepseq directory
+ filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+ setenv stm tf-random transformers
+ ];
+ testHaskellDepends = [
+ ansi-terminal array base call-stack clock deepseq directory
+ filepath hspec-expectations hspec-meta HUnit process QuickCheck
+ quickcheck-io random setenv silently stm temporary tf-random
+ transformers
+ ];
+ testToolDepends = [ hspec-meta ];
+ testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
+ description = "A Testing Framework for Haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hspec-dirstream" = callPackage
({ mkDerivation, base, dirstream, filepath, hspec, hspec-core
, pipes, pipes-safe, system-filepath, text
@@ -134275,6 +134451,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec-discover_2_7_4" = callPackage
+ ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
+ }:
+ mkDerivation {
+ pname = "hspec-discover";
+ version = "2.7.4";
+ sha256 = "02laain23bcnzsl65347qr5knvrmrlhd0kzc0d88kx59lpzm27a0";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base directory filepath ];
+ executableHaskellDepends = [ base directory filepath ];
+ testHaskellDepends = [
+ base directory filepath hspec-meta QuickCheck
+ ];
+ testToolDepends = [ hspec-meta ];
+ description = "Automatically discover and run Hspec tests";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hspec-expectations" = callPackage
({ mkDerivation, base, call-stack, HUnit, nanospec }:
mkDerivation {
@@ -134522,6 +134718,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hspec-megaparsec_2_2_0" = callPackage
+ ({ mkDerivation, base, containers, hspec, hspec-expectations
+ , megaparsec
+ }:
+ mkDerivation {
+ pname = "hspec-megaparsec";
+ version = "2.2.0";
+ sha256 = "0hyf06gzzqd6sqd76crwxycwgx804sd39z7i0c2vmv1qgsxv82gn";
+ libraryHaskellDepends = [
+ base containers hspec-expectations megaparsec
+ ];
+ testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
+ description = "Utility functions for testing Megaparsec parsers with Hspec";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hspec-meta" = callPackage
({ mkDerivation, ansi-terminal, array, base, call-stack, clock
, deepseq, directory, filepath, hspec-expectations, HUnit
@@ -137174,15 +137387,15 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
- "http-link-header_1_1_1" = callPackage
+ "http-link-header_1_2_0" = callPackage
({ mkDerivation, attoparsec, base, bytestring, criterion, directory
, errors, hspec, hspec-attoparsec, http-api-data, network-uri
, QuickCheck, text, transformers
}:
mkDerivation {
pname = "http-link-header";
- version = "1.1.1";
- sha256 = "0bgffcmdswmpw3gl2yricz56y0cxb4x8l0j0qs60c6h16rcp5xwh";
+ version = "1.2.0";
+ sha256 = "1y0vr8fi8pap7ixbafp2lxvdk9hh56h370jw7qd11gm2032nnvg9";
libraryHaskellDepends = [
attoparsec base bytestring errors http-api-data network-uri text
];
@@ -141907,41 +142120,6 @@ self: {
}) {};
"ihaskell" = callPackage
- ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
- , cmdargs, containers, directory, filepath, ghc, ghc-boot
- , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
- , hspec, hspec-contrib, http-client, http-client-tls, HUnit
- , ipython-kernel, mtl, parsec, process, random, raw-strings-qq
- , setenv, shelly, split, stm, strict, text, time, transformers
- , unix, unordered-containers, utf8-string, vector
- }:
- mkDerivation {
- pname = "ihaskell";
- version = "0.10.1.1";
- sha256 = "10rsdcc2l0gkhapvi5vzjc7m2bwv67k4iy3vjkx8i92jk6023y64";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- aeson base base64-bytestring bytestring cereal cmdargs containers
- directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline
- haskell-src-exts hlint http-client http-client-tls ipython-kernel
- mtl parsec process random shelly split stm strict text time
- transformers unix unordered-containers utf8-string vector
- ];
- executableHaskellDepends = [
- aeson base bytestring containers directory ghc ipython-kernel
- process strict text transformers unix unordered-containers
- ];
- testHaskellDepends = [
- base directory ghc ghc-paths here hspec hspec-contrib HUnit
- raw-strings-qq setenv shelly text transformers
- ];
- description = "A Haskell backend kernel for the IPython project";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "ihaskell_0_10_1_2" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
, cmdargs, containers, directory, filepath, ghc, ghc-boot
, ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
@@ -141975,6 +142153,7 @@ self: {
description = "A Haskell backend kernel for the IPython project";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ihaskell-aeson" = callPackage
@@ -141990,6 +142169,8 @@ self: {
];
description = "IHaskell display instances for Aeson";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ihaskell-basic" = callPackage
@@ -142014,6 +142195,8 @@ self: {
libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ];
description = "IHaskell display instances for blaze-html types";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ihaskell-charts" = callPackage
@@ -142030,6 +142213,8 @@ self: {
];
description = "IHaskell display instances for charts types";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ihaskell-diagrams" = callPackage
@@ -142046,6 +142231,8 @@ self: {
];
description = "IHaskell display instances for diagram types";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ihaskell-display" = callPackage
@@ -142070,6 +142257,8 @@ self: {
libraryHaskellDepends = [ base bytestring gnuplot ihaskell ];
description = "IHaskell display instance for Gnuplot (from gnuplot package)";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ihaskell-graphviz" = callPackage
@@ -142081,6 +142270,8 @@ self: {
libraryHaskellDepends = [ base bytestring ihaskell process ];
description = "IHaskell display instance for GraphViz (external binary)";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ihaskell-hatex" = callPackage
@@ -142092,6 +142283,8 @@ self: {
libraryHaskellDepends = [ base HaTeX ihaskell text ];
description = "IHaskell display instances for hatex";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ihaskell-hvega" = callPackage
@@ -142103,6 +142296,8 @@ self: {
libraryHaskellDepends = [ aeson base hvega ihaskell text ];
description = "IHaskell display instance for hvega types";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ihaskell-inline-r" = callPackage
@@ -142120,6 +142315,8 @@ self: {
];
description = "Embed R quasiquotes and plots in IHaskell notebooks";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ihaskell-juicypixels" = callPackage
@@ -142134,6 +142331,8 @@ self: {
];
description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ihaskell-magic" = callPackage
@@ -142150,6 +142349,8 @@ self: {
];
description = "IHaskell display instances for bytestrings";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"ihaskell-parsec" = callPackage
@@ -142621,6 +142822,25 @@ self: {
broken = true;
}) {};
+ "immortal_0_2_2_1" = callPackage
+ ({ mkDerivation, base, lifted-base, monad-control, stm, tasty
+ , tasty-hunit, transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "immortal";
+ version = "0.2.2.1";
+ sha256 = "13lddk62byx8w41k80d24q31mmijacnqqz64zrrkls9si2ia2jpd";
+ libraryHaskellDepends = [
+ base lifted-base monad-control stm transformers-base
+ ];
+ testHaskellDepends = [
+ base lifted-base stm tasty tasty-hunit transformers
+ ];
+ description = "Spawn threads that never die (unless told to do so)";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"immortal" = callPackage
({ mkDerivation, base, stm, tasty, tasty-hunit, transformers
, unliftio-core
@@ -143495,20 +143715,20 @@ self: {
({ mkDerivation, base, cleveland, constraints, containers, fmt
, hedgehog, hspec-expectations, HUnit, lorentz, morley
, morley-prelude, reflection, singletons, tasty, tasty-discover
- , tasty-hedgehog, tasty-hunit-compat, template-haskell, vinyl
+ , tasty-hedgehog, tasty-hunit-compat, vinyl, with-utf8
}:
mkDerivation {
pname = "indigo";
- version = "0.2.0";
- sha256 = "070ha5s8yirci7zdnh8gy8hdh158zsj7z7blwsr7inw753fsh1jp";
+ version = "0.2.1";
+ sha256 = "07zgqg6d4ijfvdg0q9lgfi545c903lc6mbcc9mzyfl4b3gpxqfpj";
libraryHaskellDepends = [
base constraints containers lorentz morley morley-prelude
- reflection singletons template-haskell vinyl
+ reflection singletons vinyl with-utf8
];
testHaskellDepends = [
base cleveland containers fmt hedgehog hspec-expectations HUnit
lorentz morley morley-prelude singletons tasty tasty-hedgehog
- tasty-hunit-compat
+ tasty-hunit-compat with-utf8
];
testToolDepends = [ tasty-discover ];
description = "Convenient imperative eDSL over Lorentz";
@@ -146037,28 +146257,6 @@ self: {
}) {};
"ipython-kernel" = callPackage
- ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text
- , containers, cryptonite, directory, filepath, memory, mtl, parsec
- , process, temporary, text, transformers, unordered-containers
- , uuid, zeromq4-haskell
- }:
- mkDerivation {
- pname = "ipython-kernel";
- version = "0.10.2.0";
- sha256 = "0ylqbcs7xdhkm0if18f1cmz4144gx0p4r9wgggbzphfx8v8lhz9a";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- aeson base bytestring cereal cereal-text containers cryptonite
- directory filepath memory mtl parsec process temporary text
- transformers unordered-containers uuid zeromq4-haskell
- ];
- description = "A library for creating kernels for IPython frontends";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "ipython-kernel_0_10_2_1" = callPackage
({ mkDerivation, aeson, base, bytestring, cereal, cereal-text
, containers, cryptonite, directory, filepath, memory, mtl, parsec
, process, temporary, text, transformers, unordered-containers
@@ -146078,7 +146276,6 @@ self: {
];
description = "A library for creating kernels for IPython frontends";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"irc" = callPackage
@@ -148877,6 +149074,8 @@ self: {
pname = "json-api-lib";
version = "0.3.0.0";
sha256 = "14lycfqjp3v6lnr4vqagps80dpvy8z6gs6sqq3qz184xyw4m2ini";
+ revision = "1";
+ editedCabalFile = "16k87v87lq2xf3rbig4229a2gc3p6s9a771g48a95xc0rk4k4hkk";
libraryHaskellDepends = [
aeson base containers data-default deepseq lens lens-aeson text
unordered-containers uri-encode
@@ -149698,8 +149897,8 @@ self: {
}:
mkDerivation {
pname = "json5hs";
- version = "0.1.2.2";
- sha256 = "19r1ripvalrhvlqdk0pvm18b4a8sibdwlc60i2yj7da10rdx5cv1";
+ version = "0.1.3.1";
+ sha256 = "18i01c0045c26s80g69wdgyk9aa3pj092z0s6hmq9z5xddid2s8h";
libraryHaskellDepends = [
array base bytestring containers mtl pretty syb text
];
@@ -154074,6 +154273,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "language-c_0_9" = callPackage
+ ({ mkDerivation, alex, array, base, bytestring, containers, deepseq
+ , directory, filepath, happy, mtl, pretty, process, syb
+ }:
+ mkDerivation {
+ pname = "language-c";
+ version = "0.9";
+ sha256 = "0a2z97ajdbql583jcganadi9frqj09cidqb1hlh0gl6w6aj82kii";
+ libraryHaskellDepends = [
+ array base bytestring containers deepseq directory filepath mtl
+ pretty process syb
+ ];
+ libraryToolDepends = [ alex happy ];
+ testHaskellDepends = [ base directory filepath process ];
+ description = "Analysis and generation of C code";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"language-c-comments" = callPackage
({ mkDerivation, alex, array, base, language-c }:
mkDerivation {
@@ -154255,8 +154473,8 @@ self: {
}:
mkDerivation {
pname = "language-dickinson";
- version = "1.3.0.1";
- sha256 = "0681w4rz547if52yk0k32drhllx0k906nir0gs6xv0pqxkjc07ri";
+ version = "1.3.0.2";
+ sha256 = "1dldip54xd54kbfgc3kl79z86p6c4q37vx43r3qpymxpc85kid84";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -155592,6 +155810,8 @@ self: {
];
description = "Use actual LaTeX to render formulae inside Hakyll pages";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"latex-svg-image" = callPackage
@@ -155628,6 +155848,8 @@ self: {
executableHaskellDepends = [ base latex-svg-image pandoc-types ];
description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"lattices" = callPackage
@@ -155666,8 +155888,8 @@ self: {
}:
mkDerivation {
pname = "launchdarkly-server-sdk";
- version = "2.0.0";
- sha256 = "0dfs9nq3vcf8w2k1x51pixb4wb47rg9nzyjgfpzx6vip296ivyf7";
+ version = "2.0.1";
+ sha256 = "19jp9809jrh3swvsji5zgbqg4qg5gayv6bj0svq00wyzaisns3dd";
libraryHaskellDepends = [
aeson attoparsec base base16-bytestring bytestring
bytestring-conversion clock containers cryptohash exceptions extra
@@ -157891,8 +158113,8 @@ self: {
}:
mkDerivation {
pname = "libfuse3";
- version = "0.1.0.0";
- sha256 = "0qwlaqcpmi7dfsjk219z0hrqmayg46qx1cwj1vcz1nfv8jlm8yif";
+ version = "0.1.1.0";
+ sha256 = "0jnh6by1k42h8kl78anh8lqwhymdz2xgynm82vidsd7jjzanmf3j";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -159640,19 +159862,22 @@ self: {
}) {};
"lingo" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, containers, directory
- , filepath, hspec, raw-strings-qq, text, yaml
+ ({ mkDerivation, base, bytestring, containers, directory, filepath
+ , hspec, raw-strings-qq, text, yaml
}:
mkDerivation {
pname = "lingo";
- version = "0.3.2.0";
- sha256 = "0qym6svpvxsxbhbppk0lkpp2zbqa13f0njkxnpyz5id581c3v8hx";
- setupHaskellDepends = [
- base bytestring Cabal containers directory filepath text yaml
- ];
+ version = "0.5.0.1";
+ sha256 = "0h57g6r2n9q8asx35prn8p5mn35qnp8cy2pdrrpmrvhq7islwd8s";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
base bytestring containers filepath raw-strings-qq text yaml
];
+ executableHaskellDepends = [
+ base bytestring containers directory filepath raw-strings-qq text
+ yaml
+ ];
testHaskellDepends = [ base hspec ];
description = "File extension based programming language detection";
license = stdenv.lib.licenses.bsd3;
@@ -160576,8 +160801,6 @@ self: {
testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
description = "ListT done right";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"list-t-attoparsec" = callPackage
@@ -162469,18 +162692,6 @@ self: {
}) {};
"logict" = callPackage
- ({ mkDerivation, base, mtl, tasty, tasty-hunit }:
- mkDerivation {
- pname = "logict";
- version = "0.7.0.2";
- sha256 = "1xfgdsxg0lp8m0a2cb83rcxrnnc37asfikay2kydi933anh9ihfc";
- libraryHaskellDepends = [ base mtl ];
- testHaskellDepends = [ base mtl tasty tasty-hunit ];
- description = "A backtracking logic-programming monad";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "logict_0_7_0_3" = callPackage
({ mkDerivation, base, mtl, tasty, tasty-hunit }:
mkDerivation {
pname = "logict";
@@ -162490,7 +162701,6 @@ self: {
testHaskellDepends = [ base mtl tasty tasty-hunit ];
description = "A backtracking logic-programming monad";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"logict-state" = callPackage
@@ -163240,6 +163450,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "lrucaching-haxl" = callPackage
+ ({ mkDerivation, base, hashable, haxl, lrucaching, psqueues }:
+ mkDerivation {
+ pname = "lrucaching-haxl";
+ version = "0.1.0.0";
+ sha256 = "0pn2f671ak1grzjigyvan5wagh9vyqhsz86jfy1z281rd2pw4gk2";
+ libraryHaskellDepends = [ base hashable haxl lrucaching psqueues ];
+ description = "Combine lrucaching and haxl";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"ls-usb" = callPackage
({ mkDerivation, ansi-wl-pprint, base, base-unicode-symbols
, cmdtheline, text, usb, usb-id-database, vector
@@ -165207,6 +165430,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "managed_1_0_8" = callPackage
+ ({ mkDerivation, base, transformers }:
+ mkDerivation {
+ pname = "managed";
+ version = "1.0.8";
+ sha256 = "00wzfy9facwgimrilz7bxaigr79w10733h8zfgyhll644p2rnz38";
+ libraryHaskellDepends = [ base transformers ];
+ description = "A monad for managed values";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"manatee" = callPackage
({ mkDerivation, base, binary, cairo, containers, dbus-client
, dbus-core, derive, directory, filepath, gtk, gtk-serialized-event
@@ -166394,6 +166629,30 @@ self: {
broken = true;
}) {};
+ "massiv_0_5_4_0" = callPackage
+ ({ mkDerivation, base, bytestring, data-default-class, deepseq
+ , doctest, exceptions, mersenne-random-pure64, primitive
+ , QuickCheck, random, scheduler, splitmix, template-haskell
+ , unliftio-core, vector
+ }:
+ mkDerivation {
+ pname = "massiv";
+ version = "0.5.4.0";
+ sha256 = "0dmm6x5izmjl1l803fvmxzqrh0jpg56z2aid228a4c44n620dzln";
+ libraryHaskellDepends = [
+ base bytestring data-default-class deepseq exceptions primitive
+ scheduler unliftio-core vector
+ ];
+ testHaskellDepends = [
+ base doctest mersenne-random-pure64 QuickCheck random splitmix
+ template-haskell
+ ];
+ description = "Massiv (Массив) is an Array Library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"massiv-io" = callPackage
({ mkDerivation, base, bytestring, Cabal, cabal-doctest, Color
, data-default-class, deepseq, doctest, exceptions, filepath, hspec
@@ -166489,6 +166748,30 @@ self: {
broken = true;
}) {};
+ "massiv-test_0_1_4" = callPackage
+ ({ mkDerivation, base, bytestring, containers, data-default
+ , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec
+ , massiv, mwc-random, primitive, QuickCheck, scheduler, unliftio
+ , vector
+ }:
+ mkDerivation {
+ pname = "massiv-test";
+ version = "0.1.4";
+ sha256 = "1qhvph2s6bkw3zb43arq1zvrfyr09phqjwxhzsqxi2x2fcrdyvyn";
+ libraryHaskellDepends = [
+ base bytestring data-default-class deepseq exceptions hspec massiv
+ primitive QuickCheck scheduler unliftio vector
+ ];
+ testHaskellDepends = [
+ base bytestring containers data-default deepseq genvalidity-hspec
+ hspec massiv mwc-random primitive QuickCheck scheduler vector
+ ];
+ description = "Library that contains generators, properties and tests for Massiv Array Library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"master-plan" = callPackage
({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific
, hspec, megaparsec, mtl, optparse-applicative, QuickCheck
@@ -168088,6 +168371,27 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "megaparsec_9_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, case-insensitive, containers
+ , criterion, deepseq, mtl, parser-combinators, scientific, text
+ , transformers, weigh
+ }:
+ mkDerivation {
+ pname = "megaparsec";
+ version = "9.0.0";
+ sha256 = "1x10f2b14ww306am9w06s23va26ab3vwdh0jk67ql6ybigxh0asi";
+ libraryHaskellDepends = [
+ base bytestring case-insensitive containers deepseq mtl
+ parser-combinators scientific text transformers
+ ];
+ benchmarkHaskellDepends = [
+ base containers criterion deepseq text weigh
+ ];
+ description = "Monadic parser combinators";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"megaparsec-tests" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, containers
, hspec, hspec-discover, hspec-expectations, hspec-megaparsec
@@ -168114,6 +168418,31 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "megaparsec-tests_9_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, case-insensitive, containers
+ , hspec, hspec-discover, hspec-expectations, hspec-megaparsec
+ , megaparsec, mtl, parser-combinators, QuickCheck, scientific, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "megaparsec-tests";
+ version = "9.0.0";
+ sha256 = "0zm246r8k48mj5v2dxjan7dsrcnw54bcm27swi5mh8c0yb3vcvab";
+ libraryHaskellDepends = [
+ base bytestring containers hspec hspec-expectations
+ hspec-megaparsec megaparsec mtl QuickCheck text transformers
+ ];
+ testHaskellDepends = [
+ base bytestring case-insensitive containers hspec
+ hspec-expectations hspec-megaparsec megaparsec mtl
+ parser-combinators QuickCheck scientific text transformers
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Test utilities and the test suite of Megaparsec";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"meldable-heap" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -169301,6 +169630,34 @@ self: {
broken = true;
}) {};
+ "micro-gateway" = callPackage
+ ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive
+ , containers, cookie, data-default-class, hslogger, http-client
+ , http-types, network-uri, optparse-applicative, scotty, signature
+ , stm, streaming-commons, text, time, unix-time
+ , unordered-containers, wai, wai-cors, wai-websockets, warp
+ , websockets, yaml
+ }:
+ mkDerivation {
+ pname = "micro-gateway";
+ version = "1.1.0.0";
+ sha256 = "1jb703vcqncxw12cmgmyg63rw6fmfa4mv1685z6vab3xzq7kvxv7";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base binary bytestring case-insensitive containers cookie
+ hslogger http-client http-types scotty signature stm text time
+ unix-time unordered-containers wai websockets
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring data-default-class http-client network-uri
+ optparse-applicative scotty streaming-commons text wai-cors
+ wai-websockets warp websockets yaml
+ ];
+ description = "A Micro service gateway";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"micro-recursion-schemes" = callPackage
({ mkDerivation, base, cpphs, HUnit, template-haskell
, th-abstraction
@@ -170102,6 +170459,36 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "mime-mail-ses_0_4_3" = callPackage
+ ({ mkDerivation, base, base16-bytestring, base64-bytestring
+ , byteable, bytestring, case-insensitive, conduit, cryptohash
+ , http-client, http-client-tls, http-conduit, http-types, mime-mail
+ , optparse-applicative, tasty, tasty-hunit, text, time, xml-conduit
+ , xml-types
+ }:
+ mkDerivation {
+ pname = "mime-mail-ses";
+ version = "0.4.3";
+ sha256 = "0v4b0y28kf7mx80z16j82wmaccpggkc262f7cn9g9j2nfayy2xhj";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base base16-bytestring base64-bytestring byteable bytestring
+ case-insensitive conduit cryptohash http-client http-client-tls
+ http-conduit http-types mime-mail text time xml-conduit xml-types
+ ];
+ executableHaskellDepends = [
+ base http-client http-client-tls mime-mail optparse-applicative
+ text
+ ];
+ testHaskellDepends = [
+ base bytestring case-insensitive tasty tasty-hunit time
+ ];
+ description = "Send mime-mail messages via Amazon SES";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mime-string" = callPackage
({ mkDerivation, base, base64-string, bytestring, iconv, mtl
, network, old-locale, old-time, random
@@ -171269,8 +171656,8 @@ self: {
pname = "mmark-ext";
version = "0.2.1.2";
sha256 = "1s44vznj8hkk7iymnzczbglxnw1q84gmm8q9yiwh0jkiw4kdi91c";
- revision = "2";
- editedCabalFile = "0q633c7zv0liaz0a46llgy21x0snbfhl33qx9plh2sxhjvhvhmpj";
+ revision = "3";
+ editedCabalFile = "02i6577qislr0qvgmfamcixpxgb7bh68lg18n3vkq6xbnjxdpwpx";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri
@@ -171743,8 +172130,8 @@ self: {
({ mkDerivation, base, doctest, typelits-witnesses }:
mkDerivation {
pname = "modular-arithmetic";
- version = "2.0.0.0";
- sha256 = "1mwhjn315vgpvf95ay6rf77hwpb7hjfw9bcginnz4cb30nn8kvl9";
+ version = "2.0.0.1";
+ sha256 = "132cxgrw6lsdkpqi69v1f9jgl5icslwi5qclv4rc03hn0mcnl2sz";
libraryHaskellDepends = [ base typelits-witnesses ];
testHaskellDepends = [ base doctest typelits-witnesses ];
description = "A type for integers modulo some constant";
@@ -173923,6 +174310,8 @@ self: {
pname = "monoidal-containers";
version = "0.6.0.1";
sha256 = "1j5mfs0ysvwk3jsmq4hlj4l3kasfc28lk1b3xaymf9dw48ac5j82";
+ revision = "1";
+ editedCabalFile = "06agyfnhr4cr42m4zj7xwl5an3skbjvba53a5i6sl9890gx7mml3";
libraryHaskellDepends = [
aeson base containers deepseq hashable lens newtype semialign
semigroups these unordered-containers
@@ -174925,17 +175314,17 @@ self: {
"mprelude" = callPackage
({ mkDerivation, base, devtools, source-constraints, text
- , text-conversions
+ , unliftio-core
}:
mkDerivation {
pname = "mprelude";
- version = "0.1.0";
- sha256 = "0p7zx0b49dp2vd3mx3knfl9gqbh6sj2znc372bmh6ja57g1kv8ds";
+ version = "0.2.0";
+ sha256 = "0llkcbilz138zlrqmsny74g9ybjf665h7w84g0q0rli9dvjnc4bl";
libraryHaskellDepends = [
- base source-constraints text text-conversions
+ base source-constraints text unliftio-core
];
testHaskellDepends = [
- base devtools source-constraints text text-conversions
+ base devtools source-constraints text unliftio-core
];
description = "A minimalish prelude";
license = stdenv.lib.licenses.bsd3;
@@ -179074,15 +179463,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "neat-interpolation_0_5_1_1" = callPackage
+ "neat-interpolation_0_5_1_2" = callPackage
({ mkDerivation, base, megaparsec, QuickCheck, quickcheck-instances
, rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell
, text
}:
mkDerivation {
pname = "neat-interpolation";
- version = "0.5.1.1";
- sha256 = "1bjl2k3b42kqwq15fsnjxxcadsch5dck9cwf8zvnh4gkyfmkbbx4";
+ version = "0.5.1.2";
+ sha256 = "18c48r5qwrapkjh35l5dng3ahkkn1ch47vc4nzjwh4a9va94laln";
libraryHaskellDepends = [ base megaparsec template-haskell text ];
testHaskellDepends = [
QuickCheck quickcheck-instances rerebase tasty tasty-hunit
@@ -189170,7 +189559,6 @@ self: {
'';
description = "Conversion between markup formats";
license = stdenv.lib.licenses.gpl2Plus;
- hydraPlatforms = stdenv.lib.platforms.none;
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
@@ -189273,8 +189661,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-crossref";
- version = "0.3.7.0";
- sha256 = "1mw5bcl0z1vps4xz72pznr1b9ag1g9sxhm2f51wm3236z9q28za6";
+ version = "0.3.8.1";
+ sha256 = "15h484xq015jy65mzaqjqyi4ppnqfrdvvj1llmp8k00vb2xcrzrr";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -189298,8 +189686,6 @@ self: {
];
description = "Pandoc filter for cross-references";
license = stdenv.lib.licenses.gpl2;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"pandoc-csv2table" = callPackage
@@ -189315,6 +189701,8 @@ self: {
executableHaskellDepends = [ base csv pandoc pandoc-types ];
description = "Convert CSV to Pandoc Table Markdown";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"pandoc-emphasize-code" = callPackage
@@ -189324,8 +189712,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-emphasize-code";
- version = "0.2.4";
- sha256 = "0fz0pkxx64d8bvrsg9s704mhhw9djq74x56dbv5w3y65nch8p3a5";
+ version = "0.3.0";
+ sha256 = "02bg6aippqbjzx1dqzq63qh4ggm6pyw6p8p5iay9ldxdgx4jicnc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -189425,6 +189813,8 @@ self: {
];
description = "A Pandoc filter for including code from source files";
license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"pandoc-japanese-filters" = callPackage
@@ -189755,6 +190145,8 @@ self: {
];
description = "Utility functions to work with Pandoc in Haskell applications";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"pandoc-vimhl" = callPackage
@@ -189779,8 +190171,8 @@ self: {
({ mkDerivation }:
mkDerivation {
pname = "pandora";
- version = "0.2.9";
- sha256 = "0gl5h4krn2aigxfqppa4fr8vir2s5xrh8s363frh82fgdxblhjgc";
+ version = "0.3.0";
+ sha256 = "1k9b714rb9cgapn0vgwymrq7ma1lmq6klmlv37c6gqmb1c5k7ijh";
description = "A box of patterns and paradigms";
license = stdenv.lib.licenses.mit;
}) {};
@@ -197847,8 +198239,8 @@ self: {
}:
mkDerivation {
pname = "plot";
- version = "0.2.3.10";
- sha256 = "0dva2kvf3193qc7zb9ydmzpffaj9lm6qy79n5zv66jnbccyp36lf";
+ version = "0.2.3.11";
+ sha256 = "0img30argzgxcgwam3iqc3xasgizbbcrghd2vkmqahmv7g3l36di";
libraryHaskellDepends = [
array base cairo colour hmatrix mtl pango transformers
];
@@ -198908,29 +199300,29 @@ self: {
({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring
, case-insensitive, co-log-core, co-log-polysemy, composition
, containers, data-default, either, hedgehog, http-client
- , http-client-tls, http-conduit, http-types, lens, mono-traversable
- , network, polysemy, polysemy-plugin, relude, servant
- , servant-client, servant-server, string-interpolate, tasty
- , tasty-hedgehog, template-haskell, text, warp
+ , http-client-tls, http-conduit, http-types, lens, network
+ , polysemy, polysemy-plugin, relude, servant, servant-client
+ , servant-server, string-interpolate, tasty, tasty-hedgehog
+ , template-haskell, text, warp
}:
mkDerivation {
pname = "polysemy-http";
- version = "0.1.0.0";
- sha256 = "025dch3cq8bgyy78yg4jrcxxmkdyl03y38zrgjhfv00rrwcffhm0";
+ version = "0.2.0.1";
+ sha256 = "0a8sq6pfwskviqkblz5i7c2f604xpkv7j07kfngci3xspbskk71v";
libraryHaskellDepends = [
aeson ansi-terminal base-noprelude bytestring case-insensitive
co-log-core co-log-polysemy composition containers data-default
either http-client http-client-tls http-conduit http-types lens
- mono-traversable polysemy polysemy-plugin relude string-interpolate
- template-haskell text
+ polysemy polysemy-plugin relude string-interpolate template-haskell
+ text
];
testHaskellDepends = [
aeson ansi-terminal base-noprelude bytestring case-insensitive
co-log-core co-log-polysemy composition containers data-default
either hedgehog http-client http-client-tls http-conduit http-types
- lens mono-traversable network polysemy polysemy-plugin relude
- servant servant-client servant-server string-interpolate tasty
- tasty-hedgehog template-haskell text warp
+ lens network polysemy polysemy-plugin relude servant servant-client
+ servant-server string-interpolate tasty tasty-hedgehog
+ template-haskell text warp
];
description = "Polysemy effect for http-client";
license = "BSD-2-Clause-Patent";
@@ -198974,6 +199366,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "polysemy-test" = callPackage
+ ({ mkDerivation, base-noprelude, containers, either, hedgehog, path
+ , path-io, polysemy, polysemy-plugin, relude, string-interpolate
+ , tasty, tasty-hedgehog, text
+ }:
+ mkDerivation {
+ pname = "polysemy-test";
+ version = "0.2.0.0";
+ sha256 = "10kakaipasw1gbipjl4x23cma9f6iv3ma547a26b70ysap6c41ys";
+ libraryHaskellDepends = [
+ base-noprelude containers either hedgehog path path-io polysemy
+ polysemy-plugin relude string-interpolate tasty tasty-hedgehog text
+ ];
+ testHaskellDepends = [
+ base-noprelude containers either hedgehog path path-io polysemy
+ polysemy-plugin relude string-interpolate tasty tasty-hedgehog text
+ ];
+ description = "Polysemy effects for testing";
+ license = "BSD-2-Clause-Patent";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"polysemy-webserver" = callPackage
({ mkDerivation, base, bytestring, hspec, http-conduit, http-types
, polysemy, polysemy-plugin, text, wai, wai-websockets, warp
@@ -200650,8 +201065,8 @@ self: {
}:
mkDerivation {
pname = "postgresql-syntax";
- version = "0.3.0.2";
- sha256 = "1gl0k3idcgpnahh8mv01mjzhc4yx6i3f7shfa7mqhcgs6r1ccdhz";
+ version = "0.3.0.3";
+ sha256 = "0zylrzd8dfks1jdx1yq1i2n2a7sxa8b04h6km9lx3bdpbpv84y7i";
libraryHaskellDepends = [
base bytestring case-insensitive fast-builder hashable
headed-megaparsec megaparsec parser-combinators text text-builder
@@ -202656,6 +203071,40 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
+ "primal" = callPackage
+ ({ mkDerivation, base, deepseq, doctest, template-haskell
+ , transformers
+ }:
+ mkDerivation {
+ pname = "primal";
+ version = "0.1.0.0";
+ sha256 = "0y60m1249n5mzglmbkhv98lzzmmkxs2k0mn882kqs89h04hfx546";
+ libraryHaskellDepends = [ base deepseq transformers ];
+ testHaskellDepends = [ base doctest template-haskell ];
+ description = "Primeval world of Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "primal-memory" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, deepseq, primal
+ , primitive, random
+ }:
+ mkDerivation {
+ pname = "primal-memory";
+ version = "0.1.0.0";
+ sha256 = "0lvz5kj6bvlgz1jykcv8dri77pjmy6fzppvk9vlvh4cx22zh9y5m";
+ libraryHaskellDepends = [ base bytestring deepseq primal ];
+ benchmarkHaskellDepends = [
+ base criterion deepseq primal primitive random
+ ];
+ description = "Unified interface for memory managemenet";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"primes" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -202839,8 +203288,6 @@ self: {
];
description = "Extras for the \"primitive\" library";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"primitive-foreign" = callPackage
@@ -203061,6 +203508,17 @@ self: {
broken = true;
}) {};
+ "print-info" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "print-info";
+ version = "0.1.3.0";
+ sha256 = "02wl9hq7jkz4yzkb744xwgnbss0w2sdpi02d3ms2q5rvc03ixnh6";
+ libraryHaskellDepends = [ base ];
+ description = "Can be used to coordinate the printing output";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"printcess" = callPackage
({ mkDerivation, base, containers, hspec, HUnit, lens, mtl
, QuickCheck, transformers
@@ -205186,8 +205644,8 @@ self: {
}:
mkDerivation {
pname = "provenience";
- version = "0.1.0.2";
- sha256 = "0wzja3vv21wgwxlmwcfc6vbkdr80jjkhxbxa41zz1i78j8cc3bri";
+ version = "0.1.1.0";
+ sha256 = "020kfw1laishiqy8npg2f2llq7dv1djii0d0khjfw7f1scy4x10n";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -205361,8 +205819,8 @@ self: {
}:
mkDerivation {
pname = "psql-utils";
- version = "0.1.0.0";
- sha256 = "09s26lqqdy2qah6i0yim9g2h61hramhij7r9kbcccbc3fgv4sd6s";
+ version = "0.2.0.0";
+ sha256 = "0y195pymiy31d8pyq71hjrh58s3hfzaa58l7qskbf3biyy159sxz";
libraryHaskellDepends = [
aeson base hashable postgresql-simple resource-pool time
];
@@ -208135,8 +208593,8 @@ self: {
}:
mkDerivation {
pname = "quickspec";
- version = "2.1.4";
- sha256 = "0h07s2dk4kjqv3hspazjwqbr8p78g2n5ah75h0a6ywdfgdy2z621";
+ version = "2.1.5";
+ sha256 = "0j8mcn9616r40hdl0jy6mqac7i31mhlsgv421m1hc8pj1kabpc0i";
libraryHaskellDepends = [
base constraints containers data-lens-light dlist QuickCheck
quickcheck-instances random spoon template-haskell transformers
@@ -209289,8 +209747,8 @@ self: {
pname = "random";
version = "1.2.0";
sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4";
- revision = "1";
- editedCabalFile = "11l9bcjy63qvcm4n7djp2l1l8668hbckkkdb2nj5g6iyy9pb2sa9";
+ revision = "2";
+ editedCabalFile = "1pjpv8rzbwhr881ayxbvz4filvx3qkdx13pa21407p5fiyf208a3";
libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ];
testHaskellDepends = [
base bytestring containers doctest mwc-random primitive smallcheck
@@ -211391,7 +211849,7 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
- "reanimate_0_4_2_0" = callPackage
+ "reanimate_0_4_3_0" = callPackage
({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base
, base64-bytestring, bytestring, cassava, cereal, colour
, containers, cubicbezier, directory, filelock, filepath, fsnotify
@@ -211404,8 +211862,8 @@ self: {
}:
mkDerivation {
pname = "reanimate";
- version = "0.4.2.0";
- sha256 = "0dihh2k0cvh17qb37pfn1h6g620yzp923wrjqy22qbmlld896snk";
+ version = "0.4.3.0";
+ sha256 = "0rp9qfp8fhz6cxrw9gcva9crxpayrm7a49m1fmma1x9dw4x79b1q";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson ansi-terminal array attoparsec base base64-bytestring
@@ -211814,8 +212272,8 @@ self: {
({ mkDerivation, base, composition-prelude }:
mkDerivation {
pname = "recursion";
- version = "2.2.4.1";
- sha256 = "09r4a9h4rd48nqdn08v3mvibqvgb0ym05142jrk0qqq8f4la3dni";
+ version = "2.2.4.2";
+ sha256 = "15ahlgm0dilapk0y5jhwdvrims7nyzdsbdccq4x9jj0ddsszqr02";
libraryHaskellDepends = [ base composition-prelude ];
description = "A recursion schemes library for Haskell";
license = stdenv.lib.licenses.bsd3;
@@ -212099,6 +212557,23 @@ self: {
broken = true;
}) {};
+ "rediscaching-haxl" = callPackage
+ ({ mkDerivation, aeson, async, base, bytestring, hashable, haxl
+ , hedis, network, time
+ }:
+ mkDerivation {
+ pname = "rediscaching-haxl";
+ version = "0.1.0.0";
+ sha256 = "0mgmrcw1p9q4njrmjal9ckxkli8wb2g12njqaj6xlkin2xz5ym8j";
+ libraryHaskellDepends = [
+ aeson async base bytestring hashable haxl hedis network time
+ ];
+ description = "Combine redis caching and haxl";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"redland" = callPackage
({ mkDerivation, base, deepseq, raptor2, redland }:
mkDerivation {
@@ -219945,10 +220420,8 @@ self: {
}:
mkDerivation {
pname = "safe-json";
- version = "1.1.0";
- sha256 = "18zsf2dccgf755a8g4ar3zc7ilmampsrvqa6f9p27zrayl7j87hw";
- revision = "4";
- editedCabalFile = "12z5z68bfrzv3laagbssdcv7g97bpk2wf1bjirrivbhdbslf6l4q";
+ version = "1.1.1";
+ sha256 = "1307fm7kmls0sd2gb5zcl75rcxxy550ksaf145s54c06qjcihhjg";
libraryHaskellDepends = [
aeson base bytestring containers dlist hashable scientific tasty
tasty-hunit tasty-quickcheck text time unordered-containers
@@ -221149,31 +221622,31 @@ self: {
}) {};
"sbv" = callPackage
- ({ mkDerivation, array, async, base, bytestring, containers
- , crackNum, deepseq, directory, doctest, filepath, gauge
- , generic-deriving, Glob, hlint, mtl, pretty, process, QuickCheck
- , random, silently, syb, tasty, tasty-golden, tasty-hunit
- , tasty-quickcheck, template-haskell, time, transformers, z3
+ ({ mkDerivation, array, async, base, bench-show, bytestring
+ , containers, crackNum, deepseq, directory, doctest, filepath
+ , gauge, Glob, hlint, mtl, pretty, process, QuickCheck, random
+ , silently, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
+ , template-haskell, time, transformers, z3
}:
mkDerivation {
pname = "sbv";
- version = "8.7";
- sha256 = "0iipl3ra0ih6fjxfs4p554va5243rg1ddkllfdbs7y2sj697841l";
+ version = "8.8";
+ sha256 = "0xm05g9kxh38jjbssnhyw6c8q4rsyjndm2b8r36cqwx0n607zvgy";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- array async base containers crackNum deepseq directory filepath
- generic-deriving mtl pretty process QuickCheck random syb
- template-haskell time transformers
+ array async base containers crackNum deepseq directory filepath mtl
+ pretty process QuickCheck random syb template-haskell time
+ transformers
];
testHaskellDepends = [
base bytestring containers crackNum directory doctest filepath Glob
- hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit
- tasty-quickcheck template-haskell
+ hlint mtl QuickCheck random tasty tasty-golden tasty-hunit
+ tasty-quickcheck
];
testSystemDepends = [ z3 ];
benchmarkHaskellDepends = [
- base containers crackNum deepseq directory filepath gauge mtl
- process random silently syb
+ base bench-show containers crackNum deepseq directory filepath
+ gauge mtl process random silently syb time
];
description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
license = stdenv.lib.licenses.bsd3;
@@ -222372,6 +222845,19 @@ self: {
broken = true;
}) {};
+ "scotty-haxl" = callPackage
+ ({ mkDerivation, base, haxl, scotty, text }:
+ mkDerivation {
+ pname = "scotty-haxl";
+ version = "0.1.0.0";
+ sha256 = "06wcvjpaar8zd2y6p9j4pxs4l7rkw84s1kmcvacafkw43h1d2bx2";
+ libraryHaskellDepends = [ base haxl scotty text ];
+ description = "Combine scotty and haxl";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"scotty-params-parser" = callPackage
({ mkDerivation, base-prelude, matcher, scotty, success, text
, transformers, unordered-containers
@@ -222477,6 +222963,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "scotty-utils" = callPackage
+ ({ mkDerivation, aeson, aeson-result, base, http-types, scotty
+ , text
+ }:
+ mkDerivation {
+ pname = "scotty-utils";
+ version = "0.1.0.0";
+ sha256 = "0f77b5xmr5gwswz15i5833karfr1qvyaaiy58khd75n9awfx5jqv";
+ libraryHaskellDepends = [
+ aeson aeson-result base http-types scotty text
+ ];
+ description = "Scotty utils library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"scotty-view" = callPackage
({ mkDerivation, base, scotty, text, transformers }:
mkDerivation {
@@ -225523,6 +226024,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-conduit_0_15_1" = callPackage
+ ({ mkDerivation, base, base-compat, bytestring, conduit
+ , http-client, http-media, mtl, resourcet, servant, servant-client
+ , servant-server, unliftio-core, wai, warp
+ }:
+ mkDerivation {
+ pname = "servant-conduit";
+ version = "0.15.1";
+ sha256 = "1vy3ihypb0zm2yd16rq120qw3898i3c0mahh2jysssv65g0avdwp";
+ libraryHaskellDepends = [
+ base bytestring conduit mtl resourcet servant unliftio-core
+ ];
+ testHaskellDepends = [
+ base base-compat bytestring conduit http-client http-media
+ resourcet servant servant-client servant-server wai warp
+ ];
+ description = "Servant Stream support for conduit";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-csharp" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, filepath
, heredocs, http-types, lens, mtl, servant, servant-foreign
@@ -225635,7 +226157,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "servant-docs_0_11_5" = callPackage
+ "servant-docs_0_11_6" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
, case-insensitive, hashable, http-media, http-types, lens, servant
, string-conversions, tasty, tasty-golden, tasty-hunit, text
@@ -225643,8 +226165,8 @@ self: {
}:
mkDerivation {
pname = "servant-docs";
- version = "0.11.5";
- sha256 = "0i51f33w5bz8j6jj9j5ivg7kll510nc0hmkhdrh3q0qagbpwryfx";
+ version = "0.11.6";
+ sha256 = "07qabs5xi6dw8anmrnl2135fps901k4y1s2xywgdxhqyg01rljhq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -225873,14 +226395,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "servant-foreign_0_15_1" = callPackage
+ "servant-foreign_0_15_2" = callPackage
({ mkDerivation, base, base-compat, hspec, hspec-discover
, http-types, lens, servant, text
}:
mkDerivation {
pname = "servant-foreign";
- version = "0.15.1";
- sha256 = "024pd3a5pf4gqx5y2is7n38a7qyfanw13w5jy4j5a81zjmfxnwk7";
+ version = "0.15.2";
+ sha256 = "0vxm80cnd4w8zpyq7brnnjmcarb0vj7xgikwpc0il1w6hjgis7vl";
libraryHaskellDepends = [
base base-compat http-types lens servant text
];
@@ -226277,6 +226799,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-machines_0_15_1" = callPackage
+ ({ mkDerivation, base, base-compat, bytestring, http-client
+ , http-media, machines, mtl, servant, servant-client
+ , servant-server, wai, warp
+ }:
+ mkDerivation {
+ pname = "servant-machines";
+ version = "0.15.1";
+ sha256 = "0k8abcc72s5bzcf2vmjkxxjnhk45rww6hr3l93msm2510hi6gda4";
+ libraryHaskellDepends = [ base bytestring machines mtl servant ];
+ testHaskellDepends = [
+ base base-compat bytestring http-client http-media machines servant
+ servant-client servant-server wai warp
+ ];
+ description = "Servant Stream support for machines";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-match" = callPackage
({ mkDerivation, base, bytestring, hspec, http-types, network-uri
, servant, text, utf8-string
@@ -226534,6 +227075,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-pipes_0_15_2" = callPackage
+ ({ mkDerivation, base, base-compat, bytestring, http-client
+ , http-media, monad-control, mtl, pipes, pipes-bytestring
+ , pipes-safe, servant, servant-client, servant-server, wai, warp
+ }:
+ mkDerivation {
+ pname = "servant-pipes";
+ version = "0.15.2";
+ sha256 = "1r5irq09j64iapi5n9mzsph984r5f7cyr6zz4sw3xqh648dmf75h";
+ libraryHaskellDepends = [
+ base bytestring monad-control mtl pipes pipes-safe servant
+ ];
+ testHaskellDepends = [
+ base base-compat bytestring http-client http-media pipes
+ pipes-bytestring pipes-safe servant servant-client servant-server
+ wai warp
+ ];
+ description = "Servant Stream support for pipes";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-pool" = callPackage
({ mkDerivation, base, resource-pool, servant, time }:
mkDerivation {
@@ -227261,7 +227824,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "servant-swagger_1_1_8" = callPackage
+ "servant-swagger_1_1_10" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
, Cabal, cabal-doctest, directory, doctest, filepath, hspec
, hspec-discover, http-media, insert-ordered-containers, lens
@@ -227271,8 +227834,8 @@ self: {
}:
mkDerivation {
pname = "servant-swagger";
- version = "1.1.8";
- sha256 = "16zmrakgiwf9rb9bvw3mjbmkqixyms42ymh7g1vyvz399plfn0c7";
+ version = "1.1.10";
+ sha256 = "0y6zylhs4z0nfz75d4i2azcq0yh2bd4inanwblx4035dgkk1q78a";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
aeson aeson-pretty base base-compat bytestring hspec http-media
@@ -228885,8 +229448,8 @@ self: {
}:
mkDerivation {
pname = "shake-futhark";
- version = "0.1.0.0";
- sha256 = "1wxp025dmlal1nm7f7s16pzgx42sawfcnz3lv6krilhr7ynb92ss";
+ version = "0.1.0.1";
+ sha256 = "110kvha6makrirdpc3x2r2lnazy4nn2xc8s5ydaz64fx9838mlra";
libraryHaskellDepends = [
base containers filepath futhark shake text
];
@@ -229138,31 +229701,6 @@ self: {
}) {};
"shakespeare" = callPackage
- ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
- , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
- , process, scientific, template-haskell, text, th-lift, time
- , transformers, unordered-containers, vector
- }:
- mkDerivation {
- pname = "shakespeare";
- version = "2.0.24.1";
- sha256 = "0r9msld629fh9h98iclhd30h1rbg1xqzjqxj64k0n1p39fkx4ndm";
- libraryHaskellDepends = [
- aeson base blaze-html blaze-markup bytestring containers directory
- exceptions ghc-prim parsec process scientific template-haskell text
- th-lift time transformers unordered-containers vector
- ];
- testHaskellDepends = [
- aeson base blaze-html blaze-markup bytestring containers directory
- exceptions ghc-prim hspec HUnit parsec process template-haskell
- text time transformers
- ];
- description = "A toolkit for making compile-time interpolated templates";
- license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ psibi ];
- }) {};
-
- "shakespeare_2_0_25" = callPackage
({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
, containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
, process, scientific, template-haskell, text, th-lift, time
@@ -229184,7 +229722,6 @@ self: {
];
description = "A toolkit for making compile-time interpolated templates";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {};
@@ -232096,6 +232633,8 @@ self: {
];
description = "A simple to understand static site generator";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"sixel" = callPackage
@@ -232528,14 +233067,14 @@ self: {
license = stdenv.lib.licenses.gpl2;
}) {};
- "skylighting_0_9" = callPackage
+ "skylighting_0_10" = callPackage
({ mkDerivation, base, binary, blaze-html, bytestring, containers
, directory, filepath, pretty-show, skylighting-core, text
}:
mkDerivation {
pname = "skylighting";
- version = "0.9";
- sha256 = "1855k1xjh38r389zvlzga7dkc3scj65ip9frvvkagxa2ls1irfp1";
+ version = "0.10";
+ sha256 = "1gi6pfi5rcmql0gdcjyb114phkc0xnkrhk6y2h6yvx4jflzpw4lj";
configureFlags = [ "-fexecutable" ];
isLibrary = true;
isExecutable = true;
@@ -232583,7 +233122,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "skylighting-core_0_9" = callPackage
+ "skylighting-core_0_10" = callPackage
({ mkDerivation, aeson, ansi-terminal, attoparsec, base
, base64-bytestring, binary, blaze-html, bytestring
, case-insensitive, colour, containers, criterion, Diff, directory
@@ -232593,8 +233132,8 @@ self: {
}:
mkDerivation {
pname = "skylighting-core";
- version = "0.9";
- sha256 = "0gljyp007pcym2b0azg0sn654kmss9xwim84xw7hxc1q8rwvdxhr";
+ version = "0.10";
+ sha256 = "1b2ldgdgq0a1wg7nlfpzm1rag8hbmm7gnirrm78cd72kycrmly60";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -233135,8 +233674,8 @@ self: {
}:
mkDerivation {
pname = "slynx";
- version = "0.3.4";
- sha256 = "1qyi231wvi62cgjanqy7n4ypddf1xr59914cghvglgjwrpz9fljp";
+ version = "0.4.0";
+ sha256 = "10a6nqpr422c80vmzjx1r2wgbhkc2kjn7kvmavc0cx1752wn79kc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -235731,10 +236270,10 @@ self: {
({ mkDerivation, base, socket }:
mkDerivation {
pname = "socket-icmp";
- version = "0.1.0.0";
- sha256 = "14lfvbhcq1ri9bfc0qiymh8qv8b7q78lzfbr5qsarh8rb85ii2vj";
+ version = "0.1.0.1";
+ sha256 = "1wvrdgz0ybacbzg91vi8jiswr02lj7hz61cksmcfii2qsmzpfgb7";
libraryHaskellDepends = [ base socket ];
- description = "Definitions for ICMP with the `socket` library";
+ description = "Definitions for using ICMP with the `socket` library";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -240710,8 +241249,6 @@ self: {
];
description = "Containers for STM";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"stm-delay" = callPackage
@@ -240781,8 +241318,6 @@ self: {
];
description = "STM-specialised Hash Array Mapped Trie";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"stm-io-hooks" = callPackage
@@ -241194,8 +241729,8 @@ self: {
}:
mkDerivation {
pname = "store";
- version = "0.7.6";
- sha256 = "1gzax38chn57ybikvddk6g8msyv52y5s30yndpp64bdh3kqwlchq";
+ version = "0.7.7";
+ sha256 = "152blmvnp8k0bh9bw6ddzmb2rhs0a36v1k0fza39n88sldx504s3";
libraryHaskellDepends = [
array async base base-orphans base64-bytestring bifunctors
bytestring containers contravariant cryptohash deepseq directory
@@ -241250,8 +241785,8 @@ self: {
}:
mkDerivation {
pname = "store-streaming";
- version = "0.2.0.2";
- sha256 = "1hnzpyw5l90nrm3vlrwbv8517iaaq0razfjj6m8a41jy2lkgf4gz";
+ version = "0.2.0.3";
+ sha256 = "0b164ixsqgrar4riqlm3ip5rfbinapk6md7hnz32gzcmrgav283q";
libraryHaskellDepends = [
async base bytestring conduit free resourcet store store-core
streaming-commons text transformers
@@ -241325,15 +241860,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "stratosphere_0_57_0" = callPackage
+ "stratosphere_0_58_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
, hashable, hspec, hspec-discover, lens, template-haskell, text
, unordered-containers
}:
mkDerivation {
pname = "stratosphere";
- version = "0.57.0";
- sha256 = "1ksxy117bizi4bnj7skv5hq7rsw2gz0w5yg5b3xhc6ialkq9in4z";
+ version = "0.58.0";
+ sha256 = "17yi1h5rcnhvwzpd27hz5pw1dznmdhg58jwsp37bfxns0hx35ywn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -243027,8 +243562,8 @@ self: {
}:
mkDerivation {
pname = "stripe-core";
- version = "2.5.0";
- sha256 = "06b5qx20zkvaqvn98jqmq0vqrpkgfvab5wjq7lwlcdm9nn7nrsgi";
+ version = "2.6.2";
+ sha256 = "00bjr71lawn1ar18vm3p849ffr6r6fmgwn2ksg4vas5rmmy2vwib";
libraryHaskellDepends = [
aeson base bytestring mtl text time transformers
unordered-containers
@@ -243043,8 +243578,8 @@ self: {
({ mkDerivation, base, stripe-core, stripe-http-client }:
mkDerivation {
pname = "stripe-haskell";
- version = "2.5.0";
- sha256 = "0qazqygkg6hlfvz6wg3gk2am7qnxzsfqjqh6mgyandz9l141pyx5";
+ version = "2.6.2";
+ sha256 = "02ydf9i632r2clhvf1f9v0yx7vmpmh37mch1jshazrw3my6sq1vl";
libraryHaskellDepends = [ base stripe-core stripe-http-client ];
description = "Stripe API for Haskell";
license = stdenv.lib.licenses.mit;
@@ -243058,8 +243593,8 @@ self: {
}:
mkDerivation {
pname = "stripe-http-client";
- version = "2.5.0";
- sha256 = "1386d2bhql56kazxx89icl1j5ikhhza2cv934x19s5lqsl8089yi";
+ version = "2.6.2";
+ sha256 = "0xz8dc2mh5mscc3mp5n4h2sch1winpaf7sy1w4s87vv68304jfg3";
libraryHaskellDepends = [
aeson base bytestring http-client http-client-tls http-types
stripe-core text
@@ -243109,6 +243644,8 @@ self: {
];
description = "Listen for Stripe webhook events with Scotty";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"stripe-signature" = callPackage
@@ -243126,6 +243663,27 @@ self: {
testHaskellDepends = [ base bytestring text ];
description = "Verification of Stripe webhook signatures";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "stripe-signature_1_0_0_6" = callPackage
+ ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite
+ , memory, stripe-concepts, text
+ }:
+ mkDerivation {
+ pname = "stripe-signature";
+ version = "1.0.0.6";
+ sha256 = "0lp3fli9g5yvlxy8f0md2d3wv6z45mw0929b8c0y2xkcsdjvpp5l";
+ libraryHaskellDepends = [
+ base base16-bytestring bytestring cryptonite memory stripe-concepts
+ text
+ ];
+ testHaskellDepends = [ base bytestring text ];
+ description = "Verification of Stripe webhook signatures";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"stripe-tests" = callPackage
@@ -243135,8 +243693,8 @@ self: {
}:
mkDerivation {
pname = "stripe-tests";
- version = "2.5.0";
- sha256 = "0jqxzdriaysf2lya8p9lc1ind2m4b4nz15dn7vb3sx74vw6lp4s3";
+ version = "2.6.2";
+ sha256 = "06r1jyf6rjmnd6p2grfs0s0f5x6sswsxw9ip7x81rh9cz5qdshdg";
libraryHaskellDepends = [
aeson base bytestring free hspec hspec-core mtl random stripe-core
text time transformers unordered-containers
@@ -244223,8 +244781,6 @@ self: {
];
description = "Efficiently build a bytestring from smaller chunks";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"supercollider-ht" = callPackage
@@ -244349,15 +244905,13 @@ self: {
"supernova" = callPackage
({ mkDerivation, aeson, async, base, bifunctor, binary, bytestring
- , Cabal, crc32c, exceptions, lens-family-core, logging, managed
- , network, proto-lens, proto-lens-runtime, proto-lens-setup
- , streamly, text, unliftio
+ , crc32c, exceptions, lens-family-core, logging, managed, network
+ , proto-lens, proto-lens-runtime, streamly, text, unliftio
}:
mkDerivation {
pname = "supernova";
- version = "0.0.1";
- sha256 = "0v0x1xk63kxrf2ihhdr24z7ami557d3w2zizd0g8xqp02pr5gs8z";
- setupHaskellDepends = [ base Cabal proto-lens-setup ];
+ version = "0.0.2";
+ sha256 = "0nqylb2qqqyxqw2f9smdl3hiv4kbi8hphxndp4v1yx3hq3zhdbjj";
libraryHaskellDepends = [
base bifunctor binary bytestring crc32c exceptions lens-family-core
logging managed network proto-lens proto-lens-runtime text unliftio
@@ -245041,13 +245595,14 @@ self: {
}) {};
"swiss-ephemeris" = callPackage
- ({ mkDerivation, base, directory, hspec, hspec-discover }:
+ ({ mkDerivation, base, directory, hspec, hspec-discover, QuickCheck
+ }:
mkDerivation {
pname = "swiss-ephemeris";
- version = "0.1.0.2";
- sha256 = "0kjph3dy7ii767zpjdqi2ya08vgahhwkbf1fp48n26vfilcwppc9";
+ version = "0.2.0.0";
+ sha256 = "12va8a5brad7jqafvp1d4m3kvc0a00w2961jl0kyn4iq7kbgapdb";
libraryHaskellDepends = [ base ];
- testHaskellDepends = [ base directory hspec ];
+ testHaskellDepends = [ base directory hspec QuickCheck ];
testToolDepends = [ hspec-discover ];
description = "Haskell bindings for the Swiss Ephemeris C library";
license = stdenv.lib.licenses.gpl2;
@@ -246861,6 +247416,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "tabular_0_2_2_8" = callPackage
+ ({ mkDerivation, base, csv, html, mtl }:
+ mkDerivation {
+ pname = "tabular";
+ version = "0.2.2.8";
+ sha256 = "0z936gh8n8i8qdkagyxwd9gqq13skd5fv013vdvwsibrxkm0czfb";
+ libraryHaskellDepends = [ base csv html mtl ];
+ description = "Two-dimensional data tables with rendering functions";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"taffybar" = callPackage
({ mkDerivation, ansi-terminal, base, broadcast-chan, bytestring
, ConfigFile, containers, dbus, dbus-hslogger, directory, dyre
@@ -248082,14 +248649,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "tasty-expected-failure_0_12" = callPackage
+ "tasty-expected-failure_0_12_1" = callPackage
({ mkDerivation, base, hedgehog, tagged, tasty, tasty-golden
, tasty-hedgehog, tasty-hunit, unbounded-delays
}:
mkDerivation {
pname = "tasty-expected-failure";
- version = "0.12";
- sha256 = "1yhbgrbsghr3cxy4rxb7wfl9xbasm00xky3hrw4zyyl87r7gs6v6";
+ version = "0.12.1";
+ sha256 = "1r4xljml8w55q6qpjj94ig2yic398624fld3dwjfcbaldgbacpmm";
libraryHaskellDepends = [ base tagged tasty unbounded-delays ];
testHaskellDepends = [
base hedgehog tasty tasty-golden tasty-hedgehog tasty-hunit
@@ -249432,17 +249999,6 @@ self: {
}) {};
"template-haskell-compat-v0208" = callPackage
- ({ mkDerivation, base, template-haskell }:
- mkDerivation {
- pname = "template-haskell-compat-v0208";
- version = "0.1.2.1";
- sha256 = "1c8m1z46j6azvxd6hrr76rb7gq6bxfwg3j8m25p260hrss595c06";
- libraryHaskellDepends = [ base template-haskell ];
- description = "A backwards compatibility layer for Template Haskell newer than 2.8";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "template-haskell-compat-v0208_0_1_4" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "template-haskell-compat-v0208";
@@ -249451,9 +250007,35 @@ self: {
libraryHaskellDepends = [ base template-haskell ];
description = "A backwards compatibility layer for Template Haskell newer than 2.8";
license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "template-haskell-compat-v0208_0_1_5" = callPackage
+ ({ mkDerivation, base, template-haskell }:
+ mkDerivation {
+ pname = "template-haskell-compat-v0208";
+ version = "0.1.5";
+ sha256 = "1s1ynp568i7y5v062kliia46c3cmaijslf2hlmdkkqfdvf8fmzp1";
+ libraryHaskellDepends = [ base template-haskell ];
+ description = "A backwards compatibility layer for Template Haskell newer than 2.8";
+ license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "template-haskell-optics" = callPackage
+ ({ mkDerivation, base, containers, optics-core, template-haskell }:
+ mkDerivation {
+ pname = "template-haskell-optics";
+ version = "0.1";
+ sha256 = "019njh3w321dsyx892snxl16arypf04mw415s8f1771wcd3l4q8n";
+ libraryHaskellDepends = [
+ base containers optics-core template-haskell
+ ];
+ description = "Optics for template-haskell types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"template-haskell-util" = callPackage
({ mkDerivation, base, GenericPretty, ghc-prim, template-haskell }:
mkDerivation {
@@ -254732,6 +255314,27 @@ self: {
broken = true;
}) {};
+ "timezone-detect" = callPackage
+ ({ mkDerivation, base, directory, hspec, hspec-discover, time
+ , timezone-olson, timezone-series
+ }:
+ mkDerivation {
+ pname = "timezone-detect";
+ version = "0.3.0.0";
+ sha256 = "10pv88wmz8zqr1h3zh66skbkma2zz3gvwjaalnpfz5ii2dgl27yy";
+ libraryHaskellDepends = [
+ base time timezone-olson timezone-series
+ ];
+ testHaskellDepends = [
+ base directory hspec time timezone-olson timezone-series
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Haskell bindings for the zone-detect C library; plus tz-aware utils";
+ license = stdenv.lib.licenses.gpl2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"timezone-olson" = callPackage
({ mkDerivation, base, binary, bytestring, extensible-exceptions
, time, timezone-series
@@ -255293,8 +255896,8 @@ self: {
}:
mkDerivation {
pname = "tlynx";
- version = "0.3.4";
- sha256 = "10nn1043z5gzm0zrw5z0fxalwrh48wvxlwq65nanjajwb612w1p4";
+ version = "0.4.0";
+ sha256 = "1gsyyw8bvlc15z6hy7cd9w6v6wgjg9ra19w9vp6kajlyzyw5j1kw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -261165,8 +261768,8 @@ self: {
}:
mkDerivation {
pname = "typesafe-precure";
- version = "0.7.7.1";
- sha256 = "0yjw4fm7n7qdb9rib7q5nirnw0cdvqy2g05lidxw5pkgdbi9np3m";
+ version = "0.7.8.1";
+ sha256 = "060fg6s7yjasimhx7nz4cxymlsxdv9pshs4sv83vwj31nw33kr7b";
libraryHaskellDepends = [
aeson aeson-pretty autoexporter base bytestring dlist
monad-skeleton template-haskell text th-data-compat
@@ -262750,6 +263353,54 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "uniqueness-periods-vector" = callPackage
+ ({ mkDerivation, base, vector }:
+ mkDerivation {
+ pname = "uniqueness-periods-vector";
+ version = "0.1.0.0";
+ sha256 = "0c5ywfpcy71dqxsvsxk1xkmnhaa9fsnaypr6rnv1igiv1qc8fqkc";
+ libraryHaskellDepends = [ base vector ];
+ description = "Generalization of the uniqueness-periods and uniqueness-periods-general packages functionality";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "uniqueness-periods-vector-common" = callPackage
+ ({ mkDerivation, base, vector }:
+ mkDerivation {
+ pname = "uniqueness-periods-vector-common";
+ version = "0.1.0.0";
+ sha256 = "0lkkanqi2l2c6fmf1nasb6kigdp0gfi9qncsl07i8jmbk6wxppss";
+ libraryHaskellDepends = [ base vector ];
+ description = "Generalization of the dobutokO-poetry-general package functionality";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "uniqueness-periods-vector-general" = callPackage
+ ({ mkDerivation, base, print-info, uniqueness-periods-vector-common
+ , vector
+ }:
+ mkDerivation {
+ pname = "uniqueness-periods-vector-general";
+ version = "0.2.0.0";
+ sha256 = "0aqjj08y6jf03dcwcvshxm9vzqyk6i05758c994d0xz23pzwi2lx";
+ libraryHaskellDepends = [
+ base print-info uniqueness-periods-vector-common vector
+ ];
+ description = "Generalization of the functionality of the dobutokO-poetry-general-languages package";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "uniqueness-periods-vector-properties" = callPackage
+ ({ mkDerivation, base, uniqueness-periods-vector, vector }:
+ mkDerivation {
+ pname = "uniqueness-periods-vector-properties";
+ version = "0.1.1.1";
+ sha256 = "17bwchd6acnr457rhkrqsanl67nps2d6722ap781havnsvqlff0x";
+ libraryHaskellDepends = [ base uniqueness-periods-vector vector ];
+ description = "Metrics for the maximum element for the uniqueness-periods-vector packages family";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"unit" = callPackage
({ mkDerivation, base, hspec }:
mkDerivation {
@@ -265261,6 +265912,8 @@ self: {
];
description = "Reversable and secure encoding of object ids as uuids";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"uuid-le" = callPackage
@@ -266676,15 +267329,19 @@ self: {
}) {};
"vector-fftw" = callPackage
- ({ mkDerivation, base, fftw, primitive, storable-complex, vector }:
+ ({ mkDerivation, base, fftw, primitive, QuickCheck
+ , storable-complex, test-framework, test-framework-quickcheck2
+ , vector
+ }:
mkDerivation {
pname = "vector-fftw";
- version = "0.1.3.8";
- sha256 = "0xlr4566hh6lnpinzrk623a96jnb8mp8mq6cymlsl8y38qx36jp6";
- revision = "3";
- editedCabalFile = "0wh7sa71gl1ssqqd4axyvwxlmkfb0n3hm90imjvg0vsp7g2y7zs0";
+ version = "0.1.4.0";
+ sha256 = "1ns5jhdx585s3jmcslscibf7ryaya3ca1shc4ysrikrp1mzx1jky";
libraryHaskellDepends = [ base primitive storable-complex vector ];
librarySystemDepends = [ fftw ];
+ testHaskellDepends = [
+ base QuickCheck test-framework test-framework-quickcheck2 vector
+ ];
description = "A binding to the fftw library for one-dimensional vectors";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -272817,6 +273474,26 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "witherable_0_3_2" = callPackage
+ ({ mkDerivation, base, base-orphans, containers, hashable
+ , monoidal-containers, transformers, transformers-compat
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "witherable";
+ version = "0.3.2";
+ sha256 = "1iqf3kc9h599lbiym8rf9b4fhj31lqwm1cxqz6x02q9dxyrcprmi";
+ revision = "1";
+ editedCabalFile = "01mprffm41km3pm5nlpsp2ig2izgl6ll9ylrym3dg01f9609aa0z";
+ libraryHaskellDepends = [
+ base base-orphans containers hashable monoidal-containers
+ transformers transformers-compat unordered-containers vector
+ ];
+ description = "filterable traversable";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"witherable" = callPackage
({ mkDerivation, base, base-orphans, containers, hashable, lens
, monoidal-containers, transformers, transformers-compat
@@ -275051,6 +275728,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "xeno_0_4_2" = callPackage
+ ({ mkDerivation, array, base, bytestring, bytestring-mmap, bzlib
+ , criterion, deepseq, filepath, ghc-prim, hexml, hexpat, hspec, mtl
+ , mutable-containers, time, vector, weigh, xml
+ }:
+ mkDerivation {
+ pname = "xeno";
+ version = "0.4.2";
+ sha256 = "0dvjzh7yyijwy2d6215wlxlln9h0ng6bnqasfh38prp6sllxk25j";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ array base bytestring deepseq mtl mutable-containers vector
+ ];
+ testHaskellDepends = [ base bytestring hexml hspec ];
+ benchmarkHaskellDepends = [
+ base bytestring bytestring-mmap bzlib criterion deepseq filepath
+ ghc-prim hexml hexpat time weigh xml
+ ];
+ description = "A fast event-based XML parser in pure Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"xenstore" = callPackage
({ mkDerivation, base, bytestring, cereal, mtl, network }:
mkDerivation {
@@ -279652,6 +280352,30 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "yesod-page-cursor" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, hspec
+ , hspec-expectations-lifted, http-link-header, http-types, lens
+ , lens-aeson, monad-logger, mtl, network-uri, persistent
+ , persistent-sqlite, persistent-template, scientific, text, time
+ , unliftio, unliftio-core, wai-extra, yesod, yesod-core, yesod-test
+ }:
+ mkDerivation {
+ pname = "yesod-page-cursor";
+ version = "1.0.0.1";
+ sha256 = "0grh7pnzhxicanf2ipnb0ivq5lal9h42jd2kbbypgxp7qhvp69g3";
+ libraryHaskellDepends = [
+ aeson base bytestring containers http-link-header network-uri text
+ unliftio yesod-core
+ ];
+ testHaskellDepends = [
+ aeson base bytestring hspec hspec-expectations-lifted
+ http-link-header http-types lens lens-aeson monad-logger mtl
+ persistent persistent-sqlite persistent-template scientific text
+ time unliftio unliftio-core wai-extra yesod yesod-core yesod-test
+ ];
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"yesod-paginate" = callPackage
({ mkDerivation, base, template-haskell, yesod }:
mkDerivation {
@@ -281497,8 +282221,8 @@ self: {
}:
mkDerivation {
pname = "z3";
- version = "408.1";
- sha256 = "1r54d289rdfvxqk0774hhh0x2kj8zsh7graahqwwp76r911jb8bp";
+ version = "408.2";
+ sha256 = "1fjf9pfj3fhhcd0ak8rm6m5im2il8n5d21z8yv5c32xnsgj7z89a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base containers transformers ];
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index 8801f1f1ddd..dc6dbe65061 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -23,4 +23,13 @@ self: super: {
# both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh
haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { };
hls-ghcide = self.callPackage ../tools/haskell/haskell-language-server/hls-ghcide.nix { };
+
+ # cabal2nix --revision https://github.com/hasura/ci-info-hs.git
+ ci-info = self.callPackage ../misc/haskell/hasura/ci-info {};
+ # cabal2nix --revision https://github.com/hasura/pg-client-hs.git
+ pg-client = self.callPackage ../misc/haskell/hasura/pg-client {};
+ # cabal2nix --revision https://github.com/hasura/graphql-parser-hs.git
+ graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser {};
+ # cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git
+ graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine {};
}
diff --git a/pkgs/development/haskell-modules/patches/hasura-884-compat.patch b/pkgs/development/haskell-modules/patches/hasura-884-compat.patch
new file mode 100644
index 00000000000..bc000ba9cca
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/hasura-884-compat.patch
@@ -0,0 +1,26 @@
+diff --git server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs
+index 6cb70cf0..0c3789cd 100644
+--- server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs
++++ server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs
+@@ -45,7 +45,7 @@ import GHC.AssertNF
+ import qualified ListT
+ import qualified Network.WebSockets as WS
+ import qualified StmContainers.Map as STMMap
+-import qualified System.IO.Error as E
++--import qualified System.IO.Error as E
+
+ import qualified Hasura.Logging as L
+
+@@ -287,12 +287,6 @@ createServerApp (WSServer logger@(L.Logger writeLog) serverStatus) wsHandlers !p
+ let rcv = forever $ do
+ -- Process all messages serially (important!), in a separate thread:
+ msg <- liftIO $
+- -- Re-throw "receiveloop: resource vanished (Connection reset by peer)" :
+- -- https://github.com/yesodweb/wai/blob/master/warp/Network/Wai/Handler/Warp/Recv.hs#L112
+- -- as WS exception signaling cleanup below. It's not clear why exactly this gets
+- -- raised occasionally; I suspect an equivalent handler is missing from WS itself.
+- -- Regardless this should be safe:
+- handleJust (guard . E.isResourceVanishedError) (\()-> throw WS.ConnectionClosed) $
+ WS.receiveData conn
+ writeLog $ WSLog wsId (EMessageReceived $ TBS.fromLBS msg) Nothing
+ _hOnMessage wsHandlers wsConn msg
diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix
index 21bbf8c1bc7..45f27b38a63 100644
--- a/pkgs/development/libraries/appstream/default.nix
+++ b/pkgs/development/libraries/appstream/default.nix
@@ -1,18 +1,20 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gettext
, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
, libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection
-, pcre, itstool, gperf, vala
+, pcre, itstool, gperf, vala, lmdb, libsoup
}:
stdenv.mkDerivation rec {
pname = "appstream";
- version = "0.12.6";
+ version = "0.12.11";
+
+ outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "ximion";
repo = "appstream";
- rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}";
- sha256 = "0hbl26aw3g2hag7z4di9z59qz057qcywrxpnnmp86z7rngvjbqpx";
+ rev = "v${version}";
+ sha256 = "sha256-bCDyMwQdn9Csxs2hy4dm+LjtxK4+YBK6yDkAdhu1QVU=";
};
nativeBuildInputs = [
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
gobject-introspection itstool vala
];
- buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf ];
+ buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf lmdb libsoup ];
prePatch = ''
substituteInPlace meson.build \
diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index 02d3f1da3e6..e7c41bcedc5 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -15,22 +15,21 @@
stdenv.mkDerivation rec {
pname = "exiv2";
- version = "0.27.2";
+ version = "0.27.3";
src = fetchFromGitHub {
owner = "exiv2";
repo = "exiv2";
rev = "v${version}";
- sha256 = "0n8il52yzbmvbkryrl8waz7hd9a2fdkw8zsrmhyh63jlvmmc31gf";
+ sha256 = "0d294yhcdw8ziybyd4rp5hzwknzik2sm0cz60ff7fljacv75bjpy";
};
patches = [
- # included in next release
+ # Fix aarch64 build https://github.com/Exiv2/exiv2/pull/1271
(fetchpatch {
- name = "cve-2019-20421.patch";
- url = "https://github.com/Exiv2/exiv2/commit/a82098f4f90cd86297131b5663c3dec6a34470e8.patch";
- sha256 = "16r19qb9l5j43ixm5jqid9sdv5brlkk1wq0w79rm5agxq4kblfyc";
- excludes = [ "tests/bugfixes/github/test_issue_1011.py" "test/data/Jp2Image_readMetadata_loop.poc" ];
+ name = "cmake-fix-aarch64.patch";
+ url = "https://github.com/Exiv2/exiv2/commit/bbe0b70840cf28b7dd8c0b7e9bb1b741aeda2efd.patch";
+ sha256 = "13zw1mn0ag0jrz73hqjhdsh1img7jvj5yddip2k2sb5phy04rzfx";
})
];
@@ -40,6 +39,7 @@ stdenv.mkDerivation rec {
# the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
# (setting it to an absolute path causes include files to go to $out/$out/include,
# because the absolute path is interpreted with root at $out).
+ # Can probably be removed once https://github.com/Exiv2/exiv2/pull/1263 is merged.
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DCMAKE_INSTALL_LIBDIR=lib"
];
@@ -77,7 +77,6 @@ stdenv.mkDerivation rec {
preCheck = ''
patchShebangs ../test/
mkdir ../test/tmp
- export LD_LIBRARY_PATH="$(realpath ../build/lib)"
${stdenv.lib.optionalString (stdenv.isAarch64 || stdenv.isAarch32) ''
# Fix tests on arm
@@ -86,7 +85,6 @@ stdenv.mkDerivation rec {
''}
${stdenv.lib.optionalString stdenv.isDarwin ''
- export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}`pwd`/lib
# Removing tests depending on charset conversion
substituteInPlace ../test/Makefile --replace "conversions.sh" ""
rm -f ../tests/bugfixes/redmine/test_issue_460.py
@@ -94,10 +92,6 @@ stdenv.mkDerivation rec {
''}
'';
- postCheck = ''
- (cd ../tests/ && python3 runner.py)
- '';
-
# With CMake we have to enable samples or there won't be
# a tests target. This removes them.
postInstall = ''
@@ -108,7 +102,7 @@ stdenv.mkDerivation rec {
)
'';
- # Fix CMake export paths.
+ # Fix CMake export paths. Can be removed once https://github.com/Exiv2/exiv2/pull/1263 is merged.
postFixup = ''
sed -i "$dev/lib/cmake/exiv2/exiv2Config.cmake" \
-e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${_IMPORT_PREFIX}@$dev@" \
diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix
index 3ced1c121c6..b6d6b688752 100644
--- a/pkgs/development/libraries/hpx/default.nix
+++ b/pkgs/development/libraries/hpx/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hpx";
- version = "1.4.1";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "STEllAR-GROUP";
repo = "hpx";
rev = version;
- sha256 = "0yjsrb11hlfwbiw0xi71ami9nrvz6jwj160h9qgl50icd79ngn46";
+ sha256 = "10hgjavhvn33y3k5j3l1326x13bxffghg2arxjrh7i7zd3qprfv5";
};
buildInputs = [ boost hwloc gperftools ];
diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix
index e119c75ff8d..f0f5b9d7793 100644
--- a/pkgs/development/libraries/jxrlib/default.nix
+++ b/pkgs/development/libraries/jxrlib/default.nix
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
sha256 = "0rk3hbh00nw0wgbfbqk1szrlfg3yq7w6ar16napww3nrlm9cj65w";
};
+ postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace Makefile \
+ --replace '-shared' '-dynamiclib -undefined dynamic_lookup' \
+ --replace '.so' '.dylib'
+ '';
+
nativeBuildInputs = [ python ];
makeFlags = [ "DIR_INSTALL=$(out)" "SHARED=1" ];
@@ -21,7 +27,7 @@ stdenv.mkDerivation rec {
description = "Implementation of the JPEG XR image codec standard";
homepage = "https://jxrlib.codeplex.com";
license = licenses.bsd2;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ romildo ];
};
}
diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix
index 4a83175f66b..55ba8d7b301 100644
--- a/pkgs/development/libraries/libcint/default.nix
+++ b/pkgs/development/libraries/libcint/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "libcint";
- version = "3.0.20";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "sunqm";
repo = "libcint";
rev = "v${version}";
- sha256 = "0iqqq568q9sxppr08rvmpyjq0n82pm04x9rxhh3mf20x1ds7ngj5";
+ sha256 = "0z1gavi7aacx68fmyzy90vzv5kff844lnxc6habs6y377dr3rwwy";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
index 5d0459b4f30..c394e3dc4d5 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "liblouis";
- version = "3.14.0";
+ version = "3.15.0";
src = fetchFromGitHub {
owner = "liblouis";
repo = "liblouis";
rev = "v${version}";
- sha256 = "0v6w8b9r994mkkbm2gqgd7k5yfmdhgbabh0j1gmn375nyvhy4qqh";
+ sha256 = "1ljy5xsy7vf2r0ix0d7bqcr6qvr6897f8madsx9zlm1mrj31n5px";
};
outputs = [ "out" "dev" "man" "info" "doc" ];
diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix
index a710e09a454..feb9c7e6514 100644
--- a/pkgs/development/libraries/libpqxx/default.nix
+++ b/pkgs/development/libraries/libpqxx/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "A C++ library to access PostgreSQL databases";
homepage = "http://pqxx.org/development/libpqxx/";
license = lib.licenses.bsd3;
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.eelco ];
};
}
diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix
index c0220e6e21d..8d5d083d82b 100644
--- a/pkgs/development/libraries/lyra/default.nix
+++ b/pkgs/development/libraries/lyra/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lyra";
- version = "1.4";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "bfgroup";
repo = "lyra";
rev = version;
- sha256 = "08g6kqaj079aq7i6c1pwj778lrr3yk188wn1byxdd6zqpwrsv71q";
+ sha256 = "0xil6b055csnrvxxmby5x9njf166bri472jxwzshc49cz7svhhpk";
};
nativeBuildInputs = [ meson ninja ];
diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix
index 7517ca9c6cb..560f39e4e99 100644
--- a/pkgs/development/libraries/science/math/openlibm/default.nix
+++ b/pkgs/development/libraries/science/math/openlibm/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "openlibm";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchurl {
url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz";
- sha256 = "18q6mrq4agvlpvhix2k13qcyvqqzh30vj7b329dva64035rzg68n";
+ sha256 = "0yg8sfibr38hpb4s5ri7i0ivp96c7khdwhlxngjiymvl3jvm5cnl";
};
makeFlags = [ "prefix=$(out)" ];
diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix
index add1dcf10cb..22266bfd4b0 100644
--- a/pkgs/development/libraries/spdlog/default.nix
+++ b/pkgs/development/libraries/spdlog/default.nix
@@ -35,8 +35,8 @@ let
in
{
spdlog_1 = generic {
- version = "1.6.0";
- sha256 = "15fn8nd9xj7wrxcg9n4fjffid790qg2m366rx2lq2fc9v9walrxs";
+ version = "1.7.0";
+ sha256 = "1ryaa22ppj60461hcdb8nk7jwj84arp4iw4lyw594py92g4vnx3j";
};
spdlog_0 = generic {
diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
index 18f9e541acd..8f045802d3a 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }:
+{ stdenv, fetchFromGitHub, fixDarwinDylibNames, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }:
with stdenv.lib; stdenv.mkDerivation rec {
pname = "tbb";
@@ -11,6 +11,8 @@ with stdenv.lib; stdenv.mkDerivation rec {
sha256 = "1a39nflw7b2n51jfp3fdprnkpgzaspzww1dckfvaigflfli9s8rj";
};
+ nativeBuildInputs = optional stdenv.isDarwin fixDarwinDylibNames;
+
makeFlags = optional (compiler != null) "compiler=${compiler}"
++ optional (stdver != null) "stdver=${stdver}";
diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix
index 3ebfd4ea919..2726ed7f237 100644
--- a/pkgs/development/libraries/tiledb/default.nix
+++ b/pkgs/development/libraries/tiledb/default.nix
@@ -16,19 +16,26 @@
, python
, gtest
, doxygen
+, fixDarwinDylibNames
}:
stdenv.mkDerivation rec {
pname = "tiledb";
- version = "1.7.7";
+ version = "2.0.7";
src = fetchFromGitHub {
owner = "TileDB-Inc";
repo = "TileDB";
rev = version;
- sha256 = "0vpbyxi8k29c7sjpk86y5w3yyp5fn62q5xvbw061wgp7vrprf8bm";
+ sha256 = "00g8ibsbnl4wjfx3qg4qy6s7z6dsj898j0yqfhw1gjr1pb5dsapb";
};
+ # (bundled) blosc headers have a warning on some archs that it will be using
+ # unaccelerated routines.
+ cmakeFlags = [
+ "-DTILEDB_WERROR=0"
+ ];
+
nativeBuildInputs = [
clang-tools
cmake
@@ -53,7 +60,7 @@ stdenv.mkDerivation rec {
openssl
boost
libpqxx
- ];
+ ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
# emulate the process of pulling catch down
postPatch = ''
@@ -65,11 +72,15 @@ stdenv.mkDerivation rec {
installTargets = [ "install-tiledb" "doc" ];
+ postInstall = lib.optionalString stdenv.isDarwin ''
+ install_name_tool -add_rpath ${tbb}/lib $out/lib/libtiledb.dylib
+ '';
+
meta = with lib; {
description = "TileDB allows you to manage the massive dense and sparse multi-dimensional array data";
homepage = "https://github.com/TileDB-Inc/TileDB";
license = licenses.mit;
- platforms = [ "x86_64-linux"];
+ platforms = platforms.unix;
maintainers = with maintainers; [ rakesh4g ];
};
diff --git a/pkgs/servers/hasura/ci-info.nix b/pkgs/development/misc/haskell/hasura/ci-info/default.nix
similarity index 100%
rename from pkgs/servers/hasura/ci-info.nix
rename to pkgs/development/misc/haskell/hasura/ci-info/default.nix
diff --git a/pkgs/servers/hasura/graphql-engine.nix b/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
similarity index 91%
rename from pkgs/servers/hasura/graphql-engine.nix
rename to pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
index 05ba895be08..0bd68afae4b 100644
--- a/pkgs/servers/hasura/graphql-engine.nix
+++ b/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix
@@ -17,18 +17,18 @@
, text-builder, text-conversions, th-lift-instances, these, time
, transformers, transformers-base, unix, unordered-containers
, uri-encode, uuid, vector, wai, wai-websockets, warp, websockets
-, wreq, x509, yaml, zlib
+, wreq, x509, yaml, zlib, witherable, semialign, validation, cron
}:
mkDerivation {
pname = "graphql-engine";
version = "1.0.0";
src = fetchgit {
url = "https://github.com/hasura/graphql-engine.git";
- sha256 = "0hg44zl3gqa8lq7kggwgmgbsgdc7zrv5cxs507vilg11xklsbz4l";
- rev = "27b0b59361cebecd074bd59123f602e7b013bac1";
+ sha256 = "sha256-tNKoi3dtoXj0nn4qBgLBroo7SgX7SdVaHtBqjs1S3hQ=";
+ rev = "1e3eb035d3c915032ba23e502bcb0132b4d54202";
fetchSubmodules = true;
};
- postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot";
+ postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -48,6 +48,8 @@ mkDerivation {
th-lift-instances these time transformers transformers-base unix
unordered-containers uri-encode uuid vector wai wai-websockets warp
websockets wreq x509 yaml zlib
+ witherable semialign validation
+ cron
];
executableHaskellDepends = [
base bytestring pg-client text text-conversions
diff --git a/pkgs/servers/hasura/graphql-parser.nix b/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix
similarity index 88%
rename from pkgs/servers/hasura/graphql-parser.nix
rename to pkgs/development/misc/haskell/hasura/graphql-parser/default.nix
index 8066bb83dd0..991b5384d5c 100644
--- a/pkgs/servers/hasura/graphql-parser.nix
+++ b/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix
@@ -5,11 +5,11 @@
}:
mkDerivation {
pname = "graphql-parser";
- version = "0.1.0.0";
+ version = "0.1.0.1";
src = fetchgit {
url = "https://github.com/hasura/graphql-parser-hs.git";
- sha256 = "0vz0sqqmr1l02d3f1pc5k7rm7vpxmg5d5ijvdcwdm34yw6x5lz1v";
- rev = "623ad78aa46e7ba2ef1aa58134ad6136b0a85071";
+ sha256 = "sha256-oem/h0AQPk7eSM/P6wMoWV9KirxutE4hnQWwrpQ6TGk=";
+ rev = "ba8e26fef1488cf3c8c08e86f02730f56ec84e1f";
fetchSubmodules = true;
};
libraryHaskellDepends = [
@@ -29,6 +29,7 @@ mkDerivation {
template-haskell text text-builder th-lift-instances
unordered-containers vector
];
+ doCheck = false;
prePatch = "hpack";
homepage = "https://github.com/hasura/graphql-parser-hs#readme";
license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/servers/hasura/pg-client.nix b/pkgs/development/misc/haskell/hasura/pg-client/default.nix
similarity index 100%
rename from pkgs/servers/hasura/pg-client.nix
rename to pkgs/development/misc/haskell/hasura/pg-client/default.nix
diff --git a/pkgs/development/ocaml-modules/fdkaac/default.nix b/pkgs/development/ocaml-modules/fdkaac/default.nix
new file mode 100644
index 00000000000..d3915b65935
--- /dev/null
+++ b/pkgs/development/ocaml-modules/fdkaac/default.nix
@@ -0,0 +1,27 @@
+{ lib, fetchFromGitHub, buildDunePackage, dune-configurator
+, fdk_aac
+}:
+
+buildDunePackage rec {
+ pname = "fdkaac";
+ version = "0.3.2";
+ src = fetchFromGitHub {
+ owner = "savonet";
+ repo = "ocaml-fdkaac";
+ rev = version;
+ sha256 = "10i6hsjkrpw7zgx99zvvka3sapd7zy53k7z4b6khj9rdrbrgznv8";
+ };
+
+ useDune2 = true;
+
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ fdk_aac ];
+
+ meta = {
+ description = "OCaml binding for the fdk-aac library";
+ inherit (src.meta) homepage;
+ license = lib.licenses.gpl2Only;
+ maintainers = [ lib.maintainers.vbgl ];
+ };
+
+}
diff --git a/pkgs/development/ocaml-modules/srt/default.nix b/pkgs/development/ocaml-modules/srt/default.nix
new file mode 100644
index 00000000000..7f0897ae662
--- /dev/null
+++ b/pkgs/development/ocaml-modules/srt/default.nix
@@ -0,0 +1,30 @@
+{ lib, buildDunePackage, fetchFromGitHub
+, dune-configurator
+, posix-socket
+, srt
+}:
+
+buildDunePackage rec {
+ pname = "srt";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "savonet";
+ repo = "ocaml-srt";
+ rev = "v${version}";
+ sha256 = "0xh89w4j7lljvpy2n08x6m9kw88f82snmzf23kp0gw637sjnrj6f";
+ };
+
+ useDune2 = true;
+
+ buildInputs = [ dune-configurator ];
+ propagatedBuildInputs = [ posix-socket srt ];
+
+ meta = {
+ description = "OCaml bindings for the libsrt library";
+ license = lib.licenses.gpl2Only;
+ inherit (src.meta) homepage;
+ maintainers = [ lib.maintainers.vbgl ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/maildir-deduplicate/default.nix b/pkgs/development/python-modules/maildir-deduplicate/default.nix
deleted file mode 100644
index 33728ef4113..00000000000
--- a/pkgs/development/python-modules/maildir-deduplicate/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, isPy27
-, click
-}:
-
-buildPythonPackage rec {
- pname = "maildir-deduplicate";
- version = "2.1.0";
- disabled = !isPy27;
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "263c7f2c85dafe06eaa15e8d7ab83817204f70a5f08cc25a607f3f01ed130b42";
- };
-
- propagatedBuildInputs = [ click ];
-
- meta = with stdenv.lib; {
- description = "Command-line tool to deduplicate mails from a set of maildir folders";
- homepage = "https://github.com/kdeldycke/maildir-deduplicate";
- license = licenses.gpl2;
- broken = true;
- };
-
-}
diff --git a/pkgs/development/python-modules/pip2nix/default.nix b/pkgs/development/python-modules/pip2nix/default.nix
deleted file mode 100644
index f6474883b83..00000000000
--- a/pkgs/development/python-modules/pip2nix/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, click
-, configobj
-, contexter
-, jinja2
-, pytest
-, pip
-}:
-
-buildPythonPackage rec {
- pname = "pip2nix";
- version = "0.7.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "ec9a71e09ac7f43cc7b6c9d386384eb7b5c331bf6ea0e72ca559d87979397a95";
- };
-
- propagatedBuildInputs = [ click configobj contexter pip jinja2 pytest ];
-
- postPatch = ''
- sed -i "s/'pip>=8,<10'/'pip'/" setup.py
- sed -i "s/pip<10,>=8/pip/" ${pname}.egg-info/requires.txt
- '';
-
- # tests not included with pypi release
- doCheck = false;
-
- # Requires an old pip version
- broken = true;
-
- meta = with stdenv.lib; {
- description = "Generate Nix expressions for Python packages";
- homepage = "https://github.com/johbo/pip2nix";
- license = licenses.gpl3;
- };
-
-}
diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix
new file mode 100644
index 00000000000..33149e99e92
--- /dev/null
+++ b/pkgs/development/python-modules/pysqueezebox/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }:
+
+buildPythonPackage rec {
+ pname = "pysqueezebox";
+ version = "0.4.0";
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "02d73e98314a63a38c314d40942a0b098fb59d2f08ac39b2627cfa73f785cf0d";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ ];
+
+ # No tests in the Pypi distribution
+ doCheck = false;
+ pythonImportsCheck = [ "pysqueezebox" ];
+
+ meta = with stdenv.lib; {
+ description = "Asynchronous library to control Logitech Media Server";
+ homepage = "https://github.com/rajlaud/pysqueezebox";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ nyanloutre ];
+ };
+}
diff --git a/pkgs/development/python-modules/python-libarchive/default.nix b/pkgs/development/python-modules/python-libarchive/default.nix
deleted file mode 100644
index 02fe2347924..00000000000
--- a/pkgs/development/python-modules/python-libarchive/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchurl
-, isPy3k
-, pkgs
-}:
-
-buildPythonPackage rec {
- version = "3.1.2-1";
- pname = "libarchive";
- disabled = isPy3k;
-
- src = fetchurl {
- url = "http://python-libarchive.googlecode.com/files/python-libarchive-${version}.tar.gz";
- sha256 = "0j4ibc4mvq64ljya9max8832jafi04jciff9ia9qy0xhhlwkcx8x";
- };
-
- propagatedBuildInputs = [ pkgs.libarchive.lib ];
-
- meta = with stdenv.lib; {
- description = "Multi-format archive and compression library";
- homepage = "https://libarchive.org/";
- license = licenses.bsd0;
- broken = true;
- };
-
-}
diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix
deleted file mode 100644
index 6066e1e3b84..00000000000
--- a/pkgs/development/python-modules/qutip/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchurl
-, numpy
-, scipy
-, matplotlib
-, pyqt4
-, cython
-, pkgs
-, nose
-}:
-
-buildPythonPackage rec {
- pname = "qutip";
- version = "2.2.0";
-
- src = fetchurl {
- url = "https://qutip.googlecode.com/files/QuTiP-${version}.tar.gz";
- sha256 = "a26a639d74b2754b3a1e329d91300e587e8c399d8a81d8f18a4a74c6d6f02ba3";
- };
-
- propagatedBuildInputs = [ numpy scipy matplotlib pyqt4 cython ];
-
- buildInputs = [ pkgs.gcc pkgs.qt4 pkgs.blas nose ];
-
- meta = with stdenv.lib; {
- description = "QuTiP - Quantum Toolbox in Python";
- longDescription = ''
- QuTiP is open-source software for simulating the dynamics of
- open quantum systems. The QuTiP library depends on the
- excellent Numpy and Scipy numerical packages. In addition,
- graphical output is provided by Matplotlib. QuTiP aims to
- provide user-friendly and efficient numerical simulations of a
- wide variety of Hamiltonians, including those with arbitrary
- time-dependence, commonly found in a wide range of physics
- applications such as quantum optics, trapped ions,
- superconducting circuits, and quantum nanomechanical
- resonators.
- '';
- homepage = "http://qutip.org/";
- license = licenses.bsd0;
- broken = true;
- };
-
-}
diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix
index 808a6c54825..d5379b849ad 100644
--- a/pkgs/development/python-modules/tiledb/default.nix
+++ b/pkgs/development/python-modules/tiledb/default.nix
@@ -3,28 +3,31 @@
, buildPythonPackage
, fetchFromGitHub
, cython
+, pybind11
, tiledb
, numpy
, wheel
, isPy3k
, setuptools_scm
, psutil
+, pandas
}:
buildPythonPackage rec {
pname = "tiledb";
- version = "0.5.6";
+ version = "0.6.6";
format = "setuptools";
src = fetchFromGitHub {
owner = "TileDB-Inc";
repo = "TileDB-Py";
rev = version;
- sha256 = "0cgm4dhyqay26xmrzlv21ha8qh55m4q3yr338lrv81ngz77zxsvw";
+ sha256 = "0b2kn1xyf7d994kz29dpqiaf8yzvx0axw4yqi854c54pl22ddgzl";
};
nativeBuildInputs = [
cython
+ pybind11
setuptools_scm
];
@@ -39,6 +42,8 @@ buildPythonPackage rec {
checkInputs = [
psutil
+ # optional
+ pandas
];
TILEDB_PATH = tiledb;
@@ -57,16 +62,19 @@ buildPythonPackage rec {
"test_docs" "dont_test_docs"
# these tests don't always fail
substituteInPlace tiledb/tests/test_libtiledb.py --replace \
- "test_varlen_write_int_subarray" "dont_test_varlen_write_int_subarray"
+ "test_varlen_write_int_subarray" "dont_test_varlen_write_int_subarray" \
+ --replace "test_memory_cleanup" "dont_test_memory_cleanup" \
+ --replace "test_ctx_thread_cleanup" "dont_test_ctx_thread_cleanup"
substituteInPlace tiledb/tests/test_metadata.py --replace \
"test_metadata_consecutive" "dont_test_metadata_consecutive"
'';
checkPhase = ''
- pushd "$out"
+ pushd "$TMPDIR"
${python.interpreter} -m unittest tiledb.tests.all.suite_test
popd
'';
+ pythonImportsCheck = [ "tiledb" ];
meta = with lib; {
description = "Python interface to the TileDB storage manager";
diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix
new file mode 100644
index 00000000000..4cc7056da19
--- /dev/null
+++ b/pkgs/development/python-modules/yeelight/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchPypi, buildPythonPackage, future, enum-compat }:
+
+buildPythonPackage rec {
+ pname = "yeelight";
+ version = "0.5.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "8d49846f0cede1e312cbcd1d0e44c42073910bbcadb31b87ce2a7d24dea3af38";
+ };
+
+ propagatedBuildInputs = [ future enum-compat ];
+
+ meta = with stdenv.lib; {
+ description = "A Python library for controlling YeeLight RGB bulbs";
+ homepage = "https://gitlab.com/stavros/python-yeelight/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ nyanloutre ];
+ };
+}
diff --git a/pkgs/development/python-modules/zope_i18n/default.nix b/pkgs/development/python-modules/zope_i18n/default.nix
deleted file mode 100644
index 662188db153..00000000000
--- a/pkgs/development/python-modules/zope_i18n/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, pytz
-, zope_component
-}:
-
-buildPythonPackage rec {
- pname = "zope.i18n";
- version = "4.7.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "9fcc1adb4e5f6188769ab36f6f40a59b567bb5eef91f714584e0dfd0891be5d0";
- };
-
- propagatedBuildInputs = [ pytz zope_component ];
-
- meta = with stdenv.lib; {
- homepage = "https://github.com/zopefoundation/zope.i18n";
- description = "Zope Internationalization Support";
- license = licenses.zpl20;
- maintainers = with maintainers; [ goibhniu ];
- broken = true;
- };
-
-}
diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
index b8797c3dfe2..48805d16808 100644
--- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
+++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-tarpaulin";
- version = "0.14.2";
+ version = "0.14.3";
src = fetchFromGitHub {
owner = "xd009642";
repo = "tarpaulin";
rev = "${version}";
- sha256 = "1skiaiz3xyi6cf62fkg7i7ahncm7vcg3aq4s4a5lrls30gr0n288";
+ sha256 = "03d8h5b174699yivaamlvaqzck9zs119jk29yf70dvxw7cs0nngv";
};
nativeBuildInputs = [
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
];
buildInputs = [ openssl ];
- cargoSha256 = "1klmdwpqk995pdyms40x7gk4l2mf4ncj7cgknl91kmyvpn4j1y4g";
+ cargoSha256 = "0zzp2wyq48j6n64fm37qfl65cg4yzf9ysichhkmkc6viq8x0f66d";
#checkFlags = [ "--test-threads" "1" ];
doCheck = false;
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 7d42b772234..e86ef253249 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -110,22 +110,22 @@ in {
#
# DO NOT EDIT! Automatically generated by ./update.py
radare2 = generic {
- version_commit = "25005";
- gittap = "4.5.0";
- gittip = "9d7eda5ec7367d1682e489e92d1be8e37e459296";
- rev = "4.5.0";
- version = "4.5.0";
- sha256 = "1vnvfgg48bccm41pdyjsql6fy1pymmfnip4w2w56b45d7rqcc3v8";
+ version_commit = "24959";
+ gittap = "4.5.1";
+ gittip = "293cf5ae65ba4e28828095dcae212955593ba255";
+ rev = "4.5.1";
+ version = "4.5.1";
+ sha256 = "0qigy1px0jy74c5ig73dc2fqjcy6vcy76i25dx9r3as6zfpkkaxj";
cs_ver = "4.0.2";
cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w";
};
r2-for-cutter = generic {
- version_commit = "25024";
- gittap = "4.5.0";
- gittip = "9d7eda5ec7367d1682e489e92d1be8e37e459296";
- rev = "9d7eda5ec7367d1682e489e92d1be8e37e459296";
- version = "2020-07-17";
- sha256 = "1vnvfgg48bccm41pdyjsql6fy1pymmfnip4w2w56b45d7rqcc3v8";
+ version_commit = "24959";
+ gittap = "4.5.1";
+ gittip = "293cf5ae65ba4e28828095dcae212955593ba255";
+ rev = "4.5.1";
+ version = "4.5.1";
+ sha256 = "0qigy1px0jy74c5ig73dc2fqjcy6vcy76i25dx9r3as6zfpkkaxj";
cs_ver = "4.0.2";
cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w";
};
diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py
index b9e72e62366..ebd6e073fe5 100755
--- a/pkgs/development/tools/analysis/radare2/update.py
+++ b/pkgs/development/tools/analysis/radare2/update.py
@@ -5,6 +5,8 @@
# and is formatted with black.
import fileinput
import json
+import xml.etree.ElementTree as ET
+from urllib.parse import urlparse
import re
import subprocess
import tempfile
@@ -30,10 +32,20 @@ def prefetch_github(owner: str, repo: str, ref: str) -> str:
def get_radare2_rev() -> str:
- url = "https://api.github.com/repos/radare/radare2/releases/latest"
- with urllib.request.urlopen(url) as response:
- release = json.load(response) # type: ignore
- return release["tag_name"]
+ feed_url = "http://github.com/radareorg/radare2/releases.atom"
+ with urllib.request.urlopen(feed_url) as resp:
+ tree = ET.fromstring(resp.read())
+ releases = tree.findall(".//{http://www.w3.org/2005/Atom}entry")
+ for release in releases:
+ link = release.find("{http://www.w3.org/2005/Atom}link")
+ assert link is not None
+ url = urlparse(link.attrib["href"])
+ tag = url.path.split("/")[-1]
+ if re.match(r"[0-9.]+", tag):
+ return tag
+ else:
+ print(f"ignore {tag}")
+ raise RuntimeError(f"No release found at {feed_url}")
def get_cutter_version() -> str:
diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index dd1342a37de..c3049edee64 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "bloop";
- version = "1.4.3";
+ version = "1.4.4";
bloop-coursier-channel = fetchurl {
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json";
- sha256 = "0abl91l2sb08pwr98mw910zibzwk6lss9r62h2s3g7qnnxp3z59r";
+ sha256 = "1pyf559bpnsmvca4kw36nb9lwkwa9q0ghrpa117s96dhvrp3i2bv";
};
bloop-bash = fetchurl {
@@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1ncl34f39mvk0zb5jl1l77cwjdg3xfnhjxbzz11pdfqw0d7wqywj"
- else if stdenv.isDarwin && stdenv.isx86_64 then "06c885w088yvh8l1r1jbrz0549gx2xvc8xr6rlxy6y27jk5655p2"
+ outputHash = if stdenv.isLinux && stdenv.isx86_64 then "0hf0priy93zqba78a9nvbgl3mzwlc4jz43gz7cv2cdkj6x0lp0y1"
+ else if stdenv.isDarwin && stdenv.isx86_64 then "0g2rnmlfnqymji4f4rn0kaz7hipgv3bakdpn08600gg1f3s8gabw"
else throw "unsupported platform";
};
diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix
index 34d30e08c50..c85f5473de8 100644
--- a/pkgs/development/tools/continuous-integration/fly/default.nix
+++ b/pkgs/development/tools/continuous-integration/fly/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fly";
- version = "6.5.0";
+ version = "6.5.1";
src = fetchFromGitHub {
owner = "concourse";
repo = "concourse";
rev = "v${version}";
- sha256 = "0x8q1l56h24mmq01j3hib2qg0g44z82mxhmmljy8yv5s2iir0sfh";
+ sha256 = "0ldw40xn9nb5picly32nq558x0klvkyrr9af0jfngbvm4l5209bc";
};
vendorSha256 = "1fxbxkg7disndlmb065abnfn7sn79qclkcbizmrq49f064w1ijr4";
diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix
index d3907718e9d..cf2e649962c 100644
--- a/pkgs/development/tools/ginkgo/default.nix
+++ b/pkgs/development/tools/ginkgo/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ginkgo";
- version = "1.14.0";
+ version = "1.14.1";
src = fetchFromGitHub {
owner = "onsi";
repo = "ginkgo";
rev = "v${version}";
- sha256 = "0nwvz0pqk2jqscq88fhppad4flrr8avkxfgbci4xklbar4g8i32v";
+ sha256 = "01nn33r1rg210zv0qmck0b16545gzr057w1kz8ca86l64qrwbcxx";
};
vendorSha256 = "072amyw1ir18v9vk268j2y7dhw3lfwvxzvzsdqhnp50rxsa911bx";
doCheck = false;
diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix
index 2864308c14d..ee942beb92c 100644
--- a/pkgs/development/tools/go-migrate/default.nix
+++ b/pkgs/development/tools/go-migrate/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-migrate";
- version = "4.11.0";
+ version = "4.12.2";
src = fetchFromGitHub {
owner = "golang-migrate";
repo = "migrate";
rev = "v${version}";
- sha256 = "Dw+TiuksgOfFBCzNc9rsxyQCoXES+fpr4wTrZfqohGM=";
+ sha256 = "0vrc9y90aamj618sfipq2sgzllhdr4hmicj4yvl147klwb1rxlz6";
};
- vendorSha256 = "CezVFRZ/cknvK4t/MjyP46zJACGkzj4CZ5JVQ502Ihw=";
+ vendorSha256 = "0jpz5xvwsw4l7nmi7s1grvbfy4xjp50hrjycwicgv2ll719gz5v0";
subPackages = [ "cmd/migrate" ];
diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix
index 9046a2ef82f..71bccc74ce6 100644
--- a/pkgs/development/tools/gotestsum/default.nix
+++ b/pkgs/development/tools/gotestsum/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gotestsum";
- version = "0.5.2";
+ version = "0.5.3";
src = fetchFromGitHub {
owner = "gotestyourself";
repo = "gotestsum";
rev = "v${version}";
- sha256 = "08bb865gl1ykqr7wm7a1jikjdlc2dqv1f3hllnwwr630c8y4k806";
+ sha256 = "1jq529m788yp3b6j4dhxgcw7qm1lyxx1ir2vwr41vp7gh17fmwar";
};
vendorSha256 = "1injixhllv41glb3yz276gjrkiwwkfimrhb367d2pvjpzqmhplan";
@@ -17,6 +17,8 @@ buildGoModule rec {
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+ subPackages = [ "." ];
+
meta = with stdenv.lib; {
homepage = "https://github.com/gotestyourself/gotestsum";
description = "A human friendly `go test` runner";
diff --git a/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix
index 9373b902dbd..c29ed6ce07e 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/default.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/default.nix
@@ -11,11 +11,11 @@
}:
mkDerivation {
pname = "haskell-language-server";
- version = "0.3.0.0";
+ version = "0.4.0.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
- sha256 = "0gh3sgy6a08d8d3q6r2qn5r817ilzka2qkp0g0y6wsx7rjwag0yx";
- rev = "23dda97f583e8ff39993b89c01bbd1ac24187605";
+ sha256 = "157bsq6i824bl6krw7znp0byd8ibaqsq7mfwnkl741dmrflsxpa9";
+ rev = "cb861b878ae01911b066182ff0d8080050c3b2d6";
fetchSubmodules = true;
};
isLibrary = true;
diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix
index 9674ca1272d..c6a9b31fb73 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix
@@ -17,9 +17,9 @@ mkDerivation {
pname = "ghcide";
version = "0.2.0";
src = fetchgit {
- url = "https://github.com/wz1000/ghcide";
- sha256 = "112bsk2660750n94gnsgrvd30rk0ccxb8dbhka606a11pcqv5cgx";
- rev = "3f6cd4553279ec47d1599b502720791a4f4613cd";
+ url = "https://github.com/haskell/ghcide";
+ sha256 = "1zq7ngaak8il91a309rl51dghzasnk4m2sm3av6d93cyqyra1hfc";
+ rev = "078e3d3c0d319f83841ccbcdc60ff5f0e243f6be";
fetchSubmodules = true;
};
isLibrary = true;
diff --git a/pkgs/development/tools/haskell/haskell-language-server/update.sh b/pkgs/development/tools/haskell/haskell-language-server/update.sh
index 002ccab4011..2f2741e9a49 100755
--- a/pkgs/development/tools/haskell/haskell-language-server/update.sh
+++ b/pkgs/development/tools/haskell/haskell-language-server/update.sh
@@ -29,7 +29,7 @@ ghcide_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell
echo "Updating haskell-language-server's ghcide from old version $ghcide_old_version to new version $ghcide_new_version."
echo "Running cabal2nix and outputting to ${ghcide_derivation_file}..."
-cabal2nix --revision "$ghcide_new_version" "https://github.com/wz1000/ghcide" > "$ghcide_derivation_file"
+cabal2nix --revision "$ghcide_new_version" "https://github.com/haskell/ghcide" > "$ghcide_derivation_file"
# ===========================
diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index 0044426b4d4..704477421ce 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "hcloud";
- version = "1.17.0";
+ version = "1.19.1";
src = fetchFromGitHub {
owner = "hetznercloud";
repo = "cli";
rev = "v${version}";
- sha256 = "1brqqcyyljkdd24ljx2qbr648ihhhmr8mq6gs90n63r59ci6ksch";
+ sha256 = "0iq04jfqvmwlm6947kzz4c3a33lvwxvj42z179rc3126b5v7bq54";
};
nativeBuildInputs = [ installShellFiles ];
- vendorSha256 = "1m96j9cwqz2b67byf53qhgl3s0vfwaklj2pm8364qih0ilvifppj";
+ vendorSha256 = "1svwrb5wyz5d8fgx36bpypnfq4hmpfxyd197cla9wnqpbkia7n5r";
doCheck = false;
diff --git a/pkgs/development/compilers/kcc/default.nix b/pkgs/development/tools/knightos/kcc/default.nix
similarity index 100%
rename from pkgs/development/compilers/kcc/default.nix
rename to pkgs/development/tools/knightos/kcc/default.nix
diff --git a/pkgs/development/tools/misc/kimg/default.nix b/pkgs/development/tools/knightos/kimg/default.nix
similarity index 100%
rename from pkgs/development/tools/misc/kimg/default.nix
rename to pkgs/development/tools/knightos/kimg/default.nix
diff --git a/pkgs/development/tools/misc/kpack/default.nix b/pkgs/development/tools/knightos/kpack/default.nix
similarity index 100%
rename from pkgs/development/tools/misc/kpack/default.nix
rename to pkgs/development/tools/knightos/kpack/default.nix
diff --git a/pkgs/development/tools/misc/mkrom/default.nix b/pkgs/development/tools/knightos/mkrom/default.nix
similarity index 100%
rename from pkgs/development/tools/misc/mkrom/default.nix
rename to pkgs/development/tools/knightos/mkrom/default.nix
diff --git a/pkgs/development/compilers/scas/default.nix b/pkgs/development/tools/knightos/scas/default.nix
similarity index 97%
rename from pkgs/development/compilers/scas/default.nix
rename to pkgs/development/tools/knightos/scas/default.nix
index e80724c8a4c..ad21e68eed8 100644
--- a/pkgs/development/compilers/scas/default.nix
+++ b/pkgs/development/tools/knightos/scas/default.nix
@@ -3,20 +3,20 @@
stdenv.mkDerivation rec {
pname = "scas";
-
+
version = "0.4.6";
-
+
src = fetchFromGitHub {
owner = "KnightOS";
repo = "scas";
rev = version;
sha256 = "1c6s9nivbwgv0f8n7j73h54ydgqw5dcpq8l752dfrnqg3kv3nn0h";
};
-
+
nativeBuildInputs = [ cmake ];
-
+
hardeningDisable = [ "format" ];
-
+
meta = with stdenv.lib; {
homepage = "https://knightos.org/";
description = "Assembler and linker for the Z80.";
diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix
index 7425357536c..a0bdfdb083d 100644
--- a/pkgs/development/tools/lazygit/default.nix
+++ b/pkgs/development/tools/lazygit/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "lazygit";
- version = "0.20.9";
+ version = "0.22.1";
goPackagePath = "github.com/jesseduffield/lazygit";
@@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "jesseduffield";
repo = pname;
rev = "v${version}";
- sha256 = "1jmg2z8yza8cy6xcyam4pvk0sp6zvw6b8vbn3b3h0pklfa7wz9pg";
+ sha256 = "1jq093nsfh7xqvsjvaad9wvqd3rjrpyp5fl8qxwbhaj3sxx19v7g";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix
index 09313cd780f..65f12bfbb09 100644
--- a/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/pkgs/development/tools/misc/clojure-lsp/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "clojure-lsp";
- version = "20200819T134828";
+ version = "20200828T065654";
src = fetchurl {
url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}";
- sha256 = "0nfi6wf78z0xm0mgsz83pn1v4mr76h2d5rva3xan4hn8gpd1s57s";
+ sha256 = "1399xjcnnb7vazy1jv3h7lnh1dyn81yk2bwi6ai991a9fsinjnf2";
};
dontUnpack = true;
diff --git a/pkgs/development/tools/misc/svls/default.nix b/pkgs/development/tools/misc/svls/default.nix
new file mode 100644
index 00000000000..f04c93e7a17
--- /dev/null
+++ b/pkgs/development/tools/misc/svls/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "svls";
+ version = "0.1.17";
+
+ src = fetchFromGitHub {
+ owner = "dalance";
+ repo = "svls";
+ rev = "v${version}";
+ sha256 = "0qcd9pkshk94c6skzld8cyzppl05hk4vcmmaya8r9l6kdi1f4b5m";
+ };
+
+ cargoSha256 = "0dqa7iw0sffzh07qysznh7ma3d3vl5fhd0i2qmz7a3dvw8mvyvsm";
+
+ meta = with lib; {
+ description = "SystemVerilog language server";
+ homepage = "https://github.com/dalance/svls";
+ license = licenses.mit;
+ maintainers = with maintainers; [ trepetti ];
+ };
+}
diff --git a/pkgs/development/tools/misc/texinfo/6.5.nix b/pkgs/development/tools/misc/texinfo/6.5.nix
new file mode 100644
index 00000000000..34596f30658
--- /dev/null
+++ b/pkgs/development/tools/misc/texinfo/6.5.nix
@@ -0,0 +1,4 @@
+import ./common.nix {
+ version = "6.5";
+ sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp";
+}
diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix
index 817bb117171..ed31f438a0a 100644
--- a/pkgs/development/tools/profiling/heaptrack/default.nix
+++ b/pkgs/development/tools/profiling/heaptrack/default.nix
@@ -6,13 +6,13 @@
mkDerivation rec {
pname = "heaptrack";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "KDE";
repo = "heaptrack";
rev = "v${version}";
- sha256 = "0vgwldl5n41r4y3pv8w29gmyln0k2w6m59zrfw9psm4hkxvivzlx";
+ sha256 = "0pw82c26da014i1qxnaib3fqa52ijhf0m4swhjc3qq4hm2dx9bxj";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index a100988aead..f397348416c 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "skaffold";
- version = "1.13.2";
+ version = "1.14.0";
goPackagePath = "github.com/GoogleContainerTools/skaffold";
subPackages = ["cmd/skaffold"];
@@ -19,7 +19,7 @@ buildGoPackage rec {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
- sha256 = "0xicf4bf52fnnwaimxrxv16x15lcmw12a5rrl0xjm4p059jnvy54";
+ sha256 = "18wk8cnp0sc47drgjc0iis4dkqwr9h5yxi40c1gjsiscrvy5akvc";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index 9430ebd2ef1..45606151e28 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -18,16 +18,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.3.2";
+ version = "1.3.3";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "0vdz3irhc2pxn5zh0c6frbz7pb8vr06kldxa204xwyl7fl770w3g";
+ sha256 = "0jbnx23f1323sh1rfx8rza2pzr4li4199wblrl4vw4zp5hj4qnkm";
fetchSubmodules = true;
};
- cargoSha256 = "1ch7vxnhs69paykrglim0ixaw73lzlmrglqhjp8f4xafvdk7n2ks";
+ cargoSha256 = "08zi3ynbi44rdgid9qalgsb5g8dcwclr6ynwxvhi8r0v5i7swwrx";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index 5200cb933ca..3e1b1cced1a 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "postman";
- version = "7.30.1";
+ version = "7.31.1";
src = fetchurl {
url = "https://dl.pstmn.io/download/version/${version}/linux64";
- sha256 = "18bphn5m42z9x0igafd259q7i88qn7wcxvvhdjv9ldnvmhf1k935";
+ sha256 = "14df24gj0mljblzc78pggyajr7004mg35gary5cz2c26vcklx4pw";
name = "${pname}.tar.gz";
};
diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix
index 9d07d09e27b..848bf2ab885 100644
--- a/pkgs/games/cockatrice/default.nix
+++ b/pkgs/games/cockatrice/default.nix
@@ -4,13 +4,13 @@
mkDerivation rec {
pname = "cockatrice";
- version = "2020-03-20-Release-2.7.4";
+ version = "2020-08-23-Release-2.7.5";
src = fetchFromGitHub {
owner = "Cockatrice";
repo = "Cockatrice";
rev = "${version}";
- sha256 = "1d229gswfcqxch19wb744d9h897qwzf2y9imwrbcwnlhpbr1j62k";
+ sha256 = "1yaxm7q0ja3rgx197hh8ynjc6ncc4hm0qdn9v7f0l4fbv0bdpv34";
};
buildInputs = [
diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix
index 074c24389a1..2ce6806bcb4 100644
--- a/pkgs/games/osu-lazer/default.nix
+++ b/pkgs/games/osu-lazer/default.nix
@@ -13,13 +13,13 @@ let
in stdenv.mkDerivation rec {
pname = "osu-lazer";
- version = "2020.820.0";
+ version = "2020.903.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
- sha256 = "0vszw0f5x0syshn8bnsbskxvknwpgbnm31kxwh1mfdr7pnxvw922";
+ sha256 = "01apjgi2r8jaihp7sp1y69fmplkiy383zxxdbjn1m797f0ls37ca";
};
patches = [ ./bypass-tamper-detection.patch ];
diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix
index 53f933d143b..6c8aa4bd18f 100644
--- a/pkgs/games/osu-lazer/deps.nix
+++ b/pkgs/games/osu-lazer/deps.nix
@@ -371,8 +371,8 @@
})
(fetchNuGet {
name = "Microsoft.Diagnostics.Runtime";
- version = "2.0.137201";
- sha256 = "0cfsd8nn6y30bqzx1pf9xi29jnxap1fgk720zdpz93kqzqv8r0vc";
+ version = "2.0.142701";
+ sha256 = "114ivn09zlxkna78hyxa3h40k5iaivapws755i0aiys7nxhdn3mw";
})
(fetchNuGet {
name = "Microsoft.DotNet.PlatformAbstractions";
@@ -586,8 +586,8 @@
})
(fetchNuGet {
name = "ppy.osu.Framework";
- version = "2020.819.0";
- sha256 = "1ghbbwpjjl0dp6gs1638v880hr7wwrn2jklqwbbckpx8g57bnq2m";
+ version = "2020.903.0";
+ sha256 = "0g15yw8c21m2g0lpca4f519dgj2phccz15nqdbaq49736akr4qzm";
})
(fetchNuGet {
name = "ppy.osu.Framework.NativeLibs";
@@ -596,8 +596,8 @@
})
(fetchNuGet {
name = "ppy.osu.Game.Resources";
- version = "2020.812.0";
- sha256 = "0fsg47bsffvk16clwwwav4yly1ykn09pyap46dvdmsxhjrzkvzb7";
+ version = "2020.903.0";
+ sha256 = "0f94kms4xyjl9xwf26j6n6k5zfbx61a6bkd3vljfmbmr88advssy";
})
(fetchNuGet {
name = "ppy.osuTK.NS20";
@@ -721,8 +721,8 @@
})
(fetchNuGet {
name = "Sentry";
- version = "2.1.5";
- sha256 = "094rhsn5rfk7f2ygk6jgv3cq01gv3a8lnqa85l593ys3957j0qhs";
+ version = "2.1.6";
+ sha256 = "0vc45p1arxwifv5fb6lzkqqxlsvm4i0xmpq2vc73vbjqzydd2phm";
})
(fetchNuGet {
name = "Sentry.PlatformAbstractions";
@@ -731,8 +731,8 @@
})
(fetchNuGet {
name = "Sentry.Protocol";
- version = "2.1.5";
- sha256 = "1yjgn6na14rr6crmm886x597h9gdjyasgxx3n9m3zn7ig8726mpg";
+ version = "2.1.6";
+ sha256 = "0qc18kc9d7f0s6hmnpji3sbz0z09kdgg4fwh55rrmpfgr3w851s7";
})
(fetchNuGet {
name = "SharpCompress";
diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix
index 6626e4df8a2..f3808102bd1 100644
--- a/pkgs/games/shattered-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/default.nix
@@ -10,13 +10,13 @@
let
pname = "shattered-pixel-dungeon";
- version = "0.8.2b";
+ version = "0.8.2d";
src = fetchFromGitHub {
owner = "00-Evan";
repo = "shattered-pixel-dungeon";
rev = "v${version}";
- sha256 = "02ksxm7iknxfc7l8dl2pr1kyhfmi7vkchz0lh46w3p5mqf82psfb";
+ sha256 = "11lgalam1aacw01ar7nawiim4pbxqzrdrnxvj6wq9mg83hgsz65l";
};
postPatch = ''
diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix
index 2e587cbd044..040ac00085e 100644
--- a/pkgs/misc/drivers/epson-escpr2/default.nix
+++ b/pkgs/misc/drivers/epson-escpr2/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "epson-inkjet-printer-escpr2";
- version = "1.1.15";
+ version = "1.1.17";
src = fetchurl {
# To find new versions, visit
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
# version.
# NOTE: Don't forget to update the webarchive link too!
urls = [
- "https://download3.ebz.epson.net/dsc/f/03/00/11/56/43/b1a6f1193e073c4c049da9404806c61052b62419/epson-inkjet-printer-escpr2-1.1.15-1lsb3.2.src.rpm"
- "https://web.archive.org/web/20200726093746if_/https://download3.ebz.epson.net/dsc/f/03/00/11/56/43/b1a6f1193e073c4c049da9404806c61052b62419/epson-inkjet-printer-escpr2-1.1.15-1lsb3.2.src.rpm"
+ "https://download3.ebz.epson.net/dsc/f/03/00/11/79/08/18185180910529f498f629f5fc08d3d479cdf5c3/epson-inkjet-printer-escpr2-1.1.17-1lsb3.2.src.rpm"
+ "https://web.archive.org/web/20200726093746if_/https://download3.ebz.epson.net/dsc/f/03/00/11/79/08/18185180910529f498f629f5fc08d3d479cdf5c3/epson-inkjet-printer-escpr2-1.1.17-1lsb3.2.src.rpm"
];
- sha256 = "0a6pzpx281dv9g148jp60l5z0brf260zb54dq6g1ixz4bmjz3f1f";
+ sha256 = "0bqqc04z9gayas5p7410la5nad7waykqyw1z1imcqimfl4qrz1m6";
};
patches = [ ./cups-filter-ppd-dirs.patch ];
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index f669c71c677..bb61872f7c3 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,22 +39,22 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
- version = "5.14";
+ version = "5.16";
url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz";
- sha256 = "1vy9gyvf05vkysgvp4kq4qd116nvif69di55x3dnf3p96wsn2hpl";
+ sha256 = "0j9268s1dy4cjvhcf4igbg54gaws4a1l3pda449qy2p2i4psdncq";
inherit (stable) mono gecko32 gecko64;
};
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
- sha256 = "0cvsasnidbg77dc2vjrw708rpy2jqdir9imqjcjppa4h1k8a2wcs";
+ sha256 = "1rrw15mrygv9zcbqz0c3s7q7971wqj89ys2bvvm4b0d2h4j0k6wq";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
# Just keep list empty, if current release haven't broken patchsets
- disabledPatchsets = [ "xactengine-initial" ];
+ disabledPatchsets = [ ];
};
winetricks = fetchFromGitHub rec {
diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix
index c415714f573..46c505ed439 100644
--- a/pkgs/misc/sndio/default.nix
+++ b/pkgs/misc/sndio/default.nix
@@ -1,23 +1,17 @@
-{ stdenv, fetchurl, alsaLib }:
+{ stdenv, fetchurl, alsaLib, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
pname = "sndio";
- version = "1.6.0";
+ version = "1.7.0";
enableParallelBuilding = true;
- buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ];
+ buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
src = fetchurl {
url = "http://www.sndio.org/sndio-${version}.tar.gz";
- sha256 = "1havdx3q4mipgddmd2bnygr1yh6y64567m1yqwjapkhsq550dq4r";
+ sha256 = "0ljmac0lnjn61admgbcwjfcr5fwccrsblx9rj9bys8wlhz8f796x";
};
- postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
- install_name_tool -id $out/lib/libsndio.7.0.dylib $out/lib/libsndio.7.0.dylib
- for file in $out/bin/*; do
- install_name_tool -change libsndio.7.0.dylib $out/lib/libsndio.dylib $file
- done
- '';
-
meta = with stdenv.lib; {
homepage = "http://www.sndio.org";
description = "Small audio and MIDI framework part of the OpenBSD project";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 525fb34cefb..18515293655 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -633,7 +633,7 @@ self: super: {
];
nodePackage2VimPackage = name: buildVimPluginFrom2Nix {
pname = name;
- inherit (nodePackages.${name}) version;
+ inherit (nodePackages.${name}) version meta;
src = "${nodePackages.${name}}/lib/node_modules/${name}";
};
in
diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix
index c7d14a45068..8dea4c17092 100644
--- a/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, buildLinux, ... } @ args:
let
- version = "5.8.1";
+ version = "5.8.7";
in
buildLinux (args // {
@@ -12,7 +12,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-zen1";
- sha256 = "122q09d0sybi9lqlaxpq6ffc0ha9127bg3wzjync256lbj5394b7";
+ sha256 = "06s7dpfxvwqfyh8qm8krcaxy98ki26cgh67k12g734bclg4bqsc5";
};
extraMeta = {
diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix
index 9a05f71817c..c1657dbfec4 100644
--- a/pkgs/servers/dgraph/default.nix
+++ b/pkgs/servers/dgraph/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dgraph";
- version = "20.03.4";
+ version = "20.07.0";
src = fetchFromGitHub {
owner = "dgraph-io";
repo = "dgraph";
rev = "v${version}";
- sha256 = "1i098wimzwna62q4wp8ipx8qjrmhrdv48kklm1jdi2sfiz18c9sc";
+ sha256 = "0jcr3imv6vy40c8zdahsfph5mdxkmp2yqapl5982cf0a61gj7brp";
};
- vendorSha256 = "0n442nsa2whwb22dl0cjxspl8dc00rqv29zivcw9liwdzara81bw";
+ vendorSha256 = "0fb8ba2slav6jk93qwaw715myanivrpajfjwi654n0psr57vc7gf";
doCheck = false;
diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix
index 88b6b418dd9..af2f6f2a11f 100644
--- a/pkgs/servers/hasura/cli.nix
+++ b/pkgs/servers/hasura/cli.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
subPackages = [ "cmd/hasura" ];
- vendorSha256 = "0a3mlkl00r680v8x3hy24ykggq5qm7k3101krlyfrb5y4karp75a";
+ vendorSha256 = "sha256-Fp6o3xZ/964q8yzJJFrqWZtQ5zYNy6Wreh42YxWjNbU=";
doCheck = false;
diff --git a/pkgs/servers/hasura/default.nix b/pkgs/servers/hasura/default.nix
deleted file mode 100644
index 08527466035..00000000000
--- a/pkgs/servers/hasura/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ haskell }:
-
-with haskell.lib;
-
-let
- # version in cabal file is invalid
- version = "1.2.1";
-
- pkgs = haskell.packages.ghc865.override {
- overrides = self: super: {
- # cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git
- hasura-graphql-engine = justStaticExecutables
- ((self.callPackage ./graphql-engine.nix { }).overrideDerivation (d: {
- name = "graphql-engine-${version}";
-
- inherit version;
-
- # hasura needs VERSION env exported during build
- preBuild = "export VERSION=${version}";
- }));
-
- hasura-cli = self.callPackage ./cli.nix {
- hasura-graphql-engine = self.hasura-graphql-engine // {
- inherit version;
- };
- };
-
- # internal dependencies, non published on hackage (find revisions in cabal.project file)
- # cabal2nix --revision https://github.com/hasura/ci-info-hs.git
- ci-info = self.callPackage ./ci-info.nix { };
- # cabal2nix --revision https://github.com/hasura/graphql-parser-hs.git
- graphql-parser = self.callPackage ./graphql-parser.nix { };
- # cabal2nix --revision https://github.com/hasura/pg-client-hs.git
- pg-client = self.callPackage ./pg-client.nix { };
-
- # version constrained dependencies, without these hasura will not build,
- # find versions in graphql-engine.cabal
- # cabal2nix cabal://dependent-map-0.2.4.0
- dependent-map = self.callPackage ./dependent-map.nix { };
- # cabal2nix cabal://dependent-sum-0.4
- dependent-sum = self.callPackage ./dependent-sum.nix { };
- # cabal2nix cabal://these-0.7.6
- these = doJailbreak (self.callPackage ./these.nix { });
- # cabal2nix cabal://immortal-0.2.2.1
- immortal = self.callPackage ./immortal.nix { };
- # cabal2nix cabal://network-uri-2.6.1.0
- network-uri = self.callPackage ./network-uri.nix { };
- # cabal2nix cabal://ghc-heap-view-0.6.0
- ghc-heap-view = disableLibraryProfiling (self.callPackage ./ghc-heap-view.nix { });
-
- # unmark broewn packages and do required modifications
- stm-hamt = doJailbreak (unmarkBroken super.stm-hamt);
- superbuffer = dontCheck (doJailbreak (unmarkBroken super.superbuffer));
- Spock-core = dontCheck (unmarkBroken super.Spock-core);
- stm-containers = dontCheck (unmarkBroken super.stm-containers);
- ekg-json = unmarkBroken super.ekg-json;
- list-t = dontCheck (unmarkBroken super.list-t);
- primitive-extras = unmarkBroken super.primitive-extras;
- };
- };
-in {
- inherit (pkgs) hasura-graphql-engine hasura-cli;
-}
diff --git a/pkgs/servers/hasura/dependent-map.nix b/pkgs/servers/hasura/dependent-map.nix
deleted file mode 100644
index 68ebb616b5f..00000000000
--- a/pkgs/servers/hasura/dependent-map.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ mkDerivation, base, containers, dependent-sum, stdenv }:
-mkDerivation {
- pname = "dependent-map";
- version = "0.2.4.0";
- sha256 = "5db396bdb5d156434af920c074316c3b84b4d39ba8e1cd349c7bb6679cb28246";
- revision = "1";
- editedCabalFile = "0a5f35d1sgfq1cl1r5bgb5pwfjniiycxiif4ycxglaizp8g5rlr1";
- libraryHaskellDepends = [ base containers dependent-sum ];
- homepage = "https://github.com/mokus0/dependent-map";
- description = "Dependent finite maps (partial dependent products)";
- license = "unknown";
- hydraPlatforms = stdenv.lib.platforms.none;
-}
diff --git a/pkgs/servers/hasura/dependent-sum.nix b/pkgs/servers/hasura/dependent-sum.nix
deleted file mode 100644
index 90717b87366..00000000000
--- a/pkgs/servers/hasura/dependent-sum.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ mkDerivation, base, stdenv }:
-mkDerivation {
- pname = "dependent-sum";
- version = "0.4";
- sha256 = "a8deecb4153a1878173f8d0a18de0378ab068bc15e5035b9e4cb478e8e4e1a1e";
- libraryHaskellDepends = [ base ];
- homepage = "https://github.com/mokus0/dependent-sum";
- description = "Dependent sum type";
- license = stdenv.lib.licenses.publicDomain;
-}
diff --git a/pkgs/servers/hasura/ghc-heap-view.nix b/pkgs/servers/hasura/ghc-heap-view.nix
deleted file mode 100644
index 54c873baee4..00000000000
--- a/pkgs/servers/hasura/ghc-heap-view.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ mkDerivation, base, binary, bytestring, Cabal, containers
-, deepseq, filepath, ghc-heap, stdenv, template-haskell
-, transformers
-}:
-mkDerivation {
- pname = "ghc-heap-view";
- version = "0.6.0";
- sha256 = "99ed6034d02a7a942e1b6ed970e9f7028dcdfd5b5d29fd8a0fb89f1a5e7c5ec8";
- enableSeparateDataOutput = true;
- setupHaskellDepends = [ base Cabal filepath ];
- libraryHaskellDepends = [
- base binary bytestring containers ghc-heap template-haskell
- transformers
- ];
- testHaskellDepends = [ base deepseq ];
- description = "Extract the heap representation of Haskell values and thunks";
- license = stdenv.lib.licenses.bsd3;
-}
diff --git a/pkgs/servers/hasura/immortal.nix b/pkgs/servers/hasura/immortal.nix
deleted file mode 100644
index c53f0f18709..00000000000
--- a/pkgs/servers/hasura/immortal.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ mkDerivation, base, lifted-base, monad-control, stdenv, stm
-, tasty, tasty-hunit, transformers, transformers-base
-}:
-mkDerivation {
- pname = "immortal";
- version = "0.2.2.1";
- sha256 = "ed4aa1a2883a693a73fec47c8c2d5332d61a0626a2013403e1a8fb25cc6c8d8e";
- libraryHaskellDepends = [
- base lifted-base monad-control stm transformers-base
- ];
- testHaskellDepends = [
- base lifted-base stm tasty tasty-hunit transformers
- ];
- homepage = "https://github.com/feuerbach/immortal";
- description = "Spawn threads that never die (unless told to do so)";
- license = stdenv.lib.licenses.mit;
-}
diff --git a/pkgs/servers/hasura/network-uri.nix b/pkgs/servers/hasura/network-uri.nix
deleted file mode 100644
index 45016d470a8..00000000000
--- a/pkgs/servers/hasura/network-uri.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ mkDerivation, base, deepseq, HUnit, parsec, stdenv
-, test-framework, test-framework-hunit, test-framework-quickcheck2
-}:
-mkDerivation {
- pname = "network-uri";
- version = "2.6.1.0";
- sha256 = "423e0a2351236f3fcfd24e39cdbc38050ec2910f82245e69ca72a661f7fc47f0";
- revision = "1";
- editedCabalFile = "141nj7q0p9wkn5gr41ayc63cgaanr9m59yym47wpxqr3c334bk32";
- libraryHaskellDepends = [ base deepseq parsec ];
- testHaskellDepends = [
- base HUnit test-framework test-framework-hunit
- test-framework-quickcheck2
- ];
- homepage = "https://github.com/haskell/network-uri";
- description = "URI manipulation";
- license = stdenv.lib.licenses.bsd3;
-}
diff --git a/pkgs/servers/hasura/these.nix b/pkgs/servers/hasura/these.nix
deleted file mode 100644
index 396f9e2a282..00000000000
--- a/pkgs/servers/hasura/these.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, aeson, base, base-compat, bifunctors, binary
-, containers, data-default-class, deepseq, hashable, keys, lens
-, mtl, QuickCheck, quickcheck-instances, semigroupoids, stdenv
-, tasty, tasty-quickcheck, transformers, transformers-compat
-, unordered-containers, vector, vector-instances
-}:
-mkDerivation {
- pname = "these";
- version = "0.7.6";
- sha256 = "9464b83d98e626360a8ad9836ba77e5201cd1e9c89b95b1b11a28ef3c23ac746";
- libraryHaskellDepends = [
- aeson base base-compat bifunctors binary containers
- data-default-class deepseq hashable keys lens mtl QuickCheck
- semigroupoids transformers transformers-compat unordered-containers
- vector vector-instances
- ];
- testHaskellDepends = [
- aeson base base-compat bifunctors binary containers hashable lens
- QuickCheck quickcheck-instances tasty tasty-quickcheck transformers
- unordered-containers vector
- ];
- homepage = "https://github.com/isomorphism/these";
- description = "An either-or-both data type & a generalized 'zip with padding' typeclass";
- license = stdenv.lib.licenses.bsd3;
-}
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 4a6989989ae..3342c488c93 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -755,7 +755,7 @@
"spotcrime" = ps: with ps; [ ]; # missing inputs: spotcrime
"spotify" = ps: with ps; [ aiohttp-cors spotipy ];
"sql" = ps: with ps; [ sqlalchemy ];
- "squeezebox" = ps: with ps; [ ]; # missing inputs: pysqueezebox
+ "squeezebox" = ps: with ps; [ pysqueezebox ];
"ssdp" = ps: with ps; [ aiohttp-cors defusedxml netdisco zeroconf ];
"starline" = ps: with ps; [ ]; # missing inputs: starline
"starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank
@@ -931,7 +931,7 @@
"yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast
"yandex_transport" = ps: with ps; [ ]; # missing inputs: aioymaps
"yandextts" = ps: with ps; [ ];
- "yeelight" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: yeelight
+ "yeelight" = ps: with ps; [ aiohttp-cors netdisco yeelight zeroconf ];
"yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower
"yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS
"yi" = ps: with ps; [ aioftp ha-ffmpeg ];
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 0306fb4dfab..e76fd0eae91 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "jackett";
- version = "0.16.998";
+ version = "0.16.1057";
src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
- sha256 = "16f8ipw4sbdxwv79zjhr5ihd3m6biyhj1gj7cqpjr34ad7zqna3c";
+ sha256 = "0scc7xjyr7igbnmkg67lmzijvkgv3si1r502npnxamiflic59rnx";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix
index 3e0533fc9bd..afa5375c9fd 100644
--- a/pkgs/servers/jellyfin/default.nix
+++ b/pkgs/servers/jellyfin/default.nix
@@ -18,12 +18,12 @@ let
in stdenv.mkDerivation rec {
pname = "jellyfin";
- version = "10.6.3";
+ version = "10.6.4";
# Impossible to build anything offline with dotnet
src = fetchurl {
- url = "https://repo.jellyfin.org/releases/server/portable/stable/combined/jellyfin_${version}.tar.gz";
- sha256 = "bqGIXS+T82jGMObMPMyYSjzQ+qZnACW4Q7WpV948crc=";
+ url = "https://repo.jellyfin.org/releases/server/portable/versions/stable/combined/${version}/jellyfin_${version}.tar.gz";
+ sha256 = "OqN070aUKPk0dXAy8R/lKUnSWen+si/AJ6tkYh5ibqo=";
};
buildInputs = [
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index 813d1f18e8b..a63d75552cc 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "mautrix-whatsapp";
- version = "0.1.3";
+ version = "0.1.4";
src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
rev = "v${version}";
- sha256 = "1qagp6jnc4n368pg4h3jr9bzpwpbnva1xyl1b1k2a7q4b5fm5yww";
+ sha256 = "1c77f3ffm6m9j8q9p1hb9i8zrqqpvfkr9ffamly44gs7xddmv9sv";
};
buildInputs = [ olm ];
- vendorSha256 = "1dmlqhhwmc0k9nbab5j8sl20b8d6b5yrmcdf7ibaiqh7i16zrp3s";
+ vendorSha256 = "01yr5321paqifmgzz235lknsa0w4hbs3182y6pxw8hqsvh18c48b";
doCheck = false;
diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix
index 4e5c74c2a60..ec9d56f2cbb 100644
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/servers/monitoring/loki/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }:
buildGoPackage rec {
- version = "1.6.0";
+ version = "1.6.1";
pname = "grafana-loki";
goPackagePath = "github.com/grafana/loki";
@@ -11,7 +11,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "loki";
- sha256 = "0i1m9aaqbq5p99fysrnhl1vxj97cq59gbdkcwkq4hkylqxlaxkyk";
+ sha256 = "0bakskzizazc5cd6km3n6facc5val5567zinnxg3yjy29xdi64ww";
};
postPatch = ''
diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix
index 6d04d8609b8..7af9970b507 100644
--- a/pkgs/servers/monitoring/sensu-go/default.nix
+++ b/pkgs/servers/monitoring/sensu-go/default.nix
@@ -4,14 +4,14 @@ let
generic = { subPackages, pname, postInstall ? "" }:
buildGoModule rec {
inherit pname;
- version = "5.21.1";
+ version = "5.21.2";
shortRev = "3a1ac58"; # for internal version info
src = fetchFromGitHub {
owner = "sensu";
repo = "sensu-go";
rev = "v${version}";
- sha256 = "1vgb25d546dh5sassclym077vmvvl1wj4ndd2084ngvify7dp1a9";
+ sha256 = "1hsvdqz0ckk8d1yxinqwylw97jd3gnf7c63zkjly87vasg98qk9x";
};
inherit subPackages postInstall;
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 8d4cd5b3b2c..db07bdc96a4 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "influxdb";
- version = "1.8.0";
+ version = "1.8.2";
src = fetchFromGitHub {
owner = "influxdata";
repo = pname;
rev = "v${version}";
- sha256 = "111n36xifmd644xp80imqxx61nlap6fdwx1di2qphlqb43z99jrq";
+ sha256 = "11zkia43i3in1xv84iz6rm9cfhf4k6nxn144m7dz7a7nv3chi20g";
};
vendorSha256 = "097x3z1fhdl5s3ni2qzbqxqr60l6lqcrbikq20fs052dp287q0sp";
diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix
index b04675d64f4..a382c969da8 100644
--- a/pkgs/servers/sickbeard/sickgear.nix
+++ b/pkgs/servers/sickbeard/sickgear.nix
@@ -4,13 +4,13 @@ let
pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
in stdenv.mkDerivation rec {
pname = "sickgear";
- version = "0.21.36";
+ version = "0.21.42";
src = fetchFromGitHub {
owner = "SickGear";
repo = "SickGear";
rev = "release_${version}";
- sha256 = "0kssz44agvb5zxjq2i566f4xk9924372hjpj0czjckrrjvzjqvci";
+ sha256 = "0a18vn1vy4zdp40iizgg3yji6k74r54rb7d7gn5byz1zj28g5c5c";
};
dontBuild = true;
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 351799099b1..09d2f6aac1a 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
- version = "0.18.1";
+ version = "0.19.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "100r26dx57wdzdpf6lgsgw0py33k3nsx73pa1qjcipwv00a106sr";
+ sha256 = "08r6f71cy4j22k0mllm134x4dfixaircpaz5arrj93xsbp38nk92";
};
- cargoSha256 = "0ch79zsnqb5n9r7jq6figpmqp2cs2p9a3m7fg3sd04m797ki9chr";
+ cargoSha256 = "15kvl490abxdv6706zs7pv0q5fhghmdvlfbn19037sldkcsfl86b";
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];
@@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://www.nushell.sh/";
license = licenses.mit;
maintainers = with maintainers; [ filalex77 johntitor marsam ];
- platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+ platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ];
};
passthru = {
diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index f73ec422e06..751dd00efc7 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -4,31 +4,22 @@
, glibcLocales
, coreutils
, git
-, fetchpatch
}:
python3Packages.buildPythonApplication rec {
pname = "xonsh";
- version = "0.9.20";
+ version = "0.9.21";
# fetch from github because the pypi package ships incomplete tests
src = fetchFromGitHub {
owner = "xonsh";
repo = "xonsh";
rev = version;
- sha256 = "05phrwqd1c64531y78zxkxd4w1cli8yj3x2cqch7nkzbyz93608p";
+ sha256 = "16k8506fk54krpkls374cn3vm1dp9ixi0byh5xvi3m5a4bnbvrs0";
};
LC_ALL = "en_US.UTF-8";
- patches = [
- # Fix vox tests. Remove with the next release
- (fetchpatch {
- url = "https://github.com/xonsh/xonsh/commit/00aeb7645af97134495cc6bc5fe2f41922df8676.patch";
- sha256 = "0hx5jk22wxgmjzmqbxr2pjs3mwh7p0jwld0xhslc1s6whbjml25h";
- })
- ];
-
postPatch = ''
sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py
sed -ie "s|SHELL=xonsh|SHELL=$out/bin/xonsh|" tests/test_integrations.py
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index e0266aacf34..491951e6121 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -309,8 +309,12 @@ in rec {
name = attrs.name or "${attrs.pname}-${attrs.version}";
# If the packager hasn't specified `outputsToInstall`, choose a default,
- # which is the name of `p.bin or p.out or p`;
- # if he has specified it, it will be overridden below in `// meta`.
+ # which is the name of `p.bin or p.out or p` along with `p.man` when
+ # present.
+ #
+ # If the packager has specified it, it will be overridden below in
+ # `// meta`.
+ #
# Note: This default probably shouldn't be globally configurable.
# Services and users should specify outputs explicitly,
# unless they are comfortable with this default.
diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix
index ef6f760de51..1efbff221a6 100644
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/pkgs/tools/admin/aws-vault/default.nix
@@ -1,16 +1,16 @@
{ buildGoModule, lib, fetchFromGitHub }:
buildGoModule rec {
pname = "aws-vault";
- version = "5.4.4";
+ version = "6.0.0";
src = fetchFromGitHub {
owner = "99designs";
repo = pname;
rev = "v${version}";
- sha256 = "0qmxq2jd7dg5fp9giw6xd96q2l2df3sxksc0rwmrgx2rjx6iyivn";
+ sha256 = "0ssm58ksk5jb28w1ipa57spzf6wixjy1m7flw61ls8k86cy7qb7c";
};
- vendorSha256 = "0jlraq480llamns6yw8yjkzxsndyqiyzy120djni8sw5h0bz65j7";
+ vendorSha256 = "0lxm7nkzf9j9id7m46gqn26prb1jfl34gy1fycr0578absdvsrjd";
doCheck = false;
diff --git a/pkgs/tools/audio/beets/mutagen-1.43.patch b/pkgs/tools/audio/beets/mutagen-1.43.patch
index 84cf1bab03e..d0d448c15e9 100644
--- a/pkgs/tools/audio/beets/mutagen-1.43.patch
+++ b/pkgs/tools/audio/beets/mutagen-1.43.patch
@@ -1,8 +1,10 @@
-Backport https://github.com/beetbox/mediafile/commit/b3343c4ee08d1251ae5e2344401a2f5892b4e868
+Backport
+https://github.com/beetbox/mediafile/commit/b3343c4ee08d1251ae5e2344401a2f5892b4e868
+https://github.com/beetbox/mediafile/commit/d2fc3b59f77c515b02dfe7ad936f89264375d2b4
to Beets 1.4.9.
diff --git i/setup.py w/setup.py
-index 79278f8..b8d6068 100755
+index 79278f8b..b8d60687 100755
--- i/setup.py
+++ w/setup.py
@@ -87,7 +87,7 @@ setup(
@@ -15,9 +17,18 @@ index 79278f8..b8d6068 100755
'musicbrainzngs>=0.4',
'pyyaml',
diff --git i/test/test_mediafile.py w/test/test_mediafile.py
-index 36a2c53..54ef9dd 100644
+index 36a2c53a..0ddde44e 100644
--- i/test/test_mediafile.py
+++ w/test/test_mediafile.py
+@@ -888,7 +888,7 @@ class WavpackTest(ReadWriteTestBase, unittest.TestCase):
+ 'bitrate': 109312,
+ 'format': u'WavPack',
+ 'samplerate': 44100,
+- 'bitdepth': 0,
++ 'bitdepth': 16,
+ 'channels': 1,
+ }
+
@@ -912,7 +912,7 @@ class AIFFTest(ReadWriteTestBase, unittest.TestCase):
'bitrate': 705600,
'format': u'AIFF',
diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix
index 72ed4f0ee1b..6de0d586ad9 100644
--- a/pkgs/tools/filesystems/idsk/default.nix
+++ b/pkgs/tools/filesystems/idsk/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "idsk";
- version = "0.19";
+ version = "0.20";
src = fetchFromGitHub {
repo = "idsk";
owner = "cpcsdk";
rev = "v${version}";
- sha256 = "0b4my5cz5kbzh4n65jr721piha6zixaxmfiss2zidip978k9rb6f";
+ sha256 = "05zbdkb9s6sfkni6k927795w2fqdhnf3i7kgl27715sdmmdab05d";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix
index a02a97739ba..3ca9a7b5e8d 100644
--- a/pkgs/tools/graphics/yafaray-core/default.nix
+++ b/pkgs/tools/graphics/yafaray-core/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "yafaray-core";
- version = "3.4.4";
+ version = "3.5.0";
src = fetchFromGitHub {
owner = "YafaRay";
repo = "Core";
rev = "v${version}";
- sha256 = "140vnaihz09rdvp0mqgrs26b3a2fv5wm49ar6817p4qklfx71l0g";
+ sha256 = "05r08ynm6p9jq9l3v1v3lqkrfx3bm6zlqcxm1yk7mdv1zv2yxikd";
};
preConfigure = ''
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.yafaray.org";
maintainers = with maintainers; [ hodapp ];
license = licenses.lgpl21;
- platforms = platforms.linux;
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index 7387270b737..62ca179cfde 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -5,23 +5,33 @@
, makeWrapper
, coreutils
, libiconv
+, xcbuild
+, zlib
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "broot";
- version = "0.20.3";
+ version = "1.0.0";
src = fetchCrate {
inherit pname version;
- sha256 = "0vw956c5xpjsbd9b0ardvgi9jjqb230m2x5n4h9ai0yiwizc8rh6";
+ sha256 = "1dc6lb6ihj4s0mcp1say16j9yr61jdbzhmayxxsm4ansngbzmw45";
};
- cargoSha256 = "1zl4p3n327iq7nm7hi79zjxv2gvw9f3lwgkg1qp52kycv1af5gqp";
+ cargoSha256 = "0nqmincayjv1snxz94i14fypc9dv69fxfqqdz3qbcvc2cs62zayg";
- nativeBuildInputs = [ makeWrapper installShellFiles ];
+ nativeBuildInputs = [
+ makeWrapper
+ installShellFiles
+ xcbuild # The cc crate attempts to run xcbuild.
+ ];
- buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [
+ libiconv
+ Security
+ zlib
+ ];
postPatch = ''
substituteInPlace src/verb/builtin.rs --replace '"/bin/' '"${coreutils}/bin/'
diff --git a/pkgs/tools/misc/oppai-ng/default.nix b/pkgs/tools/misc/oppai-ng/default.nix
index 46b2fd444ec..e44999d1c34 100644
--- a/pkgs/tools/misc/oppai-ng/default.nix
+++ b/pkgs/tools/misc/oppai-ng/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "oppai-ng";
- version = "3.2.3";
+ version = "3.3.0";
src = fetchFromGitHub {
owner = "Francesco149";
repo = pname;
rev = version;
- sha256 = "1wrnpnx1yl0pdzmla4knlpcwy7baamy2wpdypnbdqxrn0zkw7kzk";
+ sha256 = "0ymprwyv92pr58851wzryymhfznnpwcbg4m1yri0c9cyzvabwmfk";
};
buildPhase = ''
diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index 63acdbfc13b..4af7a0009af 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pspg";
- version = "3.1.2";
+ version = "3.1.3";
src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = version;
- sha256 = "1x4x93c8qqalrhaah1rmrspr4gjcgf1sg6kplf9rg1c42mk672f8";
+ sha256 = "16pajhzr4aahyhdzkp9g3ld2insnlk2z2w2pfab8bghw4f69j5xf";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix
index 311f43fdb2a..4f0677846ea 100644
--- a/pkgs/tools/misc/tealdeer/default.nix
+++ b/pkgs/tools/misc/tealdeer/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "tealdeer";
- version = "1.3.0";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "dbrgn";
repo = "tealdeer";
rev = "v${version}";
- sha256 = "0l16qqkrya22nnm4j3dxyq4gb85i3c07p10s00bpqcvki6n6v6r8";
+ sha256 = "1f37qlw4nxdhlqlqzzb4j11gsv26abk2nk2qhbzj77kp4v2b125x";
};
- cargoSha256 = "0jvgcf493rmkrh85j0fkf8ffanva80syyxclzkvkrzvvwwj78b5l";
+ cargoSha256 = "0g5fjj677qzhw3nw7f3n5gghsj2y811bdclxpy8aq2n58gbwvhvc";
buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ];
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 07dae0b9600..5803de7b52f 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2020.07.28";
+ version = "2020.09.06";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "1if7xyi7g9rpni1jbs7gv5m12s34qdb15dpfbbjn8120h16y7cqz";
+ sha256 = "1827hcp9bvwq7p2f5r0wgkg6yb5fgvr4miyi3d99hkah2afw12za";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index 681d5d0e7a9..4371d37391b 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -2,11 +2,11 @@
let wrapper = stdenv.mkDerivation rec {
pname = "wrapper";
- version = "3.5.35";
+ version = "3.5.43";
src = fetchurl {
url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
- sha256 = "0mjyw9ays9v6lnj21pmfd3qdvd9b6rwxfmw3pg6z0kyf2jadixw2";
+ sha256 = "19cx3854rk7b2056z8pvxnf4simsg5js7czsy2bys7jl6vh2x02b";
};
buildInputs = [ jdk ];
@@ -32,11 +32,11 @@ in
stdenv.mkDerivation rec {
pname = "i2p";
- version = "0.9.42";
+ version = "0.9.47";
src = fetchurl {
url = "https://download.i2p2.de/releases/${version}/i2psource_${version}.tar.bz2";
- sha256 = "04y71hzkdpjzbac569rhyg1zfx37j0alggbl9gnkaqfbprb2nj1h";
+ sha256 = "0krcdm73qing7z918wpml9sk6dn0284wps2ghkmlrdaklfkavk6v";
};
buildInputs = [ jdk ant gettext which ];
@@ -77,6 +77,6 @@ stdenv.mkDerivation rec {
homepage = "https://geti2p.net";
license = licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ];
- maintainers = [ maintainers.joelmo ];
+ maintainers = with maintainers; [ joelmo ];
};
}
diff --git a/pkgs/tools/networking/i2p/i2p.patch b/pkgs/tools/networking/i2p/i2p.patch
index 74031eb7aef..3bb4da72917 100644
--- a/pkgs/tools/networking/i2p/i2p.patch
+++ b/pkgs/tools/networking/i2p/i2p.patch
@@ -19,7 +19,7 @@ index eb4995dfe..0186cede3 100644
# Try using the Java binary that I2P was installed with.
# If it's not found, try looking in the system PATH.
--JAVA=$(which %JAVA_HOME/bin/java || which java)
+-JAVA=$(which "%JAVA_HOME"/bin/java || which java)
+JAVA=%JAVA%
if [ -z $JAVA ] || [ ! -x $JAVA ]; then
diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix
index 0d5f878af08..277c7417ce9 100644
--- a/pkgs/tools/text/mdcat/default.nix
+++ b/pkgs/tools/text/mdcat/default.nix
@@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "mdcat";
- version = "0.20.0";
+ version = "0.21.1";
src = fetchFromGitHub {
owner = "lunaryorn";
repo = pname;
rev = "mdcat-${version}";
- hash = "sha256-1qxz6p7VaJ9eMcLQaTW/M4+Xo0WLihzyEAycbkjjPyA=";
+ hash = "sha256-O7LlbSkxcyHQiTHYB/QBJVlShzTSzud3VJDIQ1ScvM4=";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
- cargoSha256 = "sha256-/mAwlxed1MOFUA1jDSrgPzJuURbKzwucBWORVVHlrt8=";
+ cargoSha256 = "sha256-pvhYKyFraMI4w5nq6L8qs/ONSNDTHElhZnZmD5mmAZs=";
checkInputs = [ ansi2html ];
checkPhase = ''
diff --git a/pkgs/tools/video/vcsi/default.nix b/pkgs/tools/video/vcsi/default.nix
new file mode 100644
index 00000000000..84e6c2e6d41
--- /dev/null
+++ b/pkgs/tools/video/vcsi/default.nix
@@ -0,0 +1,28 @@
+{ lib, python3Packages, ffmpeg }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "vcsi";
+ version = "7.0.12";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "0dks0yr2a0cpr32vrwhdrhsb4qyj7rz1yv44fjbr8z8j8p84yjx5";
+ };
+
+ propagatedBuildInputs = with python3Packages; [
+ numpy
+ pillow
+ jinja2
+ texttable
+ parsedatetime
+ ];
+
+ makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" ];
+
+ meta = with lib; {
+ description = "Create video contact sheets";
+ homepage = "https://github.com/amietn/vcsi";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dandellion ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e5434eba13..a43ecde5ce2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4904,11 +4904,6 @@ in
kippo = callPackage ../servers/kippo { };
- kimg = callPackage ../development/tools/misc/kimg {
- asciidoc = asciidoc-full;
- imagemagick = imagemagick7Big;
- };
-
kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { };
kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { };
@@ -7619,6 +7614,8 @@ in
vbetool = callPackage ../tools/system/vbetool { };
+ vcsi = callPackage ../tools/video/vcsi { };
+
vde2 = callPackage ../tools/networking/vde2 { };
vboot_reference = callPackage ../tools/system/vboot_reference {};
@@ -9271,7 +9268,20 @@ in
jwasm = callPackage ../development/compilers/jwasm { };
- knightos-kcc = callPackage ../development/compilers/kcc { };
+ knightos-kcc = callPackage ../development/tools/knightos/kcc { };
+
+ knightos-kimg = callPackage ../development/tools/knightos/kimg {
+ asciidoc = asciidoc-full;
+ imagemagick = imagemagick7Big;
+ };
+
+ knightos-kpack = callPackage ../development/tools/knightos/kpack { };
+
+ knightos-mkrom = callPackage ../development/tools/knightos/mkrom {
+ asciidoc = asciidoc-full;
+ };
+
+ knightos-scas = callPackage ../development/tools/knightos/scas { };
kotlin = callPackage ../development/compilers/kotlin { };
@@ -9666,8 +9676,6 @@ in
scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; };
scala = scala_2_13;
- scas = callPackage ../development/compilers/scas { };
-
metal = callPackage ../development/libraries/metal { };
metals = callPackage ../development/tools/metals { };
scalafix = callPackage ../development/tools/scalafix { };
@@ -11104,8 +11112,6 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
- kpack = callPackage ../development/tools/misc/kpack { };
-
kustomize = callPackage ../development/tools/kustomize { };
ktlint = callPackage ../development/tools/ktlint { };
@@ -11178,10 +11184,6 @@ in
mkcert = callPackage ../development/tools/misc/mkcert { };
- mkrom = callPackage ../development/tools/misc/mkrom {
- asciidoc = asciidoc-full;
- };
-
mkdocs = callPackage ../development/tools/documentation/mkdocs { };
mockgen = callPackage ../development/tools/mockgen { };
@@ -11507,6 +11509,8 @@ in
svlint = callPackage ../development/tools/analysis/svlint { };
+ svls = callPackage ../development/tools/misc/svls { };
+
swarm = callPackage ../development/tools/analysis/swarm { };
swiftformat = callPackage ../development/tools/swiftformat { };
@@ -11544,8 +11548,10 @@ in
texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
texinfo4 = texinfo413;
texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
+ texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { };
texinfo6 = callPackage ../development/tools/misc/texinfo/6.7.nix { };
- texinfo = texinfo6;
+ # Temporarily use older version on Darwin until it works.
+ texinfo = if stdenv.isDarwin then texinfo6_5 else texinfo6;
texinfoInteractive = appendToName "interactive" (
texinfo.override { interactive = true; }
);
@@ -12957,6 +12963,8 @@ in
isocodes = callPackage ../development/libraries/iso-codes { };
+ iso-flags = callPackage ../data/icons/iso-flags { };
+
ispc = callPackage ../development/compilers/ispc {
stdenv = llvmPackages_10.stdenv;
llvmPackages = llvmPackages_10;
@@ -16315,17 +16323,9 @@ in
hashi-ui = callPackage ../servers/hashi-ui {};
- /* This package duplicates a lot of functionality from haskellPackages
- instead of using the packages we maintain there. Now, a recent update to
- haskellPackages causes these tools to fail evaluation, and I have been
- unable to mark them as "broken" in a way that ofBorg bot recognizes. Since
- I don't want to merge code into master that generates evaluation errors, I
- have no other idea but to comment them out entirely.
+ hasura-graphql-engine = haskellPackages.graphql-engine;
- inherit (callPackage ../servers/hasura { })
- hasura-cli
- hasura-graphql-engine;
- */
+ hasura-cli = callPackage ../servers/hasura/cli.nix { };
heapster = callPackage ../servers/monitoring/heapster { };
@@ -19720,7 +19720,7 @@ in
catimg = callPackage ../tools/misc/catimg { };
- catt = python3Packages.callPackage ../applications/video/catt { };
+ catt = callPackage ../applications/video/catt { };
cava = callPackage ../applications/audio/cava { };
@@ -20914,8 +20914,8 @@ in
hugo = callPackage ../applications/misc/hugo { };
- hydrogen = callPackage ../applications/audio/hydrogen { };
- hydrogen-unstable = qt5.callPackage ../applications/audio/hydrogen/unstable.nix { };
+ hydrogen = qt5.callPackage ../applications/audio/hydrogen { };
+ hydrogen_0 = callPackage ../applications/audio/hydrogen/0.nix { }; # Old stable, has GMKit.
hydroxide = callPackage ../applications/networking/hydroxide { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d0dc0bf1e91..4ce0c1a96dd 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -286,6 +286,8 @@ let
farfadet = callPackage ../development/ocaml-modules/farfadet { };
+ fdkaac = callPackage ../development/ocaml-modules/fdkaac { };
+
fiat-p256 = callPackage ../development/ocaml-modules/fiat-p256 { };
fieldslib_p4 = callPackage ../development/ocaml-modules/fieldslib { };
@@ -914,6 +916,10 @@ let
sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { };
+ srt = callPackage ../development/ocaml-modules/srt {
+ inherit (pkgs) srt;
+ };
+
ssl = callPackage ../development/ocaml-modules/ssl { };
stdlib-shims = callPackage ../development/ocaml-modules/stdlib-shims { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c4ad9f1669d..e17ccce7f27 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3242,8 +3242,6 @@ in {
libarchive-c = callPackage ../development/python-modules/libarchive-c { inherit (pkgs) libarchive; };
- libarchive = self.python-libarchive; # The latter is the name upstream uses
-
libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; };
libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns pkgconfig; };
@@ -3492,8 +3490,6 @@ in {
mailchimp = callPackage ../development/python-modules/mailchimp { };
- maildir-deduplicate = callPackage ../development/python-modules/maildir-deduplicate { };
-
mailman = callPackage ../servers/mail/mailman { };
mailmanclient = callPackage ../development/python-modules/mailmanclient { };
@@ -4405,8 +4401,6 @@ in {
pint = callPackage ../development/python-modules/pint { };
- pip2nix = callPackage ../development/python-modules/pip2nix { };
-
pip = callPackage ../development/python-modules/pip { };
pipdate = callPackage ../development/python-modules/pipdate { };
@@ -5366,6 +5360,8 @@ in {
pysqlite = callPackage ../development/python-modules/pysqlite { };
+ pysqueezebox = callPackage ../development/python-modules/pysqueezebox { };
+
pysrim = callPackage ../development/python-modules/pysrim { };
pysrt = callPackage ../development/python-modules/pysrt { };
@@ -5652,8 +5648,6 @@ in {
python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { };
- python-libarchive = callPackage ../development/python-modules/python-libarchive { };
-
python-logstash = callPackage ../development/python-modules/python-logstash { };
python-ly = callPackage ../development/python-modules/python-ly { };
@@ -5932,8 +5926,6 @@ in {
queuelib = callPackage ../development/python-modules/queuelib { };
- qutip = callPackage ../development/python-modules/qutip { };
-
r2pipe = callPackage ../development/python-modules/r2pipe { };
rabbitpy = callPackage ../development/python-modules/rabbitpy { };
@@ -7555,6 +7547,8 @@ in {
ydiff = callPackage ../development/python-modules/ydiff { };
+ yeelight = callPackage ../development/python-modules/yeelight { };
+
yenc = callPackage ../development/python-modules/yenc { };
yfinance = callPackage ../development/python-modules/yfinance { };
@@ -7667,8 +7661,6 @@ in {
zope-hookable = callPackage ../development/python-modules/zope-hookable { };
- zope_i18n = callPackage ../development/python-modules/zope_i18n { };
-
zope_i18nmessageid = callPackage ../development/python-modules/zope_i18nmessageid { };
zope_interface = callPackage ../development/python-modules/zope_interface { };