Merge branch 'staging-next' into staging
This commit is contained in:
Jan Tojnar
commit
9a64ee2b45
|
|
@ -72,3 +72,7 @@ This is used with Savannah repositories. The arguments expected are very similar
|
|||
## `fetchFromRepoOrCz`
|
||||
|
||||
This is used with repo.or.cz repositories. The arguments expected are very similar to fetchFromGitHub above.
|
||||
|
||||
## `fetchFromSourcehut`
|
||||
|
||||
This is used with sourcehut repositories. The arguments expected are very similar to fetchFromGitHub above. Don't forget the tilde (~) in front of the user name!
|
||||
|
|
|
|||
|
|
@ -448,6 +448,17 @@ import ./make-test-python.nix {
|
|||
<replaceable>Python code…</replaceable>
|
||||
'';
|
||||
}
|
||||
</programlisting>
|
||||
This will produce a Nix warning at evaluation time. To fully disable the
|
||||
linter, wrap the test script in comment directives to disable the Black linter
|
||||
directly (again, don't commit this within the Nixpkgs repository):
|
||||
<programlisting>
|
||||
testScript =
|
||||
''
|
||||
# fmt: off
|
||||
<replaceable>Python code…</replaceable>
|
||||
# fmt: on
|
||||
'';
|
||||
</programlisting>
|
||||
</para>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://www.gnuradio.org/">GNURadio</link> 3.8 was
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/82263">finnally</link>
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/82263">finally</link>
|
||||
packaged, along with a rewrite to the Nix expressions, allowing users to
|
||||
override the features upstream supports selecting to compile or not to.
|
||||
Additionally, the attribute <code>gnuradio</code> and <code>gnuradio3_7</code>
|
||||
|
|
@ -567,6 +567,21 @@ self: super:
|
|||
The <literal>kindlegen</literal> package is gone, because it is no longer supported or hosted by Amazon. Sadly, its replacement, Kindle Previewer, has no Linux support. However, there are other ways to generate MOBI files. See <link xlink:href="https://github.com/NixOS/nixpkgs/issues/96439">the discussion</link> for more info.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <package>apacheKafka</package> packages are now built with
|
||||
version-matched JREs. Versions 2.6 and above, the ones that recommend it,
|
||||
use jdk11, while versions below remain on jdk8. The NixOS service has
|
||||
been adjusted to start the service using the same version as the package,
|
||||
adjustable with the new
|
||||
<link linkend="opt-services.apache-kafka.jre">services.apache-kafka.jre</link>
|
||||
option. Furthermore, the default list of
|
||||
<link linkend="opt-services.apache-kafka.jvmOptions">services.apache-kafka.jvmOptions</link>
|
||||
have been removed. You should set your own according to the
|
||||
<link xlink:href="https://kafka.apache.org/documentation/#java">upstream documentation</link>
|
||||
for your Kafka version.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
|
||||
|
|
|
|||
|
|
@ -90,19 +90,7 @@ in {
|
|||
|
||||
jvmOptions = mkOption {
|
||||
description = "Extra command line options for the JVM running Kafka.";
|
||||
default = [
|
||||
"-server"
|
||||
"-Xmx1G"
|
||||
"-Xms1G"
|
||||
"-XX:+UseCompressedOops"
|
||||
"-XX:+UseParNewGC"
|
||||
"-XX:+UseConcMarkSweepGC"
|
||||
"-XX:+CMSClassUnloadingEnabled"
|
||||
"-XX:+CMSScavengeBeforeRemark"
|
||||
"-XX:+DisableExplicitGC"
|
||||
"-Djava.awt.headless=true"
|
||||
"-Djava.net.preferIPv4Stack=true"
|
||||
];
|
||||
default = [];
|
||||
type = types.listOf types.str;
|
||||
example = [
|
||||
"-Djava.net.preferIPv4Stack=true"
|
||||
|
|
@ -118,6 +106,13 @@ in {
|
|||
type = types.package;
|
||||
};
|
||||
|
||||
jre = mkOption {
|
||||
description = "The JRE with which to run Kafka";
|
||||
default = cfg.package.passthru.jre;
|
||||
defaultText = "pkgs.apacheKafka.passthru.jre";
|
||||
type = types.package;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
|
@ -138,7 +133,7 @@ in {
|
|||
after = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = ''
|
||||
${pkgs.jre}/bin/java \
|
||||
${cfg.jre}/bin/java \
|
||||
-cp "${cfg.package}/libs/*" \
|
||||
-Dlog4j.configuration=file:${logConfig} \
|
||||
${toString cfg.jvmOptions} \
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
let
|
||||
inherit (lib) concatStrings foldl foldl' genAttrs literalExample maintainers
|
||||
mapAttrsToList mkDefault mkEnableOption mkIf mkMerge mkOption
|
||||
optional types;
|
||||
optional types mkOptionDefault flip attrNames;
|
||||
|
||||
cfg = config.services.prometheus.exporters;
|
||||
|
||||
|
|
@ -22,6 +22,7 @@ let
|
|||
|
||||
exporterOpts = genAttrs [
|
||||
"apcupsd"
|
||||
"artifactory"
|
||||
"bind"
|
||||
"bird"
|
||||
"blackbox"
|
||||
|
|
@ -31,6 +32,7 @@ let
|
|||
"fritzbox"
|
||||
"json"
|
||||
"keylight"
|
||||
"knot"
|
||||
"lnd"
|
||||
"mail"
|
||||
"mikrotik"
|
||||
|
|
@ -51,6 +53,7 @@ let
|
|||
"smokeping"
|
||||
"sql"
|
||||
"surfboard"
|
||||
"systemd"
|
||||
"tor"
|
||||
"unifi"
|
||||
"unifi-poller"
|
||||
|
|
@ -64,7 +67,7 @@ let
|
|||
mkExporterOpts = ({ name, port }: {
|
||||
enable = mkEnableOption "the prometheus ${name} exporter";
|
||||
port = mkOption {
|
||||
type = types.int;
|
||||
type = types.port;
|
||||
default = port;
|
||||
description = ''
|
||||
Port to listen on.
|
||||
|
|
@ -92,9 +95,8 @@ let
|
|||
'';
|
||||
};
|
||||
firewallFilter = mkOption {
|
||||
type = types.str;
|
||||
default = "-p tcp -m tcp --dport ${toString cfg.${name}.port}";
|
||||
defaultText = "-p tcp -m tcp --dport ${toString port}";
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = literalExample ''
|
||||
"-i eth0 -p tcp -m tcp --dport ${toString port}"
|
||||
'';
|
||||
|
|
@ -122,12 +124,14 @@ let
|
|||
|
||||
mkSubModule = { name, port, extraOpts, imports }: {
|
||||
${name} = mkOption {
|
||||
type = types.submodule {
|
||||
type = types.submodule [{
|
||||
inherit imports;
|
||||
options = (mkExporterOpts {
|
||||
inherit name port;
|
||||
} // extraOpts);
|
||||
};
|
||||
} ({ config, ... }: mkIf config.openFirewall {
|
||||
firewallFilter = mkOptionDefault "-p tcp -m tcp --dport ${toString config.port}";
|
||||
})];
|
||||
internal = true;
|
||||
default = {};
|
||||
};
|
||||
|
|
@ -232,7 +236,13 @@ in
|
|||
Please specify either 'services.prometheus.exporters.sql.configuration' or
|
||||
'services.prometheus.exporters.sql.configFile'
|
||||
'';
|
||||
} ];
|
||||
} ] ++ (flip map (attrNames cfg) (exporter: {
|
||||
assertion = cfg.${exporter}.firewallFilter != null -> cfg.${exporter}.openFirewall;
|
||||
message = ''
|
||||
The `firewallFilter'-option of exporter ${exporter} doesn't have any effect unless
|
||||
`openFirewall' is set to `true'!
|
||||
'';
|
||||
}));
|
||||
}] ++ [(mkIf config.services.minio.enable {
|
||||
services.prometheus.exporters.minio.minioAddress = mkDefault "http://localhost:9000";
|
||||
services.prometheus.exporters.minio.minioAccessKey = mkDefault config.services.minio.accessKey;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,59 @@
|
|||
{ config, lib, pkgs, options }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.artifactory;
|
||||
in
|
||||
{
|
||||
port = 9531;
|
||||
extraOpts = {
|
||||
scrapeUri = mkOption {
|
||||
type = types.str;
|
||||
default = "http://localhost:8081/artifactory";
|
||||
description = ''
|
||||
URI on which to scrape JFrog Artifactory.
|
||||
'';
|
||||
};
|
||||
|
||||
artiUsername = mkOption {
|
||||
type = types.str;
|
||||
description = ''
|
||||
Username for authentication against JFrog Artifactory API.
|
||||
'';
|
||||
};
|
||||
|
||||
artiPassword = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = ''
|
||||
Password for authentication against JFrog Artifactory API.
|
||||
One of the password or access token needs to be set.
|
||||
'';
|
||||
};
|
||||
|
||||
artiAccessToken = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = ''
|
||||
Access token for authentication against JFrog Artifactory API.
|
||||
One of the password or access token needs to be set.
|
||||
'';
|
||||
};
|
||||
};
|
||||
serviceOpts = {
|
||||
serviceConfig = {
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-artifactory-exporter}/bin/artifactory_exporter \
|
||||
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
|
||||
--artifactory.scrape-uri ${cfg.scrapeUri} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
Environment = [
|
||||
"ARTI_USERNAME=${cfg.artiUsername}"
|
||||
"ARTI_PASSWORD=${cfg.artiPassword}"
|
||||
"ARTI_ACCESS_TOKEN=${cfg.artiAccessToken}"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
{ config, lib, pkgs, options }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.knot;
|
||||
in {
|
||||
port = 9433;
|
||||
extraOpts = {
|
||||
knotLibraryPath = mkOption {
|
||||
type = types.str;
|
||||
default = "${pkgs.knot-dns.out}/lib/libknot.so";
|
||||
defaultText = "\${pkgs.knot-dns}/lib/libknot.so";
|
||||
description = ''
|
||||
Path to the library of <package>knot-dns</package>.
|
||||
'';
|
||||
};
|
||||
|
||||
knotSocketPath = mkOption {
|
||||
type = types.str;
|
||||
default = "/run/knot/knot.sock";
|
||||
description = ''
|
||||
Socket path of <citerefentry><refentrytitle>knotd</refentrytitle>
|
||||
<manvolnum>8</manvolnum></citerefentry>.
|
||||
'';
|
||||
};
|
||||
|
||||
knotSocketTimeout = mkOption {
|
||||
type = types.int;
|
||||
default = 2000;
|
||||
description = ''
|
||||
Timeout in seconds.
|
||||
'';
|
||||
};
|
||||
};
|
||||
serviceOpts = {
|
||||
serviceConfig = {
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-knot-exporter}/bin/knot_exporter \
|
||||
--web-listen-addr ${cfg.listenAddress} \
|
||||
--web-listen-port ${toString cfg.port} \
|
||||
--knot-library-path ${cfg.knotLibraryPath} \
|
||||
--knot-socket-path ${cfg.knotSocketPath} \
|
||||
--knot-socket-timeout ${toString cfg.knotSocketTimeout} \
|
||||
${concatStringsSep " \\\n " cfg.extraFlags}
|
||||
'';
|
||||
SupplementaryGroups = [ "knot" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let cfg = config.services.prometheus.exporters.systemd;
|
||||
|
||||
in {
|
||||
port = 9558;
|
||||
|
||||
serviceOpts = {
|
||||
serviceConfig = {
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-systemd-exporter}/bin/systemd_exporter \
|
||||
--web.listen-address ${cfg.listenAddress}:${toString cfg.port}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -205,9 +205,8 @@ in
|
|||
|
||||
users.groups.privoxy = {};
|
||||
|
||||
systemd.tmpfiles.rules = with cfg.settings; [
|
||||
"d ${certificate-directory} 0770 privoxy privoxy ${cfg.certsLifetime}"
|
||||
];
|
||||
systemd.tmpfiles.rules = optional cfg.inspectHttps
|
||||
"d ${cfg.settings.certificate-directory} 0770 privoxy privoxy ${cfg.certsLifetime}";
|
||||
|
||||
systemd.services.privoxy = {
|
||||
description = "Filtering web proxy";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ let
|
|||
extensions = { enabled, all }:
|
||||
(with all;
|
||||
enabled
|
||||
++ [ imagick ] # Always enabled
|
||||
++ optional (!cfg.disableImagemagick) imagick
|
||||
# Optionally enabled depending on caching settings
|
||||
++ optional cfg.caching.apcu apcu
|
||||
++ optional cfg.caching.redis redis
|
||||
|
|
@ -303,6 +303,18 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
disableImagemagick = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to not load the ImageMagick module into PHP.
|
||||
This is used by the theming app and for generating previews of certain images (e.g. SVG and HEIF).
|
||||
You may want to disable it for increased security. In that case, previews will still be available
|
||||
for some images (e.g. JPEG and PNG).
|
||||
See https://github.com/nextcloud/server/issues/13099
|
||||
'';
|
||||
};
|
||||
|
||||
caching = {
|
||||
apcu = mkOption {
|
||||
type = types.bool;
|
||||
|
|
|
|||
|
|
@ -254,5 +254,21 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
"docker run --rm ${examples.layeredStoreSymlink.imageName} bash -c 'test -L ${examples.layeredStoreSymlink.passthru.symlink}'",
|
||||
"docker rmi ${examples.layeredStoreSymlink.imageName}",
|
||||
)
|
||||
|
||||
with subtest("buildImage supports registry/ prefix in image name"):
|
||||
docker.succeed(
|
||||
"docker load --input='${examples.prefixedImage}'"
|
||||
)
|
||||
docker.succeed(
|
||||
"docker images --format '{{.Repository}}' | grep -F '${examples.prefixedImage.imageName}'"
|
||||
)
|
||||
|
||||
with subtest("buildLayeredImage supports registry/ prefix in image name"):
|
||||
docker.succeed(
|
||||
"docker load --input='${examples.prefixedLayeredImage}'"
|
||||
)
|
||||
docker.succeed(
|
||||
"docker images --format '{{.Repository}}' | grep -F '${examples.prefixedLayeredImage.imageName}'"
|
||||
)
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -30,11 +30,6 @@ let
|
|||
'';
|
||||
package = kafkaPackage;
|
||||
zookeeper = "zookeeper1:2181";
|
||||
# These are the default options, but UseCompressedOops doesn't work with 32bit JVM
|
||||
jvmOptions = [
|
||||
"-server" "-Xmx1G" "-Xms1G" "-XX:+UseParNewGC" "-XX:+UseConcMarkSweepGC" "-XX:+CMSClassUnloadingEnabled"
|
||||
"-XX:+CMSScavengeBeforeRemark" "-XX:+DisableExplicitGC" "-Djava.awt.headless=true" "-Djava.net.preferIPv4Stack=true"
|
||||
] ++ optionals (! pkgs.stdenv.isi686 ) [ "-XX:+UseCompressedOops" ];
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 9092 ];
|
||||
|
|
@ -82,4 +77,5 @@ let
|
|||
in with pkgs; {
|
||||
kafka_2_4 = makeKafkaTest "kafka_2_4" apacheKafka_2_4;
|
||||
kafka_2_5 = makeKafkaTest "kafka_2_5" apacheKafka_2_5;
|
||||
kafka_2_6 = makeKafkaTest "kafka_2_6" apacheKafka_2_6;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ in {
|
|||
maintainers = [ globin eqyiel ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
nodes = rec {
|
||||
# The only thing the client needs to do is download a file.
|
||||
client = { ... }: {
|
||||
services.davfs2.enable = true;
|
||||
|
|
@ -47,9 +47,14 @@ in {
|
|||
|
||||
environment.systemPackages = [ cfg.services.nextcloud.occ ];
|
||||
};
|
||||
|
||||
nextcloudWithoutMagick = args@{ config, pkgs, lib, ... }:
|
||||
lib.mkMerge
|
||||
[ (nextcloud args)
|
||||
{ services.nextcloud.disableImagemagick = true; } ];
|
||||
};
|
||||
|
||||
testScript = let
|
||||
testScript = { nodes, ... }: let
|
||||
withRcloneEnv = pkgs.writeScript "with-rclone-env" ''
|
||||
#!${pkgs.runtimeShell}
|
||||
export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav
|
||||
|
|
@ -68,8 +73,19 @@ in {
|
|||
#!${pkgs.runtimeShell}
|
||||
diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file)
|
||||
'';
|
||||
|
||||
findInClosure = what: drv: pkgs.runCommand "find-in-closure" { exportReferencesGraph = [ "graph" drv ]; inherit what; } ''
|
||||
test -e graph
|
||||
grep "$what" graph >$out || true
|
||||
'';
|
||||
nextcloudUsesImagick = findInClosure "imagick" nodes.nextcloud.config.system.build.vm;
|
||||
nextcloudWithoutDoesntUseIt = findInClosure "imagick" nodes.nextcloudWithoutMagick.config.system.build.vm;
|
||||
in ''
|
||||
start_all()
|
||||
assert open("${nextcloudUsesImagick}").read() != ""
|
||||
assert open("${nextcloudWithoutDoesntUseIt}").read() == ""
|
||||
|
||||
nextcloud.start()
|
||||
client.start()
|
||||
nextcloud.wait_for_unit("multi-user.target")
|
||||
# This is just to ensure the nextcloud-occ program is working
|
||||
nextcloud.succeed("nextcloud-occ status")
|
||||
|
|
|
|||
|
|
@ -75,6 +75,21 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
artifactory = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
artiUsername = "artifactory-username";
|
||||
artiPassword = "artifactory-password";
|
||||
};
|
||||
exporterTest = ''
|
||||
wait_for_unit("prometheus-artifactory-exporter.service")
|
||||
wait_for_open_port(9531)
|
||||
succeed(
|
||||
"curl -sSf http://localhost:9531/metrics | grep -q 'artifactory_up'"
|
||||
)
|
||||
'';
|
||||
};
|
||||
|
||||
bind = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
|
|
@ -248,6 +263,24 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
knot = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
};
|
||||
metricProvider = {
|
||||
services.knot = {
|
||||
enable = true;
|
||||
extraArgs = [ "-v" ];
|
||||
};
|
||||
};
|
||||
exporterTest = ''
|
||||
wait_for_unit("knot.service")
|
||||
wait_for_unit("prometheus-knot-exporter.service")
|
||||
wait_for_open_port(9433)
|
||||
succeed("curl -sSf 'localhost:9433' | grep -q 'knot_server_zone_count 0.0'")
|
||||
'';
|
||||
};
|
||||
|
||||
keylight = {
|
||||
# A hardware device is required to properly test this exporter, so just
|
||||
# perform a couple of basic sanity checks that the exporter is running
|
||||
|
|
@ -802,6 +835,22 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
systemd = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
};
|
||||
metricProvider = { };
|
||||
exporterTest = ''
|
||||
wait_for_unit("prometheus-systemd-exporter.service")
|
||||
wait_for_open_port(9558)
|
||||
succeed(
|
||||
"curl -sSf localhost:9558/metrics | grep -q '{}'".format(
|
||||
'systemd_unit_state{name="basic.target",state="active",type="target"} 1'
|
||||
)
|
||||
)
|
||||
'';
|
||||
};
|
||||
|
||||
tor = {
|
||||
exporterConfig = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,82 @@
|
|||
{ lib, stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype
|
||||
, fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr
|
||||
, nss, pango, udev, xorg
|
||||
}:
|
||||
|
||||
let
|
||||
version = "4.7.1";
|
||||
|
||||
deps = [
|
||||
alsaLib
|
||||
atk
|
||||
at-spi2-atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
expat
|
||||
fontconfig
|
||||
freetype
|
||||
GConf
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk2
|
||||
gtk3
|
||||
libpulseaudio
|
||||
nspr
|
||||
nss
|
||||
pango
|
||||
stdenv.cc.cc
|
||||
udev
|
||||
xorg.libX11
|
||||
xorg.libxcb
|
||||
xorg.libXcomposite
|
||||
xorg.libXcursor
|
||||
xorg.libXdamage
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXi
|
||||
xorg.libXrandr
|
||||
xorg.libXrender
|
||||
xorg.libXScrnSaver
|
||||
xorg.libXtst
|
||||
];
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "google-play-music-desktop-player";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
|
||||
sha256 = "1ljm9c5sv6wa7pa483yq03wq9j1h1jdh8363z5m2imz407yzgm5r";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg -x $src .
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r ./usr/share $out
|
||||
cp -r ./usr/bin $out
|
||||
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
"$out/share/google-play-music-desktop-player/Google Play Music Desktop Player"
|
||||
|
||||
wrapProgram $out/bin/google-play-music-desktop-player \
|
||||
--prefix LD_LIBRARY_PATH : "$out/share/google-play-music-desktop-player" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath deps}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.googleplaymusicdesktopplayer.com/";
|
||||
description = "A beautiful cross platform Desktop Player for Google Play Music and YouTube Music";
|
||||
license = lib.licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with lib.maintainers; [ anna328p SuprDewd ];
|
||||
};
|
||||
}
|
||||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://musescore.org/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.darwin;
|
||||
maintainers = with maintainers; [ yurrriq ];
|
||||
maintainers = [];
|
||||
repositories.git = "https://github.com/musescore/MuseScore";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
Bump security-framework from 2.1.1 to 2.1.2
|
||||
|
||||
security-framework=2.1.1 doesn't build on Darwin 10.12.
|
||||
https://github.com/kornelski/rust-security-framework/issues/124
|
||||
|
||||
--- c/Cargo.lock
|
||||
+++ i/Cargo.lock
|
||||
@@ -3138,9 +3138,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
||||
|
||||
[[package]]
|
||||
name = "security-framework"
|
||||
-version = "2.1.1"
|
||||
+version = "2.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "2dfd318104249865096c8da1dfabf09ddbb6d0330ea176812a62ec75e40c4166"
|
||||
+checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d"
|
||||
dependencies = [
|
||||
"bitflags 1.2.1",
|
||||
"core-foundation",
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl
|
||||
{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl, libiconv
|
||||
, withALSA ? true, alsaLib ? null
|
||||
, withPulseAudio ? false, libpulseaudio ? null
|
||||
, withPortAudio ? false, portaudio ? null
|
||||
|
|
@ -14,22 +14,25 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ncspot";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrkfdn";
|
||||
repo = "ncspot";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4V0LG9mDvezeLHHTAmfAXdssOAOlZs30b8IejKEKN4g=";
|
||||
sha256 = "1h1il2mzngxmcsl169431lwzl0skv420arg9i06856r5wil37jf7";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-POvIkoxLAXVBTsB37aAEUKhk6DRF9IfvfTcrP5PLFEQ=";
|
||||
cargoSha256 = "13yn7l4hhl48lbpj0zsbraqzkkz6knc373j6rcf8d1p4z76yili4";
|
||||
|
||||
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
cargoPatches = [ ./bump-security-framework-crate.patch ];
|
||||
|
||||
buildInputs = [ ncurses openssl ]
|
||||
++ lib.optional stdenv.isDarwin libiconv
|
||||
++ lib.optional withALSA alsaLib
|
||||
++ lib.optional withPulseAudio libpulseaudio
|
||||
++ lib.optional withPortAudio portaudio
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
let
|
||||
pname = "plexamp";
|
||||
version = "3.4.1";
|
||||
version = "3.4.3";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
|
||||
name="${pname}-${version}.AppImage";
|
||||
sha256 = "Vv+e1q5ThuXDPX8baSU+7/U63p6/dvh0ZvScO1Loj+U=";
|
||||
sha256 = "1rzhrc5yr5f6bxydgmcjwrg85vkbkn6lqj72512lyhq5gg7zmm1w";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
@ -32,8 +32,9 @@ in appimageTools.wrapType2 {
|
|||
meta = with lib; {
|
||||
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
|
||||
homepage = "https://plexamp.com/";
|
||||
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/25";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ killercup ];
|
||||
maintainers = with maintainers; [ killercup synthetica ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reaper";
|
||||
version = "6.23";
|
||||
version = "6.25";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
|
||||
sha256 = "1s9c8prqk38738hjaixiy8ljp94cqw7jq3160890477jyk6cvicd";
|
||||
sha256 = "0i1idlr4ar28wvwcvwn9hqzb63kki1x1995cr87a9slxfa7zcshb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ergo";
|
||||
version = "4.0.7";
|
||||
version = "4.0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
|
||||
sha256 = "sha256-CDNH7vYLG7Gn22yl+cXtGAD+c8tbNU52FmdxneTM2u4=";
|
||||
sha256 = "sha256-swU4CnX2BxL3ILH/sXux8ZHMo5nAPLQOIiWmr4C8BOQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ let
|
|||
|
||||
in buildGoModule rec {
|
||||
pname = "go-ethereum";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pEzaEpqr+Ird8d5zmoXMyAoS0aEGBYFmpgdPcH4OsMI=";
|
||||
sha256 = "sha256-4lHT0P8Euau0AJNtg1YstJJRQ58WTUlIH+HCKEjCq/s=";
|
||||
};
|
||||
|
||||
runVend = true;
|
||||
|
|
|
|||
|
|
@ -1,27 +1,19 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config
|
||||
{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config
|
||||
, qtscript, poppler, hunspell
|
||||
, withLua ? true, lua
|
||||
, withPython ? true, python3 }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "texworks";
|
||||
version = "0.6.5";
|
||||
version = "0.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TeXworks";
|
||||
repo = "texworks";
|
||||
rev = "release-${version}";
|
||||
sha256 = "1lw1p4iyzxypvjhnav11g6rwf6gx7kyzwy2iprvv8zzpqcdkjp2z";
|
||||
sha256 = "0l8jl1b8lpas7yz6m0qc2nikyn54lx2ljzmjjz3zgxgd6l502006";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-compilation-with-qt-5.15.patch";
|
||||
url = "https://github.com/TeXworks/texworks/commit/a5352a3a94e3685125650b65e6197de060326cc2.patch";
|
||||
sha256 = "0pf7h1m11x0s039bxknm7rxdp9b4g8ch86y38jlyy56c74mw97i6";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ qtscript poppler hunspell ]
|
||||
++ lib.optional withLua lua
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@ let
|
|||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0c0m5qkqv3zhcxmwx72b7z67sjcd1miv8d10kxpk9vffyrxkmj93";
|
||||
x86_64-darwin = "1spd5rbhra4n38lp0sgxd2cr1bngsmi32a43g02vdmmhkmk0iixc";
|
||||
aarch64-linux = "1ql3hn6c59g7d0cwhg54ixww2i9jmkjw3nyzz97yw8wk63zwz024";
|
||||
armv7l-linux = "0pdqcbw7rygvdzys787kf8ag17g9qyv7k33dqhi5h2zc96j867c0";
|
||||
x86_64-linux = "1px6x99cv8nb8lcy3vgcicr4ar0bfj5rfnc5a1yw8rs5p1qnflgw";
|
||||
x86_64-darwin = "0grzivqb2fyvwh0fjh9vr205fjcsrd1iqhkwk3mgv792zfrb7ksf";
|
||||
aarch64-linux = "0p0msxgc13kqmpq7wk61igc1qbgmgg9463s44dp4ii3630iyr4lw";
|
||||
armv7l-linux = "147lki1wr5nzsg1mq12jmdjq9qr6vbdpmzbpr5nrvq23cak94ff8";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
|
|
@ -25,7 +25,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.53.2";
|
||||
version = "1.54.2";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
|
|
|||
|
|
@ -7,10 +7,11 @@
|
|||
, wrapGAppsHook
|
||||
, gtk3
|
||||
, gnome3
|
||||
, zbar
|
||||
, tiffSupport ? true
|
||||
, libraw
|
||||
, jpgSupport ? true
|
||||
, imagemagick
|
||||
, graphicsmagick
|
||||
, exiftool
|
||||
}:
|
||||
|
||||
|
|
@ -20,24 +21,24 @@ let
|
|||
inherit (lib) makeBinPath optional optionals optionalString;
|
||||
runtimePath = makeBinPath (
|
||||
optional tiffSupport libraw
|
||||
++ optionals jpgSupport [ imagemagick exiftool ]
|
||||
++ optionals jpgSupport [ graphicsmagick exiftool ]
|
||||
);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "megapixels";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.sr.ht/~martijnbraam/megapixels";
|
||||
rev = version;
|
||||
sha256 = "136rv9sx0kgfkpqn5s90j7j4qhb8h04p14g5qhqshb89kmmsmxiw";
|
||||
sha256 = "1y8irwi8lbjs948j90gpic96dx5wjmwacd41hb3d9vzhkyni2dvb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ];
|
||||
|
||||
buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]
|
||||
buildInputs = [ gtk3 gnome3.adwaita-icon-theme zbar ]
|
||||
++ optional tiffSupport libraw
|
||||
++ optional jpgSupport imagemagick;
|
||||
++ optional jpgSupport graphicsmagick;
|
||||
|
||||
preFixup = optionalString (tiffSupport || jpgSupport) ''
|
||||
gappsWrapperArgs+=(
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
version = "0.9.26";
|
||||
version = "8.0.27";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
|
||||
hash = "sha256-LvHvWUS2iEm9m+v+kk7wf+P9xZkOyuoLk4xM4+P2vF8=";
|
||||
hash = "sha256-qzZXs7ak4052Igq+YWuzgDqJ7143q5qw5P3b3eN3NkU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "almanah";
|
||||
version = "0.12.2";
|
||||
version = "0.12.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "IWYOnOu0C9uQ9k1dgWkJ6Kv+o/jY+6Llfsi4PusHE24=";
|
||||
sha256 = "lMpDQOxlGljP66APR49aPbTZnfrGakbQ2ZcFvmiPMFo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "cointop";
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miguelmota";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4Ae8lzaec7JeYfmeLleatUS/xQUjea7O4XJ9DOgJIMs=";
|
||||
sha256 = "sha256-h4102oWYSuY4uq/Pyo9u25Pdsai7AK2W9yUmS/zdjrw=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/miguelmota/cointop";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dasel";
|
||||
version = "1.13.2";
|
||||
version = "1.13.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TomWright";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-++8vTK0OR44Mcdh5g2bJEq7aO+fWySKw0XlSz2KJNio=";
|
||||
sha256 = "sha256-4/67GwNIRcbC6qYe5s8DD16b2uVcG0DI1ScQk31Ffk0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY=";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, pkg-config, which, perl, libXrandr
|
||||
, cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver
|
||||
, gtk3, wayland, wayland-protocols
|
||||
, libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false
|
||||
, libXinerama, libnotify, pango, xorgproto, librsvg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "dunst-project";
|
||||
repo = "dunst";
|
||||
rev = "v${version}";
|
||||
sha256 = "0irwkqcgwkqaylcpvqgh25gn2ysbdm2kydipxfzcq1ddj9ns6f9c";
|
||||
sha256 = "0lga1kj2vjbj9g9rl93nivngjmk5fkxdxwal8w96x9whwk9jvdga";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ];
|
||||
|
|
@ -29,15 +29,12 @@ stdenv.mkDerivation rec {
|
|||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
"VERSION=$(version)"
|
||||
"SYSCONFDIR=$(out)/etc"
|
||||
"SERVICEDIR_DBUS=$(out)/share/dbus-1/services"
|
||||
"SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
|
||||
];
|
||||
|
||||
buildFlags = if dunstify then [ "dunstify" ] else [];
|
||||
|
||||
postInstall = lib.optionalString dunstify ''
|
||||
install -Dm755 dunstify $out/bin
|
||||
'' + ''
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/dunst \
|
||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "free42";
|
||||
version = "3.0";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thomasokken";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "jzNopLndYH9dIdm30pyDaZNksHwS4i5LTZUXRmcrTp8=";
|
||||
sha256 = "sha256-Htk2NHgYVL622URx67BUtounAUopLTahaSqfAqd3+ZI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,20 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub, qmake, pkg-config, fetchpatch
|
||||
, boost, gdal, proj, qtbase, qtsvg, qtwebview, qtwebkit }:
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, qmake
|
||||
, qttools
|
||||
, qttranslations
|
||||
, gdal
|
||||
, proj
|
||||
, qtsvg
|
||||
, qtwebkit
|
||||
, withGeoimage ? true, exiv2
|
||||
, withGpsdlib ? (!stdenv.isDarwin), gpsd
|
||||
, withLibproxy ? false, libproxy
|
||||
, withZbar ? false, zbar
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "merkaartor";
|
||||
|
|
@ -13,24 +28,48 @@ mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with Qt 5.15 (missing QPainterPath include)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/openstreetmap/merkaartor/commit/e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c.patch";
|
||||
sha256 = "NAisplnS3xHSlRpX+fH15NpbaD+uM57OCsTYGKlIR7U=";
|
||||
})
|
||||
# Added a condition to use the new timespec_t on gpsd APIs >= 9
|
||||
(fetchpatch {
|
||||
url = "https://github.com/openstreetmap/merkaartor/commit/13b358fa7899bb34e277b32a4c0d92833050f2c6.patch";
|
||||
sha256 = "129fpjm7illz7ngx3shps5ivrxwf14apw55842xhskwwb0rf5szb";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config ];
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
|
||||
buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ];
|
||||
buildInputs = [ gdal proj qtsvg qtwebkit ]
|
||||
++ lib.optional withGeoimage exiv2
|
||||
++ lib.optional withGpsdlib gpsd
|
||||
++ lib.optional withLibproxy libproxy
|
||||
++ lib.optional withZbar zbar;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
preConfigure = ''
|
||||
lrelease src/src.pro
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
|
||||
qmakeFlags = [ "TRANSDIR_SYSTEM=${qttranslations}/translations" ]
|
||||
++ lib.optional withGeoimage "GEOIMAGE=1"
|
||||
++ lib.optional withGpsdlib "GPSDLIB=1"
|
||||
++ lib.optional withLibproxy "LIBPROXY=1"
|
||||
++ lib.optional withZbar "ZBAR=1";
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mv binaries/bin/merkaartor.app $out/Applications
|
||||
mv binaries/bin/plugins $out/Applications/merkaartor.app/Contents
|
||||
wrapQtApp $out/Applications/merkaartor.app/Contents/MacOS/merkaartor
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "OpenStreetMap editor";
|
||||
homepage = "http://merkaartor.be/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }:
|
||||
let
|
||||
pname = "sidequest";
|
||||
version = "0.10.11";
|
||||
version = "0.10.19";
|
||||
|
||||
desktopItem = makeDesktopItem rec {
|
||||
name = "SideQuest";
|
||||
|
|
@ -15,8 +15,8 @@
|
|||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
|
||||
sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9";
|
||||
url = "https://github.com/SideQuestVR/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
|
||||
sha256 = "14zqp12nigc4kv6hppyx2s59mmriimnzczay4xi3vh7zcw207px2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -46,8 +46,8 @@
|
|||
|
||||
meta = with lib; {
|
||||
description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300";
|
||||
homepage = "https://github.com/the-expanse/SideQuest";
|
||||
downloadPage = "https://github.com/the-expanse/SideQuest/releases";
|
||||
homepage = "https://github.com/SideQuestVR/SideQuest";
|
||||
downloadPage = "https://github.com/SideQuestVR/SideQuest/releases";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ joepie91 rvolosatovs ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, libsecret }:
|
||||
{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_11, libsecret }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "todoist-electron";
|
||||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
makeWrapper ${electron_11}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -90,11 +90,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.21.73";
|
||||
version = "1.21.74";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "12jkj9h1smipqlkidnd3r492yfnncl0b2dmjq22qp2vsrscc3jfg";
|
||||
sha256 = "2csyjwn5j5+cRmjq0+gHLWvIVjtaSaN9rVZ8ikI0gec=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
@ -160,7 +160,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://brave.com/";
|
||||
description = "Privacy-oriented browser for Desktop and Laptop computers";
|
||||
changelog = "https://github.com/brave/brave-browser/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md";
|
||||
longDescription = ''
|
||||
Brave browser blocks the ads and trackers that slow you down,
|
||||
chew up your bandwidth, and invade your privacy. Brave lets you
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, fetchFromSourcehut
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
|
|
@ -15,9 +15,11 @@ rustPlatform.buildRustPackage rec {
|
|||
pname = "castor";
|
||||
version = "0.8.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.sr.ht/~julienxx/castor/archive/${version}.tar.gz";
|
||||
sha256 = "1qwsprwazkzcs70h219fhh5jj5s5hm1k120fn3pk4qivii4lyhah";
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~julienxx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0rwg1w7srjwa23mkypl8zk6674nhph4xsc6nc01f6g5k959szylr";
|
||||
};
|
||||
|
||||
cargoSha256 = "0yn2kfiaz6d8wc8rdqli2pwffp5vb1v3zi7520ysrd5b6fc2csf2";
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
, protobuf, speechd, libXdamage, cups
|
||||
, ffmpeg, libxslt, libxml2, at-spi2-core
|
||||
, jre8
|
||||
, pipewire_0_2
|
||||
, pipewire
|
||||
, libva
|
||||
, libdrm, wayland, mesa, libxkbcommon # Ozone
|
||||
|
||||
|
|
@ -140,7 +140,7 @@ let
|
|||
libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL
|
||||
pciutils protobuf speechd libXdamage at-spi2-core
|
||||
jre
|
||||
pipewire_0_2
|
||||
pipewire
|
||||
libva
|
||||
libdrm wayland mesa.drivers libxkbcommon
|
||||
] ++ optional gnomeKeyringSupport libgnome-keyring3
|
||||
|
|
@ -263,6 +263,7 @@ let
|
|||
use_pulseaudio = true;
|
||||
link_pulseaudio = true;
|
||||
} // optionalAttrs (chromiumVersionAtLeast "89") {
|
||||
rtc_pipewire_version = "0.3"; # TODO: Can be removed once ungoogled-chromium is at M90
|
||||
# Disable PGO (defaults to 2 since M89) because it fails without additional changes:
|
||||
# error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version
|
||||
chrome_pgo_phase = 0;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, llvmPackages_11, ed, gnugrep, coreutils, xdg-utils
|
||||
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
|
||||
, libva ? null
|
||||
, pipewire_0_2
|
||||
, pipewire
|
||||
, gcc, nspr, nss, runCommand
|
||||
, lib
|
||||
|
||||
|
|
@ -161,7 +161,7 @@ in stdenv.mkDerivation {
|
|||
|
||||
buildCommand = let
|
||||
browserBinary = "${chromiumWV}/libexec/chromium/chromium";
|
||||
libPath = lib.makeLibraryPath [ libva pipewire_0_2 ];
|
||||
libPath = lib.makeLibraryPath [ libva pipewire ];
|
||||
|
||||
in with lib; ''
|
||||
mkdir -p "$out/bin"
|
||||
|
|
|
|||
|
|
@ -18,15 +18,15 @@
|
|||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "89.0.4389.72",
|
||||
"sha256": "0kxwq1m6zdsq3ns2agvk1hqkhwlv1693h41rlmvhy3nim9jhnsll",
|
||||
"sha256bin64": "0w1972r71gp8jjr9370f9xb8v2f109mxjrsm8893sn4kbz8zmxby",
|
||||
"version": "90.0.4430.19",
|
||||
"sha256": "174isyx4g62d8ggn9imp41dfklcbxi3y5nfprm4jbjmn5cb7v8xa",
|
||||
"sha256bin64": "0z665iykdsmjrjbijsrcq80y2anvcfykasznf8w4brg9l9k59wv8",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-01-07",
|
||||
"version": "2021-02-09",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140",
|
||||
"sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d"
|
||||
"rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3",
|
||||
"sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -44,19 +44,19 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "88.0.4324.182",
|
||||
"sha256": "10av060ix6lgsvv99lyvyy03r0m3zwdg4hddbi6dycrdxk1iyh9h",
|
||||
"sha256bin64": "1rjg23xiybpnis93yb5zkvglm3r4fds9ip5mgl6f682z5x0yj05b",
|
||||
"version": "89.0.4389.82",
|
||||
"sha256": "0yg33d6zldz3j1jghhdci63fn46i10dkz3nb95jdrbv8gd018jfz",
|
||||
"sha256bin64": "1sqzzillq38qyh85449ncz8bni93mjxb6r4z8y5h8k2w3j38jc0q",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2020-11-05",
|
||||
"version": "2021-01-07",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "53d92014bf94c3893886470a1c7c1289f8818db0",
|
||||
"sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
|
||||
"rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140",
|
||||
"sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "88.0.4324.182-1",
|
||||
"sha256": "1c9y1dn9s06pskkjw2r8lsbplak8m2rwh4drixvjpif7b4cgdhay"
|
||||
"rev": "89.0.4389.82-1",
|
||||
"sha256": "183w22q6mpmw7s1l65dzvc5i422vl7qax6q4xpgr3krcx4y00878"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@ in
|
|||
rec {
|
||||
firefox = common rec {
|
||||
pname = "firefox";
|
||||
ffversion = "86.0";
|
||||
ffversion = "86.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
|
||||
sha512 = "f5a7b9aa53e2955e972e30cc62ae64ae955127eab951d7a1102d5ac8a73804982e01b917787c00a6e0a0ed03594567d29a24808271283ef61a9383bc4bb39e3f";
|
||||
sha512 = "e613cdcadfd71a01800a72c08c590032605ca8a8a0ba93326ffba93c2819f629fd620c23d00ca1274b203adc20acfe5d7913fee240ff14819fb1377ed08b1214";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "helm-secrets";
|
||||
version = "3.4.1";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jkroepke";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EXCr0QjupsBBKTm6Opw5bcNwAD4FGGyOiqaa8L91/OI=";
|
||||
hash = "sha256-EXCr0QjupsBBKTm6Opw5bcNwAD4FGGyOiqaa8L91/OI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "helmfile";
|
||||
version = "0.138.6";
|
||||
version = "0.138.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roboll";
|
||||
repo = "helmfile";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-slqHG4uD0sbCNNr5Ve9eemyylUs4w1JizfoIMbrbVeg=";
|
||||
sha256 = "sha256-LFNsSd+S+mQiTk7bCnSD/Kp/D0Jefxo80eRsGkStBhs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-WlV6moJymQ7VyZXXuViCNN1WP4NzBUszavxpKjQR8to=";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.0-k3s2" }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.4-k3s1" }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kube3d";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
|
||||
excludedPackages = "tools";
|
||||
|
||||
|
|
@ -10,20 +10,17 @@ buildGoModule rec {
|
|||
owner = "rancher";
|
||||
repo = "k3d";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-R2RbQlceOD/uY3IdLLiM23gESh/oWnsiTWxHeH/Si18=";
|
||||
sha256 = "sha256-ybEYKr0rQY8Qg74V1mXqShq5Z2d/Adf0bSSbEMIyo3I=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildFlagsArray = [
|
||||
"-ldflags="
|
||||
"-w"
|
||||
"-s"
|
||||
"-X github.com/rancher/k3d/v4/version.Version=v${version}"
|
||||
"-X github.com/rancher/k3d/v4/version.K3sVersion=v${k3sVersion}"
|
||||
];
|
||||
preBuild = let t = "github.com/rancher/k3d/v4/version"; in
|
||||
''
|
||||
buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.K3sVersion=v${k3sVersion}")
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -36,6 +33,7 @@ buildGoModule rec {
|
|||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/rancher/k3d";
|
||||
changelog = "https://github.com/rancher/k3d/blob/v${version}/CHANGELOG.md";
|
||||
description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container - k3d";
|
||||
longDescription = ''
|
||||
k3s is the lightweight Kubernetes distribution by Rancher: rancher/k3s
|
||||
|
|
@ -44,7 +42,7 @@ buildGoModule rec {
|
|||
multi-node k3s cluster on a single machine using docker.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "minikube";
|
||||
version = "1.18.0";
|
||||
version = "1.18.1";
|
||||
|
||||
vendorSha256 = "0fy9x9zlmwpncyj55scvriv4vr4kjvqss85b0a1zs2srvlnf8gz2";
|
||||
vendorSha256 = "sha256-rw1tqz+Y5iSXWIxXV4433Hwgyfz8jYMzKWurCi2hmhM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ buildGoModule rec {
|
|||
owner = "kubernetes";
|
||||
repo = "minikube";
|
||||
rev = "v${version}";
|
||||
sha256 = "1yjcaq0lg5a7ip2qxjmnzq3pa1gjhdfdq9a4xk2zxyqcam4dh6v2";
|
||||
sha256 = "sha256-8QI/Kn5LHSD3at7icmEDhjuYP811A4l+2KrRmKTwi8w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, installShellFiles
|
||||
, buildkit
|
||||
, cni-plugins
|
||||
, extraPackages ? [ ]
|
||||
|
|
@ -9,23 +10,20 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nerdctl";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AkihiroSuda";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-z5Ekryaa5KMShrjdsmFk9bXahtuc+6tec7dxH5/w7+A=";
|
||||
sha256 = "sha256-tMzob+ljGBKkfbxwMqy+8bqVp51Eqyx4kXhsj/LRfzQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ovmVNtzTQbg141IvbaF/+k5WHxX8wuK7z5gH9l2g5UE=";
|
||||
vendorSha256 = "sha256-zUX/kneVz8uXmxly8yqmcttK3Wj4EmBaT8gmg3hDms4=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
preBuild =
|
||||
let
|
||||
t = "github.com/AkihiroSuda/nerdctl/pkg/version";
|
||||
in
|
||||
preBuild = let t = "github.com/AkihiroSuda/nerdctl/pkg/version"; in
|
||||
''
|
||||
buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.Revision=<unknown>")
|
||||
'';
|
||||
|
|
@ -37,17 +35,19 @@ buildGoModule rec {
|
|||
wrapProgram $out/bin/nerdctl \
|
||||
--prefix PATH : "${lib.makeBinPath ([ buildkit ] ++ extraPackages)}" \
|
||||
--prefix CNI_PATH : "${cni-plugins}/bin"
|
||||
|
||||
# nerdctl panics without XDG_RUNTIME_DIR set
|
||||
export XDG_RUNTIME_DIR=$TMPDIR
|
||||
|
||||
installShellCompletion --cmd nerdctl \
|
||||
--bash <($out/bin/nerdctl completion bash)
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
# nerdctl expects XDG_RUNTIME_DIR to be set
|
||||
export XDG_RUNTIME_DIR=$TMPDIR
|
||||
|
||||
$out/bin/nerdctl --help
|
||||
# --version will error without containerd.sock access
|
||||
$out/bin/nerdctl --help | grep "${version}"
|
||||
$out/bin/nerdctl --version | grep "nerdctl version ${version}"
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -2,23 +2,20 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tektoncd-cli";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tektoncd";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IY9iJa4HcZ60jDPdP47jjC0FiOJesvf2vEENMAYVd4Q=";
|
||||
sha256 = "sha256-IyYlmatgcVbUj1WCPAFVOIgn1iHM80P4ie6d1YD3ISM=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
buildFlagsArray = [
|
||||
"-ldflags="
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}"
|
||||
];
|
||||
preBuild = ''
|
||||
buildFlagsArray+=("-ldflags" "-s -w -X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}")
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
@ -40,6 +37,14 @@ buildGoModule rec {
|
|||
--zsh <($out/bin/tkn completion zsh)
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
$out/bin/tkn --help
|
||||
$out/bin/tkn version | grep "Client version: ${version}"
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://tekton.dev";
|
||||
changelog = "https://github.com/tektoncd/cli/releases/tag/v${version}";
|
||||
|
|
|
|||
|
|
@ -157,9 +157,9 @@ in rec {
|
|||
});
|
||||
|
||||
terraform_0_14 = pluggable (generic {
|
||||
version = "0.14.7";
|
||||
sha256 = "0lnq65ibdxrw2rlyipk469a5hh16vgym1698nmfn62ak8fdrd8la";
|
||||
vendorSha256 = "0pk5mgj19a8by7wbn5xd6kgr1kxrazhvg851fvs8mq3j0ayb32nb";
|
||||
version = "0.14.8";
|
||||
sha256 = "0kpw8w28pfyr136z5d4pxw7g9ch6rk2lfwh3lwz25mngq1lljmn0";
|
||||
vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm";
|
||||
patches = [ ./provider-path.patch ];
|
||||
passthru = { inherit plugins; };
|
||||
});
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.28.8";
|
||||
version = "0.28.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A/sSVStXW1b2QOb01f9sink4LMz/52W9voV4VpqQQ4E=";
|
||||
sha256 = "sha256-sqwR+bXx5ab5OsmW44C5MIXjzQFM1QsBvsM0R3pL3H8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4=";
|
||||
vendorSha256 = "sha256-9DBCP/4mp/Gr2ie0nk7WGfL+M7snMEztdHZzxdIFbzM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,19 +2,20 @@
|
|||
, fetchurl
|
||||
, appimageTools
|
||||
, makeWrapper
|
||||
, electron_10
|
||||
, electron_12
|
||||
, xorg
|
||||
}:
|
||||
|
||||
let
|
||||
electron = electron_10;
|
||||
electron = electron_12;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitsi-meet-electron";
|
||||
version = "2.4.2";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
|
||||
sha256 = "1lv3ca9qlggyb8vcg8zlxv46i8fgx5qrx7i7y71dlqblajalf42p";
|
||||
sha256 = "1g8was4anrsdpv4h11z544mi0v79him2xjyknixyrqfy87cbh97n";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
|
|||
postFixup = ''
|
||||
makeWrapper ${electron}/bin/electron $out/bin/${pname} \
|
||||
--add-flags $out/share/${pname}/resources/app.asar \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc xorg.libXtst ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signal-cli";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
# Building from source would be preferred, but is much more involved.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
|
||||
sha256 = "sha256-0YzeGtdsCUG8N7Av/zzHoC9KKu1rqjQDToaOEXzuoJc=";
|
||||
sha256 = "sha256-Lq1RSJ1VIa6MFTiTbGqNy7IqliJwGeuegm/1+RRtu+I=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, libxml2, dbus-glib, dbus
|
||||
{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python2, libxml2, dbus-glib, dbus
|
||||
, sqlite, libsoup, libnice, gnutls}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config libxslt ];
|
||||
buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ];
|
||||
buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls python2 ];
|
||||
|
||||
checkInputs = [ dbus.daemon ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkg-config, libxslt }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python2, glib, dbus-glib, pkg-config, libxslt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-haze";
|
||||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
|
||||
};
|
||||
|
||||
buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ];
|
||||
buildInputs = [ glib telepathy-glib dbus-glib pidgin python2 ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config libxslt ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, libxslt, makeWrapper }:
|
||||
{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, python2, libxslt, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-idle";
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) ];
|
||||
buildInputs = [ glib telepathy-glib dbus-glib libxslt python2 (lib.getLib dconf) ];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/libexec/telepathy-idle" \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkg-config
|
||||
{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python2, pkg-config
|
||||
, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
buildInputs = [
|
||||
dbus-glib libxml2 sqlite telepathy-glib
|
||||
dbus telepathy-glib.python
|
||||
dbus python2
|
||||
];
|
||||
|
||||
configureFlags = [ "--enable-call" ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup
|
||||
{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, python2, avahi, libsoup
|
||||
, libuuid, openssl, pcre, sqlite, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# pcre needed because https://github.com/NixOS/nixpkgs/pull/15046
|
||||
buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl
|
||||
sqlite pcre telepathy-glib.python ];
|
||||
sqlite pcre python2 ];
|
||||
|
||||
nativeBuildInputs = [ libxslt pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "remmina";
|
||||
version = "1.4.10";
|
||||
version = "1.4.12";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "Remmina";
|
||||
repo = "Remmina";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-n3YfLKCv6CoBeUIv+1yN6RIih63PTFj5zr+dZDJwYdw=";
|
||||
sha256 = "sha256-CjlNEmca4Kob5rdpZa+YfvdOIDDDYfhNsGYqGDxSGKY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
|
||||
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
|
||||
, libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper
|
||||
, libssh, nghttp2, zlib, cmake, makeWrapper
|
||||
, withQt ? true, qt5 ? null
|
||||
, ApplicationServices, SystemConfiguration, gmp
|
||||
}:
|
||||
|
|
@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
|
|||
with lib;
|
||||
|
||||
let
|
||||
version = "3.4.3";
|
||||
version = "3.4.4";
|
||||
variant = if withQt then "qt" else "cli";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
|
|
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
|
||||
sha256 = "0ar6pxzrcpxdriz437d6ziwlhb8k5wlvrkalp3hgqwzwy1vwqrzl";
|
||||
sha256 = "0aad3m8nh4i75dgjs68217135bzqmhmlgjklmpjh1ihmjwgd373j";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -33,13 +33,11 @@ in stdenv.mkDerivation {
|
|||
# Avoid referencing -dev paths because of debug assertions.
|
||||
NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison cmake flex pkg-config
|
||||
] ++ optional withQt qt5.wrapQtAppsHook;
|
||||
nativeBuildInputs = [ bison cmake flex makeWrapper pkg-config ] ++ optional withQt qt5.wrapQtAppsHook;
|
||||
|
||||
buildInputs = [
|
||||
gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt
|
||||
libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper
|
||||
libgpgerror gnutls geoip c-ares python3 glib zlib
|
||||
] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
|
||||
++ optionals stdenv.isLinux [ libcap libnl ]
|
||||
++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
|
||||
|
|
@ -96,7 +94,7 @@ in stdenv.mkDerivation {
|
|||
meta = with lib; {
|
||||
homepage = "https://www.wireshark.org/";
|
||||
description = "Powerful network protocol analyzer";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
|
||||
longDescription = ''
|
||||
Wireshark (formerly known as "Ethereal") is a powerful network
|
||||
|
|
|
|||
|
|
@ -2,32 +2,44 @@
|
|||
, gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty
|
||||
, readline, gettext, libpng, libao, gfortran, perl
|
||||
, enableGUI ? false, libGL, libGLU, xorg, fltk
|
||||
, enableMicroPy ? false, python3
|
||||
}:
|
||||
|
||||
assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "giac${lib.optionalString enableGUI "-with-xcas"}";
|
||||
version = "1.5.0-87"; # TODO try to remove preCheck phase on upgrade
|
||||
version = "1.6.0-47"; # TODO try to remove preCheck phase on upgrade
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz";
|
||||
sha256 = "1d0h1yb7qvh9x7wwv9yrzmcp712f49w1iljkxp4y6g9pzsmg1mmv";
|
||||
sha256 = "sha256-c5A9/I6L/o3Y3dxEPoTKpw/fJqYMr6euLldaQ1HWT5c=";
|
||||
};
|
||||
|
||||
patches = lib.optionals (!enableGUI) [
|
||||
# when enableGui is false, giac is compiled without fltk. That means some
|
||||
# outputs differ in the make check. Patch around this:
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26";
|
||||
name = "pari_2_11.patch";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/pari_2_11.patch?id=21ba7540d385a9864b44850d6987893dfa16bfc0";
|
||||
sha256 = "sha256-vEo/5MNzMdYRPWgLFPsDcMT1W80Qzj4EPBjx/B8j68k=";
|
||||
})
|
||||
] ++ lib.optionals (!enableGUI) [
|
||||
# when enableGui is false, giac is compiled without fltk. That
|
||||
# means some outputs differ in the make check. Patch around this:
|
||||
(fetchpatch {
|
||||
name = "nofltk-check.patch";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26";
|
||||
sha256 = "0xkmfc028vg5w6va04gp2x2iv31n8v4shd6vbyvk4blzgfmpj2cw";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
for i in doc/*/Makefile*; do
|
||||
for i in doc/*/Makefile* micropython*/xcas/Makefile*; do
|
||||
substituteInPlace "$i" --replace "/bin/cp" "cp";
|
||||
done;
|
||||
'' +
|
||||
# workaround for 1.6.0-47, should not be necessary in future versions
|
||||
lib.optionalString (!enableMicroPy) ''
|
||||
sed -i -e 's/micropython-[0-9.]* //' Makefile*
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -44,7 +56,7 @@ stdenv.mkDerivation rec {
|
|||
lapack blas
|
||||
] ++ lib.optionals enableGUI [
|
||||
libGL libGLU fltk xorg.libX11
|
||||
];
|
||||
] ++ lib.optional enableMicroPy python3;
|
||||
|
||||
/* fixes:
|
||||
configure:16211: checking for main in -lntl
|
||||
|
|
@ -58,13 +70,12 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "out" ] ++ lib.optional (!enableGUI) "doc";
|
||||
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
# One test in this file fails. That test just tests a part of the pari
|
||||
# interface that isn't actually used in giac. Of course it would be better
|
||||
# to only remove that one test, but that would require a patch.
|
||||
# Removing the whole test set should be good enough for now.
|
||||
# Upstream report: https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102#p10326
|
||||
echo > check/chk_fhan11
|
||||
preCheck = lib.optionalString (!enableGUI) ''
|
||||
# even with the nofltk patch, some changes in src/misc.cc (grep
|
||||
# for HAVE_LIBFLTK) made it so that giac behaves differently
|
||||
# when fltk is disabled. disable these tests for now.
|
||||
echo > check/chk_fhan2
|
||||
echo > check/chk_fhan9
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
@ -75,7 +86,7 @@ stdenv.mkDerivation rec {
|
|||
"--enable-ao" "--enable-ecm" "--enable-glpk"
|
||||
] ++ lib.optionals enableGUI [
|
||||
"--enable-gui" "--with-x"
|
||||
];
|
||||
] ++ lib.optional (!enableMicroPy) "--disable-micropy";
|
||||
|
||||
postInstall = ''
|
||||
# example Makefiles contain the full path to some commands
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palp";
|
||||
version = "2.11";
|
||||
version = "2.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/palp-${version}.tar.gz";
|
||||
sha256 = "00jpm73fw9jjq58z6rysr1mwv489j6rpfqqlhm9ab0dln4kyhh05";
|
||||
url = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/${pname}-${version}.tar.gz";
|
||||
sha256 = "1q1cl3vpdir16szy0jcadysydcrjp48hqxyx42kr8g9digkqjgkj";
|
||||
};
|
||||
|
||||
hardeningDisable = [
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py
|
||||
index 88a33b0349..b3321f0bec 100644
|
||||
--- a/src/sage/interfaces/singular.py
|
||||
+++ b/src/sage/interfaces/singular.py
|
||||
@@ -495,24 +495,6 @@ class Singular(ExtraTabCompletion, Expect):
|
||||
"""
|
||||
Send an interrupt to Singular. If needed, additional
|
||||
semi-colons are sent until we get back at the prompt.
|
||||
-
|
||||
- TESTS:
|
||||
-
|
||||
- The following works without restarting Singular::
|
||||
-
|
||||
- sage: a = singular(1)
|
||||
- sage: _ = singular._expect.sendline('1+') # unfinished input
|
||||
- sage: try:
|
||||
- ....: alarm(0.5)
|
||||
- ....: singular._expect_expr('>') # interrupt this
|
||||
- ....: except KeyboardInterrupt:
|
||||
- ....: pass
|
||||
- Control-C pressed. Interrupting Singular. Please wait a few seconds...
|
||||
-
|
||||
- We can still access a::
|
||||
-
|
||||
- sage: 2*a
|
||||
- 2
|
||||
"""
|
||||
# Work around for Singular bug
|
||||
# http://www.singular.uni-kl.de:8002/trac/ticket/727
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
diff --git a/src/sage/repl/image.py b/src/sage/repl/image.py
|
||||
index d7d00b0..cd1607a 100644
|
||||
--- a/src/sage/repl/image.py
|
||||
+++ b/src/sage/repl/image.py
|
||||
@@ -77,7 +77,7 @@ class Image(SageObject):
|
||||
|
||||
- ``size`` -- 2-tuple, containing (width, height) in pixels.
|
||||
|
||||
- - ``color`` -- string or tuple of numeric. What colour to use
|
||||
+ - ``color`` -- string, numeric or tuple of numeric. What colour to use
|
||||
for the image. Default is black. If given, this should be a
|
||||
a tuple with one value per band. When creating RGB images,
|
||||
you can also use colour strings as supported by the
|
||||
@@ -91,9 +91,15 @@ class Image(SageObject):
|
||||
EXAMPLES::
|
||||
|
||||
sage: from sage.repl.image import Image
|
||||
- sage: Image('P', (16, 16), (13,))
|
||||
+ sage: Image('P', (16, 16), 13)
|
||||
16x16px 8-bit Color image
|
||||
"""
|
||||
+ # pillow does not support Sage integers as color
|
||||
+ from sage.rings.integer import Integer
|
||||
+ if isinstance(color, Integer):
|
||||
+ color = int(color)
|
||||
+ elif isinstance(color, tuple):
|
||||
+ color = tuple(int(i) if isinstance(i, Integer) else i for i in color)
|
||||
self._pil = PIL.Image.new(mode, size, color)
|
||||
|
||||
@property
|
||||
@@ -233,7 +239,7 @@ class Image(SageObject):
|
||||
EXAMPLES::
|
||||
|
||||
sage: from sage.repl.image import Image
|
||||
- sage: img = Image('P', (12, 34), (13,))
|
||||
+ sage: img = Image('P', (12, 34), 13)
|
||||
sage: filename = tmp_filename(ext='.png')
|
||||
sage: img.save(filename)
|
||||
sage: with open(filename, 'rb') as f:
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
diff --git a/src/sage/doctest/forker.py b/src/sage/doctest/forker.py
|
||||
index cb3667659e..867f547d71 100644
|
||||
--- a/src/sage/doctest/forker.py
|
||||
+++ b/src/sage/doctest/forker.py
|
||||
@@ -200,6 +200,15 @@ def init_sage(controller=None):
|
||||
from sage.cpython._py2_random import Random
|
||||
sage.misc.randstate.DEFAULT_PYTHON_RANDOM = Random
|
||||
|
||||
+ # IPython's pretty printer sorts the repr of dicts by their keys by default
|
||||
+ # (or their keys' str() if they are not otherwise orderable). However, it
|
||||
+ # disables this for CPython 3.6+ opting to instead display dicts' "natural"
|
||||
+ # insertion order, which is preserved in those versions).
|
||||
+ # However, this order is random in some instances.
|
||||
+ # Also modifications of code may affect the order.
|
||||
+ # So here we fore sorted dict printing.
|
||||
+ IPython.lib.pretty.for_type(dict, _sorted_dict_pprinter_factory('{', '}'))
|
||||
+
|
||||
if controller is None:
|
||||
import sage.repl.ipython_kernel.all_jupyter
|
||||
else:
|
||||
@@ -222,15 +231,6 @@ def init_sage(controller=None):
|
||||
from sage.repl.rich_output.backend_doctest import BackendDoctest
|
||||
dm.switch_backend(BackendDoctest())
|
||||
|
||||
- # IPython's pretty printer sorts the repr of dicts by their keys by default
|
||||
- # (or their keys' str() if they are not otherwise orderable). However, it
|
||||
- # disables this for CPython 3.6+ opting to instead display dicts' "natural"
|
||||
- # insertion order, which is preserved in those versions).
|
||||
- # However, this order is random in some instances.
|
||||
- # Also modifications of code may affect the order.
|
||||
- # So here we fore sorted dict printing.
|
||||
- IPython.lib.pretty.for_type(dict, _sorted_dict_pprinter_factory('{', '}'))
|
||||
-
|
||||
# Switch on extra debugging
|
||||
from sage.structure.debug_options import debug
|
||||
debug.refine_category_hash_check = True
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/sage/interfaces/sagespawn.pyx b/src/sage/interfaces/sagespawn.pyx
|
||||
index 9041238f1d..469befbc66 100644
|
||||
--- a/src/sage/interfaces/sagespawn.pyx
|
||||
+++ b/src/sage/interfaces/sagespawn.pyx
|
||||
@@ -228,7 +228,7 @@ class SagePtyProcess(PtyProcess):
|
||||
Check that the process eventually dies after calling
|
||||
``terminate_async``::
|
||||
|
||||
- sage: s.ptyproc.terminate_async(interval=0.2)
|
||||
+ sage: s.ptyproc.terminate_async(interval=float(0.2))
|
||||
sage: while True:
|
||||
....: try:
|
||||
....: os.kill(s.pid, 0)
|
||||
|
|
@ -9,6 +9,20 @@
|
|||
# This is done because multiple derivations rely on these sources and they should
|
||||
# all get the same sources with the same patches applied.
|
||||
|
||||
let
|
||||
# Fetch a diff between `base` and `rev` on sage's git server.
|
||||
# Used to fetch trac tickets by setting the `base` to the last release and the
|
||||
# `rev` to the last commit of the ticket.
|
||||
fetchSageDiff = { base, name, rev, sha256, ...}@args: (
|
||||
fetchpatch ({
|
||||
inherit name sha256;
|
||||
url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}";
|
||||
# We don't care about sage's own build system (which builds all its dependencies).
|
||||
# Exclude build system changes to avoid conflicts.
|
||||
excludes = [ "build/*" ];
|
||||
} // builtins.removeAttrs args [ "rev" "base" "sha256" ])
|
||||
);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "9.2";
|
||||
pname = "sage-src";
|
||||
|
|
@ -40,17 +54,13 @@ stdenv.mkDerivation rec {
|
|||
# https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
|
||||
./patches/sphinx-docbuild-subprocesses.patch
|
||||
|
||||
# Sage's workaround to pretty print dicts (in
|
||||
# src/sage/doctest/forker.py:init_sage) runs too late (after
|
||||
# controller.load_environment(), which imports sage.all.*) to to
|
||||
# affect sage.sandpiles.Sandpile{Config,Divisor}'s pretty printer.
|
||||
# Due to the sandpiles module being lazily loaded, this only
|
||||
# affects the first run (subsequent runs read from an import cache
|
||||
# at ~/.sage/cache and are not affected), which is probably why
|
||||
# other distributions don't hit this bug. This breaks two sandpile
|
||||
# tests, so do the workaround a little bit earlier.
|
||||
# https://trac.sagemath.org/ticket/31053
|
||||
./patches/register-pretty-printer-earlier.patch
|
||||
# Register sorted dict pprinter earlier (https://trac.sagemath.org/ticket/31053)
|
||||
(fetchSageDiff {
|
||||
base = "9.3.beta4";
|
||||
name = "register-pretty-printer-earlier.patch";
|
||||
rev = "d658230ce06ca19f4a3b3a4576297ee82f2d2151";
|
||||
sha256 = "sha256-9mPUV7K5PoLDH2vVaYaOfvDLDpmxU0Aj7m/eaXYotDs=";
|
||||
})
|
||||
];
|
||||
|
||||
# Since sage unfortunately does not release bugfix releases, packagers must
|
||||
|
|
@ -63,17 +73,20 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# fix intermittent errors in Sage 9.2's psage.py (this patch is
|
||||
# already included in Sage 9.3): https://trac.sagemath.org/ticket/30730
|
||||
(fetchpatch {
|
||||
(fetchSageDiff {
|
||||
base = "9.2.rc2";
|
||||
name = "fix-psage-is-locked.patch";
|
||||
url = "https://git.sagemath.org/sage.git/patch/?id=75df605f216ddc7b6ca719be942d666b241520e9";
|
||||
rev = "75df605f216ddc7b6ca719be942d666b241520e9";
|
||||
sha256 = "0g9pl1wbb3sgs26d3bvv70cpa77sfskylv4kd255y1794f1fgk4q";
|
||||
})
|
||||
|
||||
# fix intermittent errors in sagespawn.pyx: https://trac.sagemath.org/ticket/31052
|
||||
./patches/sagespawn-implicit-casting.patch
|
||||
|
||||
# disable pexpect interrupt test (see https://trac.sagemath.org/ticket/30945)
|
||||
./patches/disable-pexpect-intermittent-failure.patch
|
||||
(fetchSageDiff {
|
||||
base = "9.2";
|
||||
name = "sagespawn-implicit-casting.patch";
|
||||
rev = "2959ac792ebd6107fe87c9af1541083de5ba02d6";
|
||||
sha256 = "sha256-bWIpEGir9Kawak5CJegBMNcHm/CqhWmdru+emeSsvO0=";
|
||||
})
|
||||
];
|
||||
|
||||
# Patches needed because of package updates. We could just pin the versions of
|
||||
|
|
@ -82,20 +95,7 @@ stdenv.mkDerivation rec {
|
|||
# compatible with never dependency versions when possible. All these changes
|
||||
# should come from or be proposed to upstream. This list will probably never
|
||||
# be empty since dependencies update all the time.
|
||||
packageUpgradePatches = let
|
||||
# Fetch a diff between `base` and `rev` on sage's git server.
|
||||
# Used to fetch trac tickets by setting the `base` to the last release and the
|
||||
# `rev` to the last commit of the ticket.
|
||||
fetchSageDiff = { base, rev, name ? "sage-diff-${base}-${rev}.patch", ...}@args: (
|
||||
fetchpatch ({
|
||||
inherit name;
|
||||
url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}";
|
||||
# We don't care about sage's own build system (which builds all its dependencies).
|
||||
# Exclude build system changes to avoid conflicts.
|
||||
excludes = [ "build/*" ];
|
||||
} // builtins.removeAttrs args [ "rev" "base" ])
|
||||
);
|
||||
in [
|
||||
packageUpgradePatches = [
|
||||
# After updating smypow to (https://trac.sagemath.org/ticket/3360) we can
|
||||
# now set the cache dir to be withing the .sage directory. This is not
|
||||
# strictly necessary, but keeps us from littering in the user's HOME.
|
||||
|
|
@ -105,7 +105,20 @@ stdenv.mkDerivation rec {
|
|||
./patches/ignore-cmp-deprecation.patch
|
||||
|
||||
# adapt sage's Image class to pillow 8.0.1 (https://trac.sagemath.org/ticket/30971)
|
||||
./patches/pillow-update.patch
|
||||
(fetchSageDiff {
|
||||
base = "9.3.beta2";
|
||||
name = "pillow-8.0.1-update.patch";
|
||||
rev = "f05f2d0aac9c4b5abe68105cee2cc7f2c8461847";
|
||||
sha256 = "sha256-uY2UlgSd5hhOUUukB4Xc3Gjy0/e7p/qyq9jdvz10IOs=";
|
||||
})
|
||||
|
||||
# don't use deprecated numpy type aliases (https://trac.sagemath.org/ticket/31364)
|
||||
(fetchSageDiff {
|
||||
base = "9.3.beta7";
|
||||
name = "dont-use-deprecated-numpy-type-aliases.patch";
|
||||
rev = "dfdef60515d4a4269e82d91280f76a7fdf10bf97";
|
||||
sha256 = "sha256-77/3LkT5J7DQN8IPlGJKB6ZcJPaF7xwje06JNns+0AE=";
|
||||
})
|
||||
|
||||
# fix test output with sympy 1.7 (https://trac.sagemath.org/ticket/30985)
|
||||
./patches/sympy-1.7-update.patch
|
||||
|
|
@ -115,6 +128,31 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# updated eclib output has punctuation changes and tidier whitespace
|
||||
./patches/eclib-20210223-test-formatting.patch
|
||||
|
||||
# upgrade arb to 2.18.1 (https://trac.sagemath.org/ticket/28623)
|
||||
(fetchSageDiff {
|
||||
base = "9.3.beta3";
|
||||
name = "arb-2.18.1-update.patch";
|
||||
rev = "0c9c4ed35c2eaf34ae0d19387c07b7f460e4abce";
|
||||
sha256 = "sha256-CjOJIsyyVCziAfvE6pWSihPO35IZMcY2/taXAsqhPLY=";
|
||||
})
|
||||
|
||||
# giac 1.6.0-47 update (https://trac.sagemath.org/ticket/30537)
|
||||
(fetchSageDiff {
|
||||
base = "9.3.beta7";
|
||||
name = "giac-1.6.0-47-update.patch";
|
||||
rev = "f05720bf63dfaf33a4e3b6d3ed2c2c0ec46b5d31";
|
||||
sha256 = "sha256-gDUq+84eXd5GxLBWUSI61GMJpBF2KX4LBVOt3mS1NF8=";
|
||||
})
|
||||
|
||||
# Make gcd/lcm interact better with pari and gmpy2 (https://trac.sagemath.org/ticket/30849)
|
||||
# needed for pari 2.13.1 update, which we will do in the future
|
||||
(fetchSageDiff {
|
||||
base = "9.3.beta0";
|
||||
name = "make-gcd-lcm-interact-better-with-pari-and-gmpy2.patch";
|
||||
rev = "75c1516f0abb9e6f8c335e38e4031f6ef674ed30";
|
||||
sha256 = "sha256-RukkieIZcXNrju904H2oyGKdtpdE+9vNzvyjN2IBNg0=";
|
||||
})
|
||||
];
|
||||
|
||||
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@ assert !withQT -> default != "qt5";
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "avidemux";
|
||||
version = "2.7.6";
|
||||
version = "2.7.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
|
||||
sha256 = "1kwkn976ppahrcr74bnv6sqx75pzl9y21m1mvr5ksi1m6lgp924s";
|
||||
sha256 = "sha256-YopAT1If8oEnYHAK4+KqeOWBaw/z+2/QWsPnUkjZdAE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "droidcam";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aramg";
|
||||
repo = "droidcam";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-f7wLi4ReExkqb+SfOK0juzKbwdcqUVkklIUOIMtmnxM=";
|
||||
sha256 = "sha256-Ny/PJu+ifs9hQRDUv1pONBb6fKJzoiNtjPOFc4veU8c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,12 +16,11 @@ mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ];
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
|
||||
qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ];
|
||||
buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Stand-alone YouTube video player";
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cagebreak";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "project-repo";
|
||||
repo = "cagebreak";
|
||||
rev = version;
|
||||
hash = "sha256-P6zBVQEv+fKdverNIXhoEavu51uGKbSHx3Sh5FWsc2E=";
|
||||
hash = "sha256-F7fqDVbJS6pVgmj6C1/l9PAaz5yzcYpaq6oc6a6v/Qk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ];
|
||||
|
|
@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
|
|||
mesonFlags = [
|
||||
"-Dxwayland=${lib.boolToString withXwayland}"
|
||||
"-Dversion_override=${version}"
|
||||
"-Dman-pages=true"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -447,7 +447,7 @@ rec {
|
|||
let
|
||||
stream = streamLayeredImage args;
|
||||
in
|
||||
runCommand "${name}.tar.gz" {
|
||||
runCommand "${baseNameOf name}.tar.gz" {
|
||||
inherit (stream) imageName;
|
||||
passthru = { inherit (stream) imageTag; };
|
||||
nativeBuildInputs = [ pigz ];
|
||||
|
|
@ -746,8 +746,10 @@ rec {
|
|||
(lib.assertMsg (maxLayers > 1)
|
||||
"the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: ${toString maxLayers})");
|
||||
let
|
||||
baseName = baseNameOf name;
|
||||
|
||||
streamScript = writePython3 "stream" {} ./stream_layered_image.py;
|
||||
baseJson = writeText "${name}-base.json" (builtins.toJSON {
|
||||
baseJson = writeText "${baseName}-base.json" (builtins.toJSON {
|
||||
inherit config;
|
||||
architecture = defaultArch;
|
||||
os = "linux";
|
||||
|
|
@ -759,7 +761,7 @@ rec {
|
|||
# things like permissions set on 'extraCommands' are not overriden
|
||||
# by Nix. Then we precompute the sha256 for performance.
|
||||
customisationLayer = symlinkJoin {
|
||||
name = "${name}-customisation-layer";
|
||||
name = "${baseName}-customisation-layer";
|
||||
paths = contentsList;
|
||||
inherit extraCommands;
|
||||
postBuild = ''
|
||||
|
|
@ -788,7 +790,7 @@ rec {
|
|||
# so they'll be excluded from the created images.
|
||||
unnecessaryDrvs = [ baseJson overallClosure ];
|
||||
|
||||
conf = runCommand "${name}-conf.json" {
|
||||
conf = runCommand "${baseName}-conf.json" {
|
||||
inherit maxLayers created;
|
||||
imageName = lib.toLower name;
|
||||
passthru.imageTag =
|
||||
|
|
@ -841,18 +843,20 @@ rec {
|
|||
|
||||
cat ${baseJson} | jq '
|
||||
. + {
|
||||
"store_dir": $store_dir,
|
||||
"store_layers": $store_layers,
|
||||
"customisation_layer", $customisation_layer,
|
||||
"repo_tag": $repo_tag,
|
||||
"created": $created
|
||||
}
|
||||
' --argjson store_layers "$store_layers" \
|
||||
' --arg store_dir "${storeDir}" \
|
||||
--argjson store_layers "$store_layers" \
|
||||
--arg customisation_layer ${customisationLayer} \
|
||||
--arg repo_tag "$imageName:$imageTag" \
|
||||
--arg created "$created" |
|
||||
tee $out
|
||||
'';
|
||||
result = runCommand "stream-${name}" {
|
||||
result = runCommand "stream-${baseName}" {
|
||||
inherit (conf) imageName;
|
||||
passthru = {
|
||||
inherit (conf) imageTag;
|
||||
|
|
|
|||
|
|
@ -427,4 +427,18 @@ rec {
|
|||
tag = "latest";
|
||||
contents = [ pkgs.bash symlink ];
|
||||
} // { passthru = { inherit symlink; }; };
|
||||
|
||||
# image with registry/ prefix
|
||||
prefixedImage = pkgs.dockerTools.buildImage {
|
||||
name = "registry-1.docker.io/image";
|
||||
tag = "latest";
|
||||
config.Cmd = [ "${pkgs.hello}/bin/hello" ];
|
||||
};
|
||||
|
||||
# layered image with registry/ prefix
|
||||
prefixedLayeredImage = pkgs.dockerTools.buildLayeredImage {
|
||||
name = "registry-1.docker.io/layered-image";
|
||||
tag = "latest";
|
||||
config.Cmd = [ "${pkgs.hello}/bin/hello" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -130,12 +130,13 @@ class ExtractChecksum:
|
|||
LayerInfo = namedtuple("LayerInfo", ["size", "checksum", "path", "paths"])
|
||||
|
||||
|
||||
def add_layer_dir(tar, paths, mtime):
|
||||
def add_layer_dir(tar, paths, store_dir, mtime):
|
||||
"""
|
||||
Appends given store paths to a TarFile object as a new layer.
|
||||
|
||||
tar: 'tarfile.TarFile' object for the new layer to be added to.
|
||||
paths: List of store paths.
|
||||
store_dir: the root directory of the nix store
|
||||
mtime: 'mtime' of the added files and the layer tarball.
|
||||
Should be an integer representing a POSIX time.
|
||||
|
||||
|
|
@ -143,9 +144,9 @@ def add_layer_dir(tar, paths, mtime):
|
|||
the layer added.
|
||||
"""
|
||||
|
||||
invalid_paths = [i for i in paths if not i.startswith("/nix/store/")]
|
||||
invalid_paths = [i for i in paths if not i.startswith(store_dir)]
|
||||
assert len(invalid_paths) == 0, \
|
||||
"Expecting absolute store paths, but got: {invalid_paths}"
|
||||
f"Expecting absolute paths from {store_dir}, but got: {invalid_paths}"
|
||||
|
||||
# First, calculate the tarball checksum and the size.
|
||||
extract_checksum = ExtractChecksum()
|
||||
|
|
@ -245,6 +246,7 @@ def main():
|
|||
else datetime.fromisoformat(conf["created"])
|
||||
)
|
||||
mtime = int(created.timestamp())
|
||||
store_dir = conf["store_dir"]
|
||||
|
||||
with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar:
|
||||
layers = []
|
||||
|
|
@ -253,7 +255,7 @@ def main():
|
|||
"Creating layer", num,
|
||||
"from paths:", store_layer,
|
||||
file=sys.stderr)
|
||||
info = add_layer_dir(tar, store_layer, mtime=mtime)
|
||||
info = add_layer_dir(tar, store_layer, store_dir, mtime=mtime)
|
||||
layers.append(info)
|
||||
|
||||
print("Creating the customisation layer...", file=sys.stderr)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
{ fetchzip, lib }:
|
||||
|
||||
{ owner
|
||||
, repo, rev
|
||||
, domain ? "sr.ht"
|
||||
, vc ? "git"
|
||||
, name ? "source"
|
||||
, ... # For hash agility
|
||||
} @ args:
|
||||
|
||||
with lib;
|
||||
|
||||
assert (lib.assertOneOf "vc" vc [ "hg" "git" ]);
|
||||
|
||||
let
|
||||
baseUrl = "https://${vc}.${domain}/${owner}/${repo}";
|
||||
|
||||
in fetchzip (recursiveUpdate {
|
||||
inherit name;
|
||||
url = "${baseUrl}/archive/${rev}.tar.gz";
|
||||
meta.homepage = "${baseUrl}/";
|
||||
extraPostFetch = optionalString (vc == "hg") ''
|
||||
rm -f "$out/.hg_archival.txt"
|
||||
''; # impure file; see #12002
|
||||
} (removeAttrs args [ "owner" "repo" "rev" "domain" "vc" ])) // { inherit rev; }
|
||||
|
|
@ -10,7 +10,7 @@ let
|
|||
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "${name}-bin";
|
||||
version = "5.0.4";
|
||||
version = "5.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
|
||||
|
|
|
|||
|
|
@ -1,26 +1,26 @@
|
|||
# This file was autogenerated. DO NOT EDIT!
|
||||
{
|
||||
iosevka = "0g32pzxij72fjy0ycwzy23dg06ypmxcg24dk4scvhjp9b5ajx79k";
|
||||
iosevka-aile = "0yynkwhanza4y593ajn8hkshk46dl9g84qf1shmy21wd3lqr7psx";
|
||||
iosevka-curly = "0zd5hh0hr6prn32yd7fibl2wighv9f6p7jwgfrwcizljai44adnx";
|
||||
iosevka-curly-slab = "147bzw9lr8f54yh0hv8887sxy4571563mxjcag0dfw8z3rfffw8c";
|
||||
iosevka-etoile = "04jjg4vp0fag7xgiqxnql60gyvlpjmgqqj5q4j3rys9nyw3pl0gi";
|
||||
iosevka-slab = "10qwardvknnw6l3yiyji9v02450vfj76lvnlszijv78lfm1xp1qk";
|
||||
iosevka-ss01 = "12z1yjspzcbzgs224n1dxis4ghybfkzpw4dwr1wzza553kplwz6w";
|
||||
iosevka-ss02 = "08vrlzcyqa83mn2155p4h6hsk20jx3sv0yqimxfsyrwcalc63dcq";
|
||||
iosevka-ss03 = "0rhp4rdza36hazs20h4bk524xsgx54pxbw69k235km71m9x6ba59";
|
||||
iosevka-ss04 = "1ijjcy8z0fbfrw2fjqnmxbi9l6r41sixk72h3vp75gzrkq7dbh86";
|
||||
iosevka-ss05 = "06q9wxkyp7iv9pz3xj6d3v8ay82425wcgl9dybr3dfp4mcsdn7zz";
|
||||
iosevka-ss06 = "10pdw28dgdk5343rzbbj5mgmagv4ndl2gg4f02kzq0vlv5xh8vj6";
|
||||
iosevka-ss07 = "16xym710sq398zi223cjzxpcblc851ypl7v2dzhvskgsasvj4ypr";
|
||||
iosevka-ss08 = "14mqs6gi71p544asr1sz48g6q9zl6zj6sadhhcf8gdsnwa475ds2";
|
||||
iosevka-ss09 = "049va8vpzjczslirsxklwcpcsiaqrpc2zm9rmnf5qfyf7f1rn4yd";
|
||||
iosevka-ss10 = "1g8s9d7vlb2yx5d8cgsxcl5hb38g1f80d3l04lj2gr22lzk0y271";
|
||||
iosevka-ss11 = "15j3wfz8ybszp702c8ycv8kwnbdpa07w8kw9njhsfzvb5iw1xx0i";
|
||||
iosevka-ss12 = "1k5250sik2yfa5s5dxaqp0s45wfbxh1s1xn06qjj81ywmw9hy6yg";
|
||||
iosevka-ss13 = "1ym8mn2qqwys01wrkplx11kajkfi0x5vzn8m234cbzn8drlgh0l5";
|
||||
iosevka-ss14 = "0wkc7kwz6bzxxijycm4d4samy83zsghd8lyq0yn6g48rb6kj9fgw";
|
||||
iosevka-ss15 = "0j46sr85vcq25n8ia7nk8rgr3rmgr69wwf7pgllllscablacw73k";
|
||||
iosevka-ss16 = "017vipi1cmcjglx0x6da6ans1bsr3xlr43n4mv5qj7h50j1dv3l6";
|
||||
iosevka-ss17 = "0kbvy54v543znrzb9584mv6h96hfp9fndxb6wg32clqhzm2yh7fw";
|
||||
iosevka = "1fva80sxdcmsl8y3m23ndif3ff54if37g1xqpda1f13yrbd9ii8q";
|
||||
iosevka-aile = "0fy58yd17k8k41j5f48572d4vad3zz7c2mbc6vsiii9abfkwwalr";
|
||||
iosevka-curly = "1lxw8na3qvc5g04prczl7qprdkvd0zf91ybmv276dnkq27abnjn4";
|
||||
iosevka-curly-slab = "19b6xr5vjnb20j34x2ynfji63qibczn0mm2j76d01py304839bws";
|
||||
iosevka-etoile = "0fhcn69idb6w8abpmmvpdp9c08zdhy0zwn8nbyy9jcznwj8vwb7m";
|
||||
iosevka-slab = "0jlm3l13p9c965zx6z4df65lzxzj9yjjvpwlnx94ipayinxa1iff";
|
||||
iosevka-ss01 = "1i6bvslpxj87p3xi198l486ba40ixicdkmj29vcb1d7w1hhr6wnm";
|
||||
iosevka-ss02 = "1raczi1ja4barvjg5cp3j96kyph4aj8qlp9i10q7835sy29q3285";
|
||||
iosevka-ss03 = "0cn9hi5w9rx8xhbh9a75c7s9pxa3dkqfhd24lbp72hwfgv5nk1v0";
|
||||
iosevka-ss04 = "0v8fvif71604vyqanphq9mmlmx4xy0y2bykvplhrj1zmrj6v2ing";
|
||||
iosevka-ss05 = "1fh99av3ml2zhjvdif02r2f82n4hsswpgd2i42d964swjdplxdga";
|
||||
iosevka-ss06 = "0b0kl49djpc77qpmr1g2nzrg0q477xkjiqxb2i33pkrjsxn4vhn7";
|
||||
iosevka-ss07 = "1d2by3najsambqxyzapnmd200hah39jq0mqdalidb2kjh5lx9n6k";
|
||||
iosevka-ss08 = "05m03zn9pfl1khvl9xvgmlaygh1ni67lj2pc8zjgqydyls1vmxl4";
|
||||
iosevka-ss09 = "1hzglj7sclg6h4jc9ibb1777apl11885w1gpscv81b8n1h0qhnb7";
|
||||
iosevka-ss10 = "1fr52sclgp10k0lh86scjn3aylvsfnr7msg7jfsr3bkg61f5x1da";
|
||||
iosevka-ss11 = "1cmdjmlqvhn3qvqdfflwa4wgza364jn9gbj5vq8rsd6qili175ix";
|
||||
iosevka-ss12 = "0bk56hh9894z59rpkk5s9hhmkz1b2gmvfys46frijg3am54xh03q";
|
||||
iosevka-ss13 = "1kgxlxz1cdkzrfbnkavscf48im9lwiya9rcqlaa10k0ssas28br5";
|
||||
iosevka-ss14 = "06djgn86r2yy3ll2ask5mr9qhqibqzr7v95db5dzxcbz7hrmaaxf";
|
||||
iosevka-ss15 = "0qcld7h38c7cif518sa84x50igxjkh38ckav9qhhv7ls1n5h0jpm";
|
||||
iosevka-ss16 = "0qa6h8qx60rajbpp0v4wxia5n3yinp2nvwy2dsi1270prra7r49x";
|
||||
iosevka-ss17 = "1s04vlkll42am6w3lcka518zv2dlrwwnykdid0sp81najwmq0fk3";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tali";
|
||||
version = "3.38.0";
|
||||
version = "3.38.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/tali/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "196f6hiap61sdqr7kvywk74yl0m2j7fvqml37p6cgfm7gfrhrvi9";
|
||||
sha256 = "AhVCi1DEoIJ/sN4uTmum5WZ4+bp22NJbfuyoUhXyWjk=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mruby";
|
||||
version = "2.1.2";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mruby";
|
||||
repo = "mruby";
|
||||
rev = version;
|
||||
sha256 = "0fhfv8pi7i8jn2vgk2n2rjnbnfa12nhj514v8i4k353n7q4pmkh3";
|
||||
sha256 = "sha256-C3K7ZooaOMa+V2HjxwiKxrrMb7ffl4QAgPsftRtb60c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ruby bison rake ];
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1qs91rq9xrafv2mf2v415k8lv91ab3ycz0xkpjh1mng5ca3pjlf3";
|
||||
};
|
||||
|
||||
patches = [ ./ocaml-4.03.patch ];
|
||||
patches = [ ./ocaml-4.03.patch ./ocaml-4.04.patch ];
|
||||
|
||||
# Paths so the opa compiler code generation will use the same programs as were
|
||||
# used to build opa.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,75 @@
|
|||
diff --git a/compiler/libbsl/bslLib.ml b/compiler/libbsl/bslLib.ml
|
||||
index b9f75bd1..171af065 100644
|
||||
--- a/compiler/libbsl/bslLib.ml
|
||||
+++ b/compiler/libbsl/bslLib.ml
|
||||
@@ -726,7 +726,7 @@ struct
|
||||
let root elt = !(elt.root)
|
||||
let elt_name elt = elt.name
|
||||
let elts e = e
|
||||
- let children = List.map (fun e -> e.name, e)
|
||||
+ let children m = List.map (fun e -> e.name, e) m
|
||||
let is_root e = Path.is_root e.pwd
|
||||
|
||||
let parent e =
|
||||
diff --git a/compiler/passes/surfaceAstDependencies.ml b/compiler/passes/surfaceAstDependencies.ml
|
||||
index f4354a3f..81253d32 100644
|
||||
--- a/compiler/passes/surfaceAstDependencies.ml
|
||||
+++ b/compiler/passes/surfaceAstDependencies.ml
|
||||
@@ -66,7 +66,6 @@ open SurfaceAst
|
||||
|
||||
(* shorthands *)
|
||||
module SAH = SurfaceAstHelper
|
||||
-module C = SurfaceAstCons.ExprIdentCons
|
||||
module D = SurfaceAstDecons
|
||||
module S = SurfaceAst
|
||||
|
||||
diff --git a/compiler/passes/surfaceAstPasses.ml b/compiler/passes/surfaceAstPasses.ml
|
||||
index 10edf5cb..00de59fa 100644
|
||||
--- a/compiler/passes/surfaceAstPasses.ml
|
||||
+++ b/compiler/passes/surfaceAstPasses.ml
|
||||
@@ -25,7 +25,6 @@ open SurfaceAstPassesTypes
|
||||
|
||||
(* alias *)
|
||||
module C = SurfaceAstCons.ExprIdentCons
|
||||
-module CS = SurfaceAstCons.StringCons
|
||||
|
||||
|
||||
|
||||
diff --git a/compiler/qmlslicer/qmlSimpleSlicer.ml b/compiler/qmlslicer/qmlSimpleSlicer.ml
|
||||
index 2eebd96b..04ce77c8 100644
|
||||
--- a/compiler/qmlslicer/qmlSimpleSlicer.ml
|
||||
+++ b/compiler/qmlslicer/qmlSimpleSlicer.ml
|
||||
@@ -17,7 +17,6 @@
|
||||
*)
|
||||
module Format = Base.Format
|
||||
module List = Base.List
|
||||
-module String = Base.String
|
||||
module Q = QmlAst
|
||||
module Package = ObjectFiles.Package
|
||||
|
||||
diff --git a/ocamllib/libbase/baseObj.mli b/ocamllib/libbase/baseObj.mli
|
||||
index da2d9736..82d72963 100644
|
||||
--- a/ocamllib/libbase/baseObj.mli
|
||||
+++ b/ocamllib/libbase/baseObj.mli
|
||||
@@ -21,7 +21,7 @@ type t = Obj.t
|
||||
external repr : 'a -> t = "%identity"
|
||||
external obj : t -> 'a = "%identity"
|
||||
external magic : 'a -> 'b = "%identity"
|
||||
-external is_block : t -> bool = "caml_obj_is_block"
|
||||
+val [@inline always] is_block : t -> bool
|
||||
external is_int : t -> bool = "%obj_is_int"
|
||||
external tag : t -> int = "caml_obj_tag"
|
||||
external set_tag : t -> int -> unit = "caml_obj_set_tag"
|
||||
diff --git a/ocamllib/libbase/baseString.ml b/ocamllib/libbase/baseString.ml
|
||||
index 640ce2fa..6931c608 100644
|
||||
--- a/ocamllib/libbase/baseString.ml
|
||||
+++ b/ocamllib/libbase/baseString.ml
|
||||
@@ -20,7 +20,7 @@
|
||||
(* depends *)
|
||||
module Char = BaseChar
|
||||
|
||||
-include Bytes
|
||||
+include String
|
||||
|
||||
let compare_int (a:int) b = Pervasives.compare a b
|
||||
|
||||
|
|
@ -1,17 +1,24 @@
|
|||
{ coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, mathcomp-real-closed,
|
||||
lib, version ? null }:
|
||||
hierarchy-builder, lib, version ? null }:
|
||||
|
||||
with lib; mkCoqDerivation {
|
||||
with lib;
|
||||
let mca = mkCoqDerivation {
|
||||
|
||||
namePrefix = [ "coq" "mathcomp" ];
|
||||
pname = "analysis";
|
||||
owner = "math-comp";
|
||||
|
||||
release."0.3.6".sha256 = "0g2j7b2hca4byz62ssgg90bkbc8wwp7xkb2d3225bbvihi92b4c5";
|
||||
release."0.3.4".sha256 = "18mgycjgg829dbr7ps77z6lcj03h3dchjbj5iir0pybxby7gd45c";
|
||||
release."0.3.3".sha256 = "1m2mxcngj368vbdb8mlr91hsygl430spl7lgyn9qmn3jykack867";
|
||||
release."0.3.1".sha256 = "1iad288yvrjv8ahl9v18vfblgqb1l5z6ax644w49w9hwxs93f2k8";
|
||||
release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966";
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (range "8.11" "8.13") "1.12.0" ]; out = "0.3.6"; }
|
||||
{ cases = [ (range "8.11" "8.13") "1.11.0" ]; out = "0.3.4"; }
|
||||
{ cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; }
|
||||
{ cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; }
|
||||
{ cases = [ (range "8.8" "8.11") (range "1.8" "1.10") ]; out = "0.2.3"; }
|
||||
] null;
|
||||
|
|
@ -25,4 +32,12 @@ with lib; mkCoqDerivation {
|
|||
maintainers = [ maintainers.cohencyril ];
|
||||
license = licenses.cecill-c;
|
||||
};
|
||||
}
|
||||
}; in
|
||||
mca.overrideAttrs (o:
|
||||
let ext = { propagatedBuildInputs = o.propagatedBuildInputs
|
||||
++ [ hierarchy-builder ]; };
|
||||
in with versions; switch o.version [
|
||||
{case = "dev"; out = ext;}
|
||||
{case = isGe "0.3.4"; out = ext;}
|
||||
] {}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ self: super: {
|
|||
name = "git-annex-${super.git-annex.version}-src";
|
||||
url = "git://git-annex.branchable.com/";
|
||||
rev = "refs/tags/" + super.git-annex.version;
|
||||
sha256 = "1lvl6i3ym7dyg215fkmslf3rnk29hz7f21jn91y1mghrhch7hvhl";
|
||||
sha256 = "1y9js3n8ml2g492nivy7gk371rdmibwydb4fwzzwbviya280akaq";
|
||||
};
|
||||
}).override {
|
||||
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
|
||||
|
|
@ -727,8 +727,19 @@ self: super: {
|
|||
# The tests spuriously fail
|
||||
libmpd = dontCheck super.libmpd;
|
||||
|
||||
# 2021-03-12: All of this libraries have to restrictive upper bounds
|
||||
# https://github.com/diagrams/diagrams-core/issues/112
|
||||
active = doJailbreak super.active;
|
||||
statestack = doJailbreak super.statestack;
|
||||
force-layout = doJailbreak super.force-layout;
|
||||
size-based = doJailbreak super.size-based;
|
||||
dual-tree = doJailbreak super.dual-tree;
|
||||
diagrams-core = doJailbreak super.diagrams-core;
|
||||
diagrams-postscript = doJailbreak super.diagrams-postscript;
|
||||
diagrams-svg = doJailbreak super.diagrams-svg;
|
||||
diagrams-contrib = doJailbreak super.diagrams-contrib;
|
||||
# https://github.com/diagrams/diagrams-lib/issues/288
|
||||
diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; });
|
||||
diagrams-lib = doJailbreak (overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; }));
|
||||
|
||||
# https://github.com/danidiaz/streaming-eversion/issues/1
|
||||
streaming-eversion = dontCheck super.streaming-eversion;
|
||||
|
|
@ -1413,17 +1424,21 @@ self: super: {
|
|||
# https://github.com/haskell/haskell-language-server/issues/611
|
||||
haskell-language-server = dontCheck super.haskell-language-server;
|
||||
|
||||
# 2021-02-11: Jailbreaking because of syntax error on bound revision
|
||||
hls-explicit-imports-plugin = doJailbreak super.hls-explicit-imports-plugin;
|
||||
# 2021-03-09: Overrides because nightly is to old for hls 1.0.0
|
||||
lsp-test = doDistribute (dontCheck self.lsp-test_0_13_0_0);
|
||||
|
||||
# 2021-02-08: Overrides because nightly is to old for hls 0.9.0
|
||||
lsp-test = doDistribute (dontCheck self.lsp-test_0_11_0_7);
|
||||
haskell-lsp = doDistribute self.haskell-lsp_0_23_0_0;
|
||||
haskell-lsp-types = doDistribute self.haskell-lsp-types_0_23_0_0;
|
||||
# 2021-03-09: Golden tests seem to be missing in hackage release:
|
||||
# https://github.com/haskell/haskell-language-server/issues/1536
|
||||
hls-tactics-plugin = dontCheck super.hls-tactics-plugin;
|
||||
|
||||
# 1. test requires internet
|
||||
# 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
|
||||
ghcide = doDistribute (unmarkBroken (dontCheck super.ghcide));
|
||||
# 2021-03-21 Test hangs
|
||||
# https://github.com/haskell/haskell-language-server/issues/1562
|
||||
ghcide = dontCheck super.ghcide;
|
||||
|
||||
# 2020-03-09: Tests broken in hackage release
|
||||
# fixed on upstream, but not released in hiedb 0.3.0.1
|
||||
# https://github.com/wz1000/HieDb/issues/30
|
||||
hiedb = dontCheck super.hiedb;
|
||||
|
||||
data-tree-print = doJailbreak super.data-tree-print;
|
||||
|
||||
|
|
@ -1515,8 +1530,25 @@ self: super: {
|
|||
# Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129
|
||||
servant-swagger = dontCheck super.servant-swagger;
|
||||
|
||||
# 2020-11-27: cxx-options is broken in Cabal 3.2.0.0
|
||||
hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0;
|
||||
hercules-ci-agent = super.hercules-ci-agent.override {
|
||||
cachix =
|
||||
# https://github.com/cachix/cachix/pull/361
|
||||
(appendPatch
|
||||
(addBuildDepend super.cachix super.hercules-ci-cnix-store)
|
||||
(pkgs.fetchpatch {
|
||||
name = "cachix-361.patch";
|
||||
url = "https://patch-diff.githubusercontent.com/raw/cachix/cachix/pull/361.patch";
|
||||
sha256 = "0wwlcpmnqmvk1css5f723dzgjvg4jr7i58ifhni5zg9h5iwycdfr";
|
||||
stripLen = 1;
|
||||
includes = ["*.cabal" "*.hs"];
|
||||
})
|
||||
);
|
||||
};
|
||||
|
||||
hercules-ci-cli = generateOptparseApplicativeCompletion "hci" (
|
||||
# See hercules-ci-optparse-applicative in non-hackage-packages.nix.
|
||||
addBuildDepend (unmarkBroken super.hercules-ci-cli) super.hercules-ci-optparse-applicative
|
||||
);
|
||||
|
||||
# 2020-12-05: http-client is fixed on too old version
|
||||
essence-of-live-coding-warp = super.essence-of-live-coding-warp.override {
|
||||
|
|
@ -1602,4 +1634,31 @@ self: super: {
|
|||
];
|
||||
});
|
||||
|
||||
# cabal-install switched to build type simple in 3.2.0.0
|
||||
# as a result, the cabal(1) man page is no longer installed
|
||||
# automatically. Instead we need to use the `cabal man`
|
||||
# command which generates the man page on the fly and
|
||||
# install it to $out/share/man/man1 ourselves in this
|
||||
# override.
|
||||
# The commit that introduced this change:
|
||||
# https://github.com/haskell/cabal/commit/91ac075930c87712eeada4305727a4fa651726e7
|
||||
cabal-install = overrideCabal super.cabal-install (old: {
|
||||
postInstall = old.postInstall + ''
|
||||
mkdir -p "$out/share/man/man1"
|
||||
"$out/bin/cabal" man --raw > "$out/share/man/man1/cabal.1"
|
||||
'';
|
||||
});
|
||||
|
||||
# while waiting for a new release: https://github.com/brendanhay/amazonka/pull/572
|
||||
amazonka = appendPatches (doJailbreak super.amazonka) [
|
||||
(pkgs.fetchpatch {
|
||||
stripLen = 1;
|
||||
url = "https://github.com/brendanhay/amazonka/commit/43ddd87b1ebd6af755b166e16336259ec025b337.patch";
|
||||
sha256 = "1x9l5xgvrh908di6whpavyp08cys11v3yn6rc21zw87xiyigdbi3";
|
||||
})
|
||||
];
|
||||
|
||||
# Test suite does not compile.
|
||||
feed = dontCheck super.feed;
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
|
|
|||
|
|
@ -50,6 +50,12 @@ self: super: {
|
|||
random = super.random_1_2_0;
|
||||
};
|
||||
|
||||
# cabal-install-parsers is written for Cabal 3.4
|
||||
cabal-install-parsers = super.cabal-install-parsers.override {
|
||||
Cabal = super.Cabal_3_4_0_0;
|
||||
base16-bytestring = super.base16-bytestring_1_0_1_0;
|
||||
};
|
||||
|
||||
# Jailbreak to fix the build.
|
||||
base-noprelude = doJailbreak super.base-noprelude;
|
||||
system-fileio = doJailbreak super.system-fileio;
|
||||
|
|
|
|||
|
|
@ -52,9 +52,15 @@ self: super: {
|
|||
haddock = self.haddock_2_23_1;
|
||||
haddock-api = self.haddock-api_2_23_1;
|
||||
|
||||
# These builds need Cabal 3.2.x.
|
||||
# These builds need newer versions of Cabal.
|
||||
cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_1_0; };
|
||||
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
|
||||
cabal-install = super.cabal-install.override {
|
||||
Cabal = super.Cabal_3_4_0_0;
|
||||
hackage-security = super.hackage-security.override { Cabal = super.Cabal_3_4_0_0; };
|
||||
# Using dontCheck to break test dependency cycles
|
||||
edit-distance = dontCheck (super.edit-distance.override { random = super.random_1_2_0; });
|
||||
random = super.random_1_2_0;
|
||||
};
|
||||
|
||||
# Ignore overly restrictive upper version bounds.
|
||||
aeson-diff = doJailbreak super.aeson-diff;
|
||||
|
|
|
|||
|
|
@ -93,4 +93,7 @@ self: super: {
|
|||
# The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x.
|
||||
unordered-containers = dontCheck super.unordered-containers;
|
||||
|
||||
# The test suite seems pretty broken.
|
||||
base64-bytestring = dontCheck super.base64-bytestring;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,15 +73,8 @@ 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
|
||||
# Don't update yet to remain compatible with haskell-language-server-0.9.0.
|
||||
- ghcide < 0.7.4
|
||||
- hls-class-plugin < 1
|
||||
- hls-explicit-imports-plugin < 0.1.0.1
|
||||
- hls-haddock-comments-plugin < 1
|
||||
- hls-plugin-api < 0.7.1.0
|
||||
- hls-retrie-plugin < 0.1.1.1
|
||||
- hls-tactics-plugin < 1
|
||||
# Stackage Nightly 2021-03-01
|
||||
|
||||
# Stackage Nightly 2021-03-12
|
||||
- abstract-deque ==0.3
|
||||
- abstract-par ==0.3.3
|
||||
- AC-Angle ==1.0
|
||||
|
|
@ -215,8 +208,8 @@ default-package-overrides:
|
|||
- amazonka-waf ==1.6.1
|
||||
- amazonka-workspaces ==1.6.1
|
||||
- amazonka-xray ==1.6.1
|
||||
- amqp ==0.20.0.1
|
||||
- amqp-utils ==0.4.5.1
|
||||
- amqp ==0.21.0
|
||||
- amqp-utils ==0.6.1.0
|
||||
- annotated-wl-pprint ==0.7.0
|
||||
- ansi-terminal ==0.10.3
|
||||
- ansi-wl-pprint ==0.6.9
|
||||
|
|
@ -229,7 +222,7 @@ default-package-overrides:
|
|||
- ap-normalize ==0.1.0.0
|
||||
- appar ==0.1.8
|
||||
- appendmap ==0.1.5
|
||||
- apply-refact ==0.9.1.0
|
||||
- apply-refact ==0.9.2.0
|
||||
- apportionment ==0.0.0.3
|
||||
- approximate ==0.3.4
|
||||
- approximate-equality ==1.1.0.2
|
||||
|
|
@ -271,7 +264,7 @@ default-package-overrides:
|
|||
- attoparsec-path ==0.0.0.1
|
||||
- audacity ==0.0.2
|
||||
- aur ==7.0.6
|
||||
- aura ==3.2.3
|
||||
- aura ==3.2.4
|
||||
- authenticate ==1.3.5
|
||||
- authenticate-oauth ==1.6.0.1
|
||||
- auto ==0.4.3.1
|
||||
|
|
@ -306,6 +299,8 @@ default-package-overrides:
|
|||
- basic-prelude ==0.7.0
|
||||
- bazel-runfiles ==0.12
|
||||
- bbdb ==0.8
|
||||
- bcp47 ==0.2.0.3
|
||||
- bcp47-orphans ==0.1.0.2
|
||||
- bcrypt ==0.0.11
|
||||
- bech32 ==1.1.0
|
||||
- bech32-th ==1.0.2
|
||||
|
|
@ -348,11 +343,11 @@ default-package-overrides:
|
|||
- blaze-bootstrap ==0.1.0.1
|
||||
- blaze-builder ==0.4.2.1
|
||||
- blaze-html ==0.9.1.2
|
||||
- blaze-markup ==0.8.2.7
|
||||
- blaze-markup ==0.8.2.8
|
||||
- blaze-svg ==0.3.6.1
|
||||
- blaze-textual ==0.2.1.0
|
||||
- bmp ==1.2.6.3
|
||||
- BNFC ==2.9.0
|
||||
- BNFC ==2.9.1
|
||||
- board-games ==0.3
|
||||
- boltzmann-samplers ==0.1.1.0
|
||||
- Boolean ==0.2.4
|
||||
|
|
@ -427,7 +422,7 @@ default-package-overrides:
|
|||
- cassava-megaparsec ==2.0.2
|
||||
- cast ==0.1.0.2
|
||||
- category ==0.2.5.0
|
||||
- cayley-client ==0.4.13
|
||||
- cayley-client ==0.4.14
|
||||
- cborg ==0.2.4.0
|
||||
- cborg-json ==0.2.2.0
|
||||
- cereal ==0.5.8.1
|
||||
|
|
@ -462,7 +457,7 @@ default-package-overrides:
|
|||
- cipher-rc4 ==0.1.4
|
||||
- circle-packing ==0.1.0.6
|
||||
- circular ==0.3.1.1
|
||||
- citeproc ==0.3.0.7
|
||||
- citeproc ==0.3.0.8
|
||||
- clash-ghc ==1.2.5
|
||||
- clash-lib ==1.2.5
|
||||
- clash-prelude ==1.2.5
|
||||
|
|
@ -525,17 +520,17 @@ default-package-overrides:
|
|||
- concurrent-split ==0.0.1.1
|
||||
- concurrent-supply ==0.1.8
|
||||
- cond ==0.4.1.1
|
||||
- conduit ==1.3.4
|
||||
- conduit ==1.3.4.1
|
||||
- conduit-algorithms ==0.0.11.0
|
||||
- conduit-combinators ==1.3.0
|
||||
- conduit-concurrent-map ==0.1.1
|
||||
- conduit-extra ==1.3.5
|
||||
- conduit-parse ==0.2.1.0
|
||||
- conduit-zstd ==0.0.2.0
|
||||
- conferer ==1.0.0.1
|
||||
- conferer-aeson ==1.0.0.0
|
||||
- conferer-hspec ==1.0.0.0
|
||||
- conferer-warp ==1.0.0.0
|
||||
- conferer ==1.1.0.0
|
||||
- conferer-aeson ==1.1.0.0
|
||||
- conferer-hspec ==1.1.0.0
|
||||
- conferer-warp ==1.1.0.0
|
||||
- ConfigFile ==1.1.4
|
||||
- config-ini ==0.2.4.0
|
||||
- configurator ==0.3.0.0
|
||||
|
|
@ -547,7 +542,7 @@ default-package-overrides:
|
|||
- constraint ==0.1.4.0
|
||||
- constraints ==0.12
|
||||
- constraint-tuples ==0.1.2
|
||||
- construct ==0.3
|
||||
- construct ==0.3.0.1
|
||||
- contravariant ==1.5.3
|
||||
- contravariant-extras ==0.3.5.2
|
||||
- control-bool ==0.2.1
|
||||
|
|
@ -658,7 +653,7 @@ default-package-overrides:
|
|||
- declarative ==0.5.4
|
||||
- deepseq-generics ==0.2.0.0
|
||||
- deepseq-instances ==0.1.0.1
|
||||
- deferred-folds ==0.9.16
|
||||
- deferred-folds ==0.9.17
|
||||
- dejafu ==2.4.0.1
|
||||
- dense-linear-algebra ==0.1.0.0
|
||||
- depq ==0.4.1.0
|
||||
|
|
@ -700,6 +695,7 @@ default-package-overrides:
|
|||
- doctemplates ==0.9
|
||||
- doctest ==0.16.3
|
||||
- doctest-discover ==0.2.0.0
|
||||
- doctest-driver-gen ==0.3.0.3
|
||||
- doctest-exitcode-stdio ==0.0
|
||||
- doctest-lib ==0.1
|
||||
- doldol ==0.4.1.2
|
||||
|
|
@ -815,6 +811,7 @@ default-package-overrides:
|
|||
- fakedata-parser ==0.1.0.0
|
||||
- fakefs ==0.3.0.2
|
||||
- fakepull ==0.3.0.2
|
||||
- faktory ==1.0.2.1
|
||||
- fast-digits ==0.3.0.0
|
||||
- fast-logger ==3.0.3
|
||||
- fast-math ==1.0.2
|
||||
|
|
@ -823,7 +820,7 @@ default-package-overrides:
|
|||
- feature-flags ==0.1.0.1
|
||||
- fedora-dists ==1.1.2
|
||||
- fedora-haskell-tools ==0.9
|
||||
- feed ==1.3.0.1
|
||||
- feed ==1.3.2.0
|
||||
- FenwickTree ==0.1.2.1
|
||||
- fft ==0.1.8.6
|
||||
- fgl ==5.7.0.3
|
||||
|
|
@ -840,7 +837,7 @@ default-package-overrides:
|
|||
- FindBin ==0.0.5
|
||||
- fingertree ==0.1.4.2
|
||||
- finite-typelits ==0.1.4.2
|
||||
- first-class-families ==0.8.0.0
|
||||
- first-class-families ==0.8.0.1
|
||||
- first-class-patterns ==0.3.2.5
|
||||
- fitspec ==0.4.8
|
||||
- fixed ==0.3
|
||||
|
|
@ -916,6 +913,7 @@ default-package-overrides:
|
|||
- generic-optics ==2.0.0.0
|
||||
- GenericPretty ==1.2.2
|
||||
- generic-random ==1.3.0.1
|
||||
- generics-eot ==0.4.0.1
|
||||
- generics-sop ==0.5.1.1
|
||||
- generics-sop-lens ==0.2.0.1
|
||||
- geniplate-mirror ==0.7.7
|
||||
|
|
@ -934,8 +932,14 @@ default-package-overrides:
|
|||
- genvalidity-mergeful ==0.2.0.0
|
||||
- genvalidity-mergeless ==0.2.0.0
|
||||
- genvalidity-path ==0.3.0.4
|
||||
- genvalidity-persistent ==0.0.0.0
|
||||
- genvalidity-property ==0.5.0.1
|
||||
- genvalidity-scientific ==0.2.1.1
|
||||
- genvalidity-sydtest ==0.0.0.0
|
||||
- genvalidity-sydtest-aeson ==0.0.0.0
|
||||
- genvalidity-sydtest-hashable ==0.0.0.0
|
||||
- genvalidity-sydtest-lens ==0.0.0.0
|
||||
- genvalidity-sydtest-persistent ==0.0.0.1
|
||||
- genvalidity-text ==0.7.0.2
|
||||
- genvalidity-time ==0.3.0.0
|
||||
- genvalidity-typed-uuid ==0.0.0.2
|
||||
|
|
@ -1006,7 +1010,7 @@ default-package-overrides:
|
|||
- gluturtle ==0.0.58.1
|
||||
- gnuplot ==0.5.6.1
|
||||
- google-isbn ==1.0.3
|
||||
- gothic ==0.1.5
|
||||
- gothic ==0.1.6
|
||||
- gpolyline ==0.1.0.1
|
||||
- graph-core ==0.3.0.0
|
||||
- graphite ==0.10.0.1
|
||||
|
|
@ -1028,9 +1032,9 @@ default-package-overrides:
|
|||
- hackage-db ==2.1.0
|
||||
- hackage-security ==0.6.0.1
|
||||
- haddock-library ==1.9.0
|
||||
- hadolint ==1.22.1
|
||||
- hadolint ==1.23.0
|
||||
- hadoop-streaming ==0.2.0.3
|
||||
- hakyll-convert ==0.3.0.3
|
||||
- hakyll-convert ==0.3.0.4
|
||||
- half ==0.3.1
|
||||
- hall-symbols ==0.1.0.6
|
||||
- hamtsolo ==1.0.3
|
||||
|
|
@ -1074,7 +1078,7 @@ default-package-overrides:
|
|||
- hdaemonize ==0.5.6
|
||||
- HDBC ==2.4.0.3
|
||||
- HDBC-session ==0.1.2.0
|
||||
- headroom ==0.3.2.0
|
||||
- headroom ==0.4.0.0
|
||||
- heap ==1.0.4
|
||||
- heaps ==0.3.6.1
|
||||
- hebrew-time ==0.1.2
|
||||
|
|
@ -1109,7 +1113,7 @@ default-package-overrides:
|
|||
- hlibcpuid ==0.2.0
|
||||
- hlibgit2 ==0.18.0.16
|
||||
- hlibsass ==0.1.10.1
|
||||
- hmatrix ==0.20.1
|
||||
- hmatrix ==0.20.2
|
||||
- hmatrix-backprop ==0.1.3.0
|
||||
- hmatrix-gsl ==0.19.0.1
|
||||
- hmatrix-gsl-stats ==0.4.1.8
|
||||
|
|
@ -1163,6 +1167,7 @@ default-package-overrides:
|
|||
- hspec-core ==2.7.8
|
||||
- hspec-discover ==2.7.8
|
||||
- hspec-expectations ==0.8.2
|
||||
- hspec-expectations-json ==1.0.0.2
|
||||
- hspec-expectations-lifted ==0.10.0
|
||||
- hspec-expectations-pretty-diff ==0.7.2.5
|
||||
- hspec-golden ==0.1.0.3
|
||||
|
|
@ -1274,7 +1279,7 @@ default-package-overrides:
|
|||
- immortal-queue ==0.1.0.1
|
||||
- inbox ==0.1.0
|
||||
- include-file ==0.1.0.4
|
||||
- incremental-parser ==0.5.0.1
|
||||
- incremental-parser ==0.5.0.2
|
||||
- indents ==0.5.0.1
|
||||
- indexed ==0.1.3
|
||||
- indexed-containers ==0.1.0.2
|
||||
|
|
@ -1290,7 +1295,7 @@ default-package-overrides:
|
|||
- inline-c-cpp ==0.4.0.3
|
||||
- inline-r ==0.10.4
|
||||
- inliterate ==0.1.0
|
||||
- input-parsers ==0.1.0.1
|
||||
- input-parsers ==0.2.1
|
||||
- insert-ordered-containers ==0.2.4
|
||||
- inspection-testing ==0.4.3.0
|
||||
- instance-control ==0.1.2.0
|
||||
|
|
@ -1317,7 +1322,7 @@ default-package-overrides:
|
|||
- io-streams ==1.5.2.0
|
||||
- io-streams-haproxy ==1.0.1.0
|
||||
- ip6addr ==1.0.1
|
||||
- iproute ==1.7.10
|
||||
- iproute ==1.7.11
|
||||
- IPv6Addr ==1.1.5
|
||||
- ipynb ==0.1.0.1
|
||||
- ipython-kernel ==0.10.2.1
|
||||
|
|
@ -1546,16 +1551,16 @@ default-package-overrides:
|
|||
- mixed-types-num ==0.4.1
|
||||
- mltool ==0.2.0.1
|
||||
- mmap ==0.5.9
|
||||
- mmark ==0.0.7.2
|
||||
- mmark ==0.0.7.3
|
||||
- mmark-cli ==0.0.5.0
|
||||
- mmark-ext ==0.2.1.2
|
||||
- mmark-ext ==0.2.1.3
|
||||
- mmorph ==1.1.5
|
||||
- mnist-idx ==0.1.2.8
|
||||
- mockery ==0.3.5
|
||||
- mock-time ==0.1.0
|
||||
- mod ==0.1.2.1
|
||||
- model ==0.5
|
||||
- modern-uri ==0.3.4.0
|
||||
- modern-uri ==0.3.4.1
|
||||
- modular ==0.1.0.8
|
||||
- monad-chronicle ==1.0.0.1
|
||||
- monad-control ==1.0.2.3
|
||||
|
|
@ -1673,8 +1678,9 @@ default-package-overrides:
|
|||
- no-value ==1.0.0.0
|
||||
- nowdoc ==0.1.1.0
|
||||
- nqe ==0.6.3
|
||||
- nri-env-parser ==0.1.0.4
|
||||
- nri-prelude ==0.4.0.0
|
||||
- nri-env-parser ==0.1.0.5
|
||||
- nri-observability ==0.1.0.0
|
||||
- nri-prelude ==0.5.0.0
|
||||
- nsis ==0.3.3
|
||||
- numbers ==3000.2.0.2
|
||||
- numeric-extras ==0.1
|
||||
|
|
@ -1690,7 +1696,7 @@ default-package-overrides:
|
|||
- ObjectName ==1.1.0.1
|
||||
- o-clock ==1.2.0.1
|
||||
- odbc ==0.2.2
|
||||
- oeis2 ==1.0.4
|
||||
- oeis2 ==1.0.5
|
||||
- ofx ==0.4.4.0
|
||||
- old-locale ==1.0.0.7
|
||||
- old-time ==1.1.0.3
|
||||
|
|
@ -1702,7 +1708,7 @@ default-package-overrides:
|
|||
- oo-prototypes ==0.1.0.0
|
||||
- opaleye ==0.7.1.0
|
||||
- OpenAL ==1.7.0.5
|
||||
- openapi3 ==3.0.1.0
|
||||
- openapi3 ==3.0.2.0
|
||||
- open-browser ==0.2.1.0
|
||||
- openexr-write ==0.1.0.2
|
||||
- OpenGL ==3.0.3.0
|
||||
|
|
@ -1733,10 +1739,10 @@ default-package-overrides:
|
|||
- packcheck ==0.5.1
|
||||
- packdeps ==0.6.0.0
|
||||
- pager ==0.1.1.0
|
||||
- pagination ==0.2.1
|
||||
- pagination ==0.2.2
|
||||
- pagure-cli ==0.2
|
||||
- pandoc ==2.11.4
|
||||
- pandoc-plot ==1.0.2.1
|
||||
- pandoc-plot ==1.1.0
|
||||
- pandoc-types ==1.22
|
||||
- pantry ==0.5.1.4
|
||||
- parallel ==3.2.2.0
|
||||
|
|
@ -1907,7 +1913,7 @@ default-package-overrides:
|
|||
- pureMD5 ==2.1.3
|
||||
- purescript-bridge ==0.14.0.0
|
||||
- pushbullet-types ==0.4.1.0
|
||||
- pusher-http-haskell ==2.0.0.3
|
||||
- pusher-http-haskell ==2.1.0.0
|
||||
- pvar ==1.0.0.0
|
||||
- PyF ==0.9.0.3
|
||||
- qchas ==1.1.0.1
|
||||
|
|
@ -1968,7 +1974,7 @@ default-package-overrides:
|
|||
- read-editor ==0.1.0.2
|
||||
- read-env-var ==1.0.0.0
|
||||
- rebase ==1.6.1
|
||||
- record-dot-preprocessor ==0.2.9
|
||||
- record-dot-preprocessor ==0.2.10
|
||||
- record-hasfield ==1.0
|
||||
- records-sop ==0.1.0.3
|
||||
- record-wrangler ==0.1.1.0
|
||||
|
|
@ -2042,6 +2048,7 @@ default-package-overrides:
|
|||
- runmemo ==1.0.0.1
|
||||
- rvar ==0.2.0.6
|
||||
- safe ==0.3.19
|
||||
- safe-coloured-text ==0.0.0.0
|
||||
- safecopy ==0.10.4.1
|
||||
- safe-decimal ==0.2.0.0
|
||||
- safe-exceptions ==0.1.7.1
|
||||
|
|
@ -2095,7 +2102,7 @@ default-package-overrides:
|
|||
- seqalign ==0.2.0.4
|
||||
- seqid ==0.6.2
|
||||
- seqid-streams ==0.7.2
|
||||
- sequence-formats ==1.6.0
|
||||
- sequence-formats ==1.6.1
|
||||
- sequenceTools ==1.4.0.5
|
||||
- serf ==0.1.1.0
|
||||
- serialise ==0.2.3.0
|
||||
|
|
@ -2216,7 +2223,7 @@ default-package-overrides:
|
|||
- squeal-postgresql ==0.7.0.1
|
||||
- squeather ==0.6.0.0
|
||||
- srcloc ==0.5.1.2
|
||||
- stache ==2.2.0
|
||||
- stache ==2.2.1
|
||||
- stackcollapse-ghc ==0.0.1.3
|
||||
- stack-templatizer ==0.1.0.2
|
||||
- stateref ==0.3
|
||||
|
|
@ -2265,14 +2272,14 @@ default-package-overrides:
|
|||
- string-random ==0.1.4.0
|
||||
- stringsearch ==0.3.6.6
|
||||
- string-transform ==1.1.1
|
||||
- stripe-concepts ==1.0.2.4
|
||||
- stripe-concepts ==1.0.2.6
|
||||
- stripe-core ==2.6.2
|
||||
- stripe-haskell ==2.6.2
|
||||
- stripe-http-client ==2.6.2
|
||||
- stripe-tests ==2.6.2
|
||||
- strive ==5.0.13
|
||||
- structs ==0.1.5
|
||||
- structured ==0.1
|
||||
- structured ==0.1.0.1
|
||||
- structured-cli ==2.6.0.0
|
||||
- subcategories ==0.1.0.0
|
||||
- sum-type-boilerplate ==0.1.1
|
||||
|
|
@ -2284,6 +2291,12 @@ default-package-overrides:
|
|||
- sweet-egison ==0.1.1.3
|
||||
- swish ==0.10.0.4
|
||||
- syb ==0.7.2.1
|
||||
- sydtest ==0.1.0.0
|
||||
- sydtest-discover ==0.0.0.0
|
||||
- sydtest-persistent-sqlite ==0.0.0.0
|
||||
- sydtest-servant ==0.0.0.0
|
||||
- sydtest-wai ==0.0.0.0
|
||||
- sydtest-yesod ==0.0.0.0
|
||||
- symbol ==0.2.4
|
||||
- symengine ==0.1.2.0
|
||||
- symmetry-operations-symbols ==0.0.2.1
|
||||
|
|
@ -2531,13 +2544,14 @@ default-package-overrides:
|
|||
- utility-ht ==0.0.15
|
||||
- uuid ==1.3.14
|
||||
- uuid-types ==1.0.4
|
||||
- validation ==1.1
|
||||
- validation ==1.1.1
|
||||
- validation-selective ==0.1.0.0
|
||||
- validity ==0.11.0.0
|
||||
- validity-aeson ==0.2.0.4
|
||||
- validity-bytestring ==0.4.1.1
|
||||
- validity-containers ==0.5.0.4
|
||||
- validity-path ==0.4.0.1
|
||||
- validity-persistent ==0.0.0.0
|
||||
- validity-primitive ==0.0.0.1
|
||||
- validity-scientific ==0.2.0.3
|
||||
- validity-text ==0.3.1.1
|
||||
|
|
@ -2669,16 +2683,17 @@ default-package-overrides:
|
|||
- xss-sanitize ==0.3.6
|
||||
- xxhash-ffi ==0.2.0.0
|
||||
- yaml ==0.11.5.0
|
||||
- yamlparse-applicative ==0.1.0.2
|
||||
- yamlparse-applicative ==0.1.0.3
|
||||
- yesod ==1.6.1.0
|
||||
- yesod-auth ==1.6.10.1
|
||||
- yesod-auth-hashdb ==1.7.1.5
|
||||
- yesod-auth-oauth2 ==0.6.1.7
|
||||
- yesod-auth-oauth2 ==0.6.2.3
|
||||
- yesod-bin ==1.6.1
|
||||
- yesod-core ==1.6.18.8
|
||||
- yesod-fb ==0.6.1
|
||||
- yesod-form ==1.6.7
|
||||
- yesod-gitrev ==0.2.1
|
||||
- yesod-markdown ==0.12.6.6
|
||||
- yesod-newsfeed ==1.7.0.0
|
||||
- yesod-page-cursor ==2.0.0.4
|
||||
- yesod-paginator ==1.1.1.0
|
||||
|
|
@ -2790,8 +2805,12 @@ package-maintainers:
|
|||
roberth:
|
||||
- arion-compose
|
||||
- hercules-ci-agent
|
||||
- hercules-ci-api
|
||||
- hercules-ci-api-agent
|
||||
- hercules-ci-api-core
|
||||
- hercules-ci-cli
|
||||
- hercules-ci-cnix-expr
|
||||
- hercules-ci-cnix-store
|
||||
cdepillabout:
|
||||
- pretty-simple
|
||||
- spago
|
||||
|
|
@ -2807,6 +2826,7 @@ package-maintainers:
|
|||
- releaser
|
||||
- taskwarrior
|
||||
- haskell-language-server
|
||||
- shake-bench
|
||||
sorki:
|
||||
- cayene-lpp
|
||||
- data-stm32
|
||||
|
|
@ -3070,7 +3090,6 @@ broken-packages:
|
|||
- acme-zero
|
||||
- acousticbrainz-client
|
||||
- ActionKid
|
||||
- active
|
||||
- activehs
|
||||
- activehs-base
|
||||
- activitypub
|
||||
|
|
@ -3181,7 +3200,6 @@ broken-packages:
|
|||
- amazon-emailer
|
||||
- amazon-emailer-client-snap
|
||||
- amazon-products
|
||||
- amazonka
|
||||
- amazonka-s3-streaming
|
||||
- amby
|
||||
- AMI
|
||||
|
|
@ -3837,7 +3855,6 @@ broken-packages:
|
|||
- cabal-install-bundle
|
||||
- cabal-install-ghc72
|
||||
- cabal-install-ghc74
|
||||
- cabal-install-parsers
|
||||
- cabal-lenses
|
||||
- cabal-meta
|
||||
- cabal-mon
|
||||
|
|
@ -3988,7 +4005,6 @@ broken-packages:
|
|||
- character-cases
|
||||
- charade
|
||||
- chart-cli
|
||||
- Chart-diagrams
|
||||
- Chart-fltkhs
|
||||
- chart-histogram
|
||||
- Chart-simple
|
||||
|
|
@ -4679,27 +4695,21 @@ broken-packages:
|
|||
- dhrun
|
||||
- dia-base
|
||||
- dia-functions
|
||||
- diagrams
|
||||
- diagrams-boolean
|
||||
- diagrams-braille
|
||||
- diagrams-builder
|
||||
- diagrams-cairo
|
||||
- diagrams-canvas
|
||||
- diagrams-contrib
|
||||
- diagrams-core
|
||||
- diagrams-graphviz
|
||||
- diagrams-gtk
|
||||
- diagrams-haddock
|
||||
- diagrams-html5
|
||||
- diagrams-lib
|
||||
- diagrams-pandoc
|
||||
- diagrams-pdf
|
||||
- diagrams-pgf
|
||||
- diagrams-postscript
|
||||
- diagrams-qrcode
|
||||
- diagrams-rasterific
|
||||
- diagrams-rubiks-cube
|
||||
- diagrams-svg
|
||||
- diagrams-tikz
|
||||
- diagrams-wx
|
||||
- dib
|
||||
|
|
@ -4807,7 +4817,6 @@ broken-packages:
|
|||
- docrecords
|
||||
- DocTest
|
||||
- doctest-discover-configurator
|
||||
- doctest-driver-gen
|
||||
- doctest-prop
|
||||
- docusign-base
|
||||
- docusign-base-minimal
|
||||
|
|
@ -4870,7 +4879,6 @@ broken-packages:
|
|||
- dtd
|
||||
- dtd-text
|
||||
- dtw
|
||||
- dual-tree
|
||||
- dualizer
|
||||
- duet
|
||||
- dumb-cas
|
||||
|
|
@ -5151,8 +5159,6 @@ broken-packages:
|
|||
- FailureT
|
||||
- fake
|
||||
- fake-type
|
||||
- fakedata
|
||||
- fakedata-quickcheck
|
||||
- faktory
|
||||
- falling-turnip
|
||||
- fallingblocks
|
||||
|
|
@ -5344,7 +5350,6 @@ broken-packages:
|
|||
- foo
|
||||
- for-free
|
||||
- forbidden-fruit
|
||||
- force-layout
|
||||
- fordo
|
||||
- forecast-io
|
||||
- foreign-var
|
||||
|
|
@ -6454,7 +6459,6 @@ broken-packages:
|
|||
- hid-examples
|
||||
- hidden-char
|
||||
- hie-core
|
||||
- hiedb
|
||||
- hieraclus
|
||||
- hierarchical-clustering-diagrams
|
||||
- hierarchical-exceptions
|
||||
|
|
@ -8165,7 +8169,6 @@ broken-packages:
|
|||
- Monocle
|
||||
- monoid
|
||||
- monoid-absorbing
|
||||
- monoid-extras
|
||||
- monoid-owns
|
||||
- monoidplus
|
||||
- monoids
|
||||
|
|
@ -10002,6 +10005,7 @@ broken-packages:
|
|||
- sha1
|
||||
- shade
|
||||
- shadower
|
||||
- shake-bench
|
||||
- shake-bindist
|
||||
- shake-cabal-build
|
||||
- shake-dhall
|
||||
|
|
@ -10115,7 +10119,6 @@ broken-packages:
|
|||
- sirkel
|
||||
- sitepipe
|
||||
- sixfiguregroup
|
||||
- size-based
|
||||
- sized-grid
|
||||
- sized-types
|
||||
- sized-vector
|
||||
|
|
@ -10395,7 +10398,6 @@ broken-packages:
|
|||
- state-plus
|
||||
- state-record
|
||||
- stateful-mtl
|
||||
- statestack
|
||||
- static-canvas
|
||||
- static-closure
|
||||
- static-tensor
|
||||
|
|
@ -10484,7 +10486,6 @@ broken-packages:
|
|||
- strictly
|
||||
- string-isos
|
||||
- string-quote
|
||||
- string-random
|
||||
- string-typelits
|
||||
- stringlike
|
||||
- stringtable-atom
|
||||
|
|
@ -10542,12 +10543,10 @@ broken-packages:
|
|||
- sv-svfactor
|
||||
- SVD2HS
|
||||
- svfactor
|
||||
- svg-builder
|
||||
- svg-builder-fork
|
||||
- SVG2Q
|
||||
- svg2q
|
||||
- svgcairo
|
||||
- SVGFonts
|
||||
- svgone
|
||||
- svgutils
|
||||
- svm-light-utils
|
||||
|
|
@ -10746,7 +10745,6 @@ broken-packages:
|
|||
- testbench
|
||||
- testCom
|
||||
- testcontainers
|
||||
- testing-feat
|
||||
- testloop
|
||||
- testpack
|
||||
- testpattern
|
||||
|
|
|
|||
|
|
@ -446,9 +446,6 @@ self: super: builtins.intersectAttrs super {
|
|||
# requires an X11 display in test suite
|
||||
gi-gtk-declarative = dontCheck super.gi-gtk-declarative;
|
||||
|
||||
# depends on 'hie' executable
|
||||
lsp-test = dontCheck super.lsp-test;
|
||||
|
||||
# tests depend on executable
|
||||
ghcide = overrideCabal super.ghcide (drv: {
|
||||
preCheck = ''export PATH="$PWD/dist/build/ghcide:$PATH"'';
|
||||
|
|
@ -812,4 +809,11 @@ self: super: builtins.intersectAttrs super {
|
|||
# hadolint enables static linking by default in the cabal file, so we have to explicitly disable it.
|
||||
# https://github.com/hadolint/hadolint/commit/e1305042c62d52c2af4d77cdce5d62f6a0a3ce7b
|
||||
hadolint = disableCabalFlag super.hadolint "static";
|
||||
|
||||
# Test suite tries to execute the build product "doctest-driver-gen", but it's not in $PATH.
|
||||
doctest-driver-gen = dontCheck super.doctest-driver-gen;
|
||||
|
||||
# Tests access internet
|
||||
prune-juice = dontCheck super.prune-juice;
|
||||
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -28,4 +28,8 @@ self: super: {
|
|||
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 {};
|
||||
|
||||
# Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth
|
||||
# cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
|
||||
hercules-ci-optparse-applicative = self.callPackage ../misc/haskell/hercules-ci-optparse-applicative.nix {};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "evcxr";
|
||||
version = "0.7.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "evcxr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-33XeepqwYmTMcObroPTuxykYuM9qYI1+LV5lZIFSomg=";
|
||||
sha256 = "sha256-5YbvPDyGaoKPelLep2tVica08SI7Cyo9SLMnE6dmWe4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-tjCID3YeGkxcq/LqJDMHGNpv1MCXKtcLlDnNkFwx1zU=";
|
||||
cargoSha256 = "sha256-hqVmNBrvagqhGPWTaBXuY8lULolWIoR5ovEhH5k1tz4=";
|
||||
|
||||
RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ jruby = stdenv.mkDerivation rec {
|
|||
|
||||
for i in $out/bin/jruby{,.bash}; do
|
||||
wrapProgram $i \
|
||||
--set JAVA_HOME ${jre}
|
||||
--set JAVA_HOME ${jre.home}
|
||||
done
|
||||
|
||||
ln -s $out/bin/jruby $out/bin/ruby
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mujs";
|
||||
version = "1.0.7";
|
||||
version = "1.0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mujs.com/downloads/mujs-${version}.tar.xz";
|
||||
sha256 = "1ilhay15z4k7mlzs6g2d00snivin7vp72dfw5wwpmc0x70jr31l2";
|
||||
sha256 = "sha256-zKjWafQtO2OEPelF370s5KkArbT+gQv3lQQpYdGw6HY=";
|
||||
};
|
||||
|
||||
buildInputs = [ readline ];
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ let
|
|||
# - If you run:
|
||||
# ruby -e "puts RbConfig::CONFIG['configure_args']"
|
||||
# - In:
|
||||
# $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb
|
||||
# $out/${passthru.libPath}/${stdenv.hostPlatform.system}/rbconfig.rb
|
||||
# Or (usually):
|
||||
# $(nix-build -A ruby)/lib/ruby/2.6.0/x86_64-linux/rbconfig.rb
|
||||
# - In $out/lib/libruby.so and/or $out/lib/libruby.dylib
|
||||
|
|
@ -177,7 +177,7 @@ let
|
|||
$out/lib/libruby*
|
||||
${removeReferencesTo}/bin/remove-references-to \
|
||||
-t ${stdenv.cc} \
|
||||
$out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb
|
||||
$out/${passthru.libPath}/${stdenv.hostPlatform.system}/rbconfig.rb
|
||||
''
|
||||
}
|
||||
# Bundler tries to create this directory
|
||||
|
|
@ -189,7 +189,7 @@ let
|
|||
addRubyLibPath() {
|
||||
addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby
|
||||
addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}
|
||||
addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}/${stdenv.targetPlatform.system}
|
||||
addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}/${stdenv.hostPlatform.system}
|
||||
}
|
||||
|
||||
addEnvHooks "$hostOffset" addGemPath
|
||||
|
|
|
|||
|
|
@ -1,14 +1,21 @@
|
|||
{ lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, mpir
|
||||
, gmp
|
||||
, mpfr
|
||||
, flint
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arb";
|
||||
version = "2.17.0";
|
||||
version = "2.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fredrik-johansson";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1";
|
||||
sha256 = "sha256-J/LQVZ8gmssazE7ru89EtvW6cVjaLEHgUHuwjW1nuOE=";
|
||||
};
|
||||
|
||||
buildInputs = [ mpir gmp mpfr flint ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, autoreconfHook
|
||||
, docbook_xml_dtd_412
|
||||
, docbook_xml_dtd_45
|
||||
, docbook-xsl-nons
|
||||
, which
|
||||
|
|
@ -53,14 +52,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flatpak";
|
||||
version = "1.10.1";
|
||||
version = "1.10.2";
|
||||
|
||||
# TODO: split out lib once we figure out what to do with triggerdir
|
||||
outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1dywvfpmszvp2wy5hvpzy8z6gz2gzmi9p302njp52p9vpx14ydf1";
|
||||
sha256 = "sha256-2xUnOdBy+P8pnk6IjYljobRTjaexDguGUlvkOPLh3eQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -105,9 +104,6 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
libxml2
|
||||
# Remove 4.1.2 again once the following is merged
|
||||
# https://github.com/flatpak/flatpak/pull/4102
|
||||
docbook_xml_dtd_412
|
||||
docbook_xml_dtd_45
|
||||
docbook-xsl-nons
|
||||
which
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-media-driver";
|
||||
version = "21.1.1";
|
||||
version = "21.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "media-driver";
|
||||
rev = "intel-media-${version}";
|
||||
sha256 = "1cgmpy2wqhv8zljz73wm4rggpk9w1prpmab5qphfp7ljajfv7k8r";
|
||||
sha256 = "17g9xilcrpmkn6higgpvd9bly1h61xxyp1kx9zwl6rgzs2pryby2";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgdata";
|
||||
version = "0.18.0";
|
||||
version = "0.18.1";
|
||||
|
||||
outputs = [ "out" "dev" "installedTests" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "8MIBEvpTcrYsASVvJorvUTGhYd/COGjzk+z3uLN1JYA=";
|
||||
sha256 = "3YWS7rZRKtCoz1yL6McudvdL/msj5N2T8HVu4HFoBMc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liblouis";
|
||||
version = "3.16.1";
|
||||
version = "3.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liblouis";
|
||||
repo = "liblouis";
|
||||
rev = "v${version}";
|
||||
sha256 = "0q9ixy8cjgd2d2lzxgkfd4chzr5j1bz783mg10pnwviyg6k630m5";
|
||||
sha256 = "sha256-rcySznUeoiUZnyVAmg/oYkUkLrZhBI8FEtiff0eHa+k=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" "info" "doc" ];
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ let
|
|||
"-DLWS_WITH_PLUGINS=ON"
|
||||
"-DLWS_WITH_IPV6=ON"
|
||||
"-DLWS_WITH_SOCKS5=ON"
|
||||
];
|
||||
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON";
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable";
|
||||
|
||||
|
|
@ -35,6 +35,7 @@ let
|
|||
# Relicensed from LGPLv2.1+ to MIT with 4.0. Licensing situation
|
||||
# is tricky, see https://github.com/warmcat/libwebsockets/blob/main/LICENSE
|
||||
license = with licenses; [ mit publicDomain bsd3 asl20 ];
|
||||
maintainers = with maintainers; [ mindavi ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -37,6 +37,6 @@ mkDerivation rec {
|
|||
description = "Free and modular front-end framework for developing fast and compelling user experiences";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
broken = lib.versionOlder qtbase.version "5.14.0";
|
||||
broken = versionOlder qtbase.version "5.14.0";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
assert !cudaSupport || cudatoolkit != null;
|
||||
|
||||
let
|
||||
version = "4.0.5";
|
||||
version = "4.1.0";
|
||||
|
||||
cudatoolkit_joined = symlinkJoin {
|
||||
name = "${cudatoolkit.name}-unsplit";
|
||||
|
|
@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = with lib.versions; fetchurl {
|
||||
url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
|
||||
sha256 = "02f0r9d3xgs08svkmj8v7lzviyxqnkk4yd3z0wql550xnriki3y5";
|
||||
sha256 = "sha256-c4Zvt3CQgZtqjIXLhTljjTfWh3RVglt04onWR6Of1bU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -4,18 +4,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rankwidth";
|
||||
version = "0.7";
|
||||
version = "0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sageupstream/rw/rw-${version}.tar.gz";
|
||||
sha256 = "1rv2v42x2506x7f10349m1wpmmfxrv9l032bkminni2gbip9cjg0";
|
||||
sha256 = "sha256-weA1Bv4lzfy0KMBR/Fay0q/7Wwb7o/LOdWYxRmvvtEE=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
"--enable-executable=no" # no igraph dependency
|
||||
];
|
||||
|
||||
# check phase is empty for now (as of version 0.7)
|
||||
# check phase is empty for now (as of version 0.9)
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue