Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
317651b872
1
.github/STALE-BOT.md
vendored
1
.github/STALE-BOT.md
vendored
|
|
@ -1,6 +1,7 @@
|
|||
# Stale bot information
|
||||
|
||||
- Thanks for your contribution!
|
||||
- Our stale bot will never close an issue or PR.
|
||||
- To remove the stale label, just leave a new comment.
|
||||
- _How to find the right people to ping?_ → [`git blame`](https://git-scm.com/docs/git-blame) to the rescue! (or GitHub's history and blame buttons.)
|
||||
- You can always ask for help on [our Discourse Forum](https://discourse.nixos.org/), [our Matrix room](https://matrix.to/#/#nix:nixos.org), or on the [#nixos IRC channel](https://web.libera.chat/#nixos).
|
||||
|
|
|
|||
3
.github/stale.yml
vendored
3
.github/stale.yml
vendored
|
|
@ -5,6 +5,5 @@ exemptLabels:
|
|||
- "1.severity: security"
|
||||
- "2.status: never-stale"
|
||||
staleLabel: "2.status: stale"
|
||||
markComment: |
|
||||
I marked this as stale due to inactivity. → [More info](https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md)
|
||||
markComment: false
|
||||
closeComment: false
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ rec {
|
|||
isi686 = { cpu = cpuTypes.i686; };
|
||||
isx86_32 = { cpu = { family = "x86"; bits = 32; }; };
|
||||
isx86_64 = { cpu = { family = "x86"; bits = 64; }; };
|
||||
isPowerPC = { cpu = cpuTypes.powerpc; };
|
||||
isPower = { cpu = { family = "power"; }; };
|
||||
isPower64 = { cpu = { family = "power"; bits = 64; }; };
|
||||
isx86 = { cpu = { family = "x86"; }; };
|
||||
|
|
|
|||
|
|
@ -5504,6 +5504,12 @@
|
|||
githubId = 37965;
|
||||
name = "Léo Stefanesco";
|
||||
};
|
||||
infinidoge = {
|
||||
name = "Infinidoge";
|
||||
email = "infinidoge@inx.moe";
|
||||
github = "Infinidoge";
|
||||
githubId = 22727114;
|
||||
};
|
||||
infinisil = {
|
||||
email = "contact@infinisil.com";
|
||||
matrix = "@infinisil:matrix.org";
|
||||
|
|
@ -14010,6 +14016,12 @@
|
|||
githubId = 7040031;
|
||||
name = "Yannik Sander";
|
||||
};
|
||||
yureien = {
|
||||
email = "contact@sohamsen.me";
|
||||
github = "Yureien";
|
||||
githubId = 17357089;
|
||||
name = "Soham Sen";
|
||||
};
|
||||
yuriaisaka = {
|
||||
email = "yuri.aisaka+nix@gmail.com";
|
||||
github = "yuriaisaka";
|
||||
|
|
|
|||
|
|
@ -2670,6 +2670,14 @@ cp /var/lib/redis/dump.rdb "/var/lib/redis-mastodon/dump.rdb"
|
|||
like <literal>firefox</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The default <literal>scribus</literal> version is now 1.5,
|
||||
while version 1.4 is still available as
|
||||
<literal>scribus_1_4</literal>
|
||||
(<link xlink:href="https://github.com/NixOS/nixpkgs/pull/172700">#172700</link>).
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The Nextcloud module now supports to create a Mysql database
|
||||
|
|
|
|||
|
|
@ -43,15 +43,16 @@
|
|||
<itemizedlist spacing="compact">
|
||||
<listitem>
|
||||
<para>
|
||||
Please remove this line when you add the first item since
|
||||
docbook requires the section to be non-empty
|
||||
<link xlink:href="https://github.com/jollheef/appvm">appvm</link>,
|
||||
Nix based app VMs. Available as
|
||||
<link xlink:href="options.html#opt-virtualisation.appvm.enable">virtualisation.appvm</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.11-incompatibilities">
|
||||
<title>Backward Incompatibilities</title>
|
||||
<itemizedlist spacing="compact">
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>isCompatible</literal> predicate checking CPU
|
||||
|
|
@ -69,6 +70,21 @@
|
|||
compatible</emphasis>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>isPowerPC</literal> predicate, found on
|
||||
<literal>platform</literal> attrsets
|
||||
(<literal>hostPlatform</literal>,
|
||||
<literal>buildPlatform</literal>,
|
||||
<literal>targetPlatform</literal>, etc) has been removed in
|
||||
order to reduce confusion. The predicate was was defined such
|
||||
that it matches only the 32-bit big-endian members of the
|
||||
POWER/PowerPC family, despite having a name which would imply
|
||||
a broader set of systems. If you were using this predicate,
|
||||
you can replace <literal>foo.isPowerPC</literal> with
|
||||
<literal>(with foo; isPower && is32bit && isBigEndian)</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.11-notable-changes">
|
||||
|
|
|
|||
|
|
@ -928,6 +928,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- The `nss` package was split into `nss_esr` and `nss_latest`, with `nss` being an alias for `nss_esr`. This was done to ease maintenance of `nss` and dependent high-profile packages like `firefox`.
|
||||
|
||||
- The default `scribus` version is now 1.5, while version 1.4 is still available as `scribus_1_4` ([#172700](https://github.com/NixOS/nixpkgs/pull/172700)).
|
||||
|
||||
- The Nextcloud module now supports to create a Mysql database automatically
|
||||
with `services.nextcloud.database.createLocally` enabled.
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
## New Services {#sec-release-22.11-new-services}
|
||||
|
||||
- Please remove this line when you add the first item since docbook requires the section to be non-empty
|
||||
- [appvm](https://github.com/jollheef/appvm), Nix based app VMs. Available as [virtualisation.appvm](options.html#opt-virtualisation.appvm.enable).
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
|
|
@ -37,6 +37,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
`lib.systems.parse.isCompatible` still exists, but has changed semantically:
|
||||
Architectures with differing endianness modes are *no longer considered compatible*.
|
||||
|
||||
- The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`.
|
||||
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
## Other Notable Changes {#sec-release-22.11-notable-changes}
|
||||
|
|
|
|||
|
|
@ -479,7 +479,7 @@ in
|
|||
+ lib.optionalString (isx86_32 || isx86_64) "-Xbcj x86"
|
||||
# Untested but should also reduce size for these platforms
|
||||
+ lib.optionalString (isAarch32 || isAarch64) "-Xbcj arm"
|
||||
+ lib.optionalString (isPowerPC) "-Xbcj powerpc"
|
||||
+ lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc"
|
||||
+ lib.optionalString (isSparc) "-Xbcj sparc";
|
||||
description = ''
|
||||
Compression settings to use for the squashfs nix store.
|
||||
|
|
|
|||
|
|
@ -137,6 +137,7 @@
|
|||
./programs/captive-browser.nix
|
||||
./programs/ccache.nix
|
||||
./programs/cdemu.nix
|
||||
./programs/cfs-zen-tweaks.nix
|
||||
./programs/chromium.nix
|
||||
./programs/clickshare.nix
|
||||
./programs/cnping.nix
|
||||
|
|
@ -1235,6 +1236,7 @@
|
|||
./tasks/powertop.nix
|
||||
./testing/service-runner.nix
|
||||
./virtualisation/anbox.nix
|
||||
./virtualisation/appvm.nix
|
||||
./virtualisation/build-vm.nix
|
||||
./virtualisation/container-config.nix
|
||||
./virtualisation/containerd.nix
|
||||
|
|
|
|||
28
nixos/modules/programs/cfs-zen-tweaks.nix
Normal file
28
nixos/modules/programs/cfs-zen-tweaks.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
# CFS Zen Tweaks
|
||||
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.programs.cfs-zen-tweaks;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
meta = {
|
||||
maintainers = with maintainers; [ mkg20001 ];
|
||||
};
|
||||
|
||||
options = {
|
||||
programs.cfs-zen-tweaks.enable = mkEnableOption "CFS Zen Tweaks";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.packages = [ pkgs.cfs-zen-tweaks ];
|
||||
|
||||
systemd.services.set-cfs-tweak.wantedBy = [ "multi-user.target" "suspend.target" "hibernate.target" "hybrid-sleep.target" "suspend-then-hibernate.target" ];
|
||||
};
|
||||
}
|
||||
49
nixos/modules/virtualisation/appvm.nix
Normal file
49
nixos/modules/virtualisation/appvm.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.virtualisation.appvm;
|
||||
|
||||
in {
|
||||
|
||||
options = {
|
||||
virtualisation.appvm = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
This enables AppVMs and related virtualisation settings.
|
||||
'';
|
||||
};
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
description = ''
|
||||
AppVM user login. Currenly only AppVMs are supported for a single user only.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
virtualisation.libvirtd = {
|
||||
enable = true;
|
||||
qemu.verbatimConfig = ''
|
||||
namespaces = []
|
||||
user = "${cfg.user}"
|
||||
group = "users"
|
||||
remember_owner = 0
|
||||
'';
|
||||
};
|
||||
|
||||
users.users."${cfg.user}" = {
|
||||
packages = [ pkgs.appvm ];
|
||||
extraGroups = [ "libvirtd" ];
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -23,12 +23,11 @@
|
|||
, libpulseaudio
|
||||
, gvfs
|
||||
, libcdio
|
||||
, libechonest
|
||||
, libspotify
|
||||
, pcre
|
||||
, projectm
|
||||
, protobuf
|
||||
, qca2
|
||||
, qca-qt5
|
||||
, pkg-config
|
||||
, sparsehash
|
||||
, config
|
||||
|
|
@ -87,13 +86,12 @@ let
|
|||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gstreamer
|
||||
gvfs
|
||||
libechonest
|
||||
liblastfm
|
||||
libpulseaudio
|
||||
pcre
|
||||
projectm
|
||||
protobuf
|
||||
qca2
|
||||
qca-qt5
|
||||
qjson
|
||||
qtbase
|
||||
qtx11extras
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "btcpayserver";
|
||||
version = "1.5.1";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DcxRrVUen+JxMpiLDPfknpwCe962ifaekBeBnxJ0y88=";
|
||||
sha256 = "sha256-jPR996MEBCTT3k12qOdW1AO8LxA/pvQnw0qiW6//lcs=";
|
||||
};
|
||||
|
||||
projectFile = "BTCPayServer/BTCPayServer.csproj";
|
||||
|
|
|
|||
115
pkgs/applications/blockchains/btcpayserver/deps.nix
generated
115
pkgs/applications/blockchains/btcpayserver/deps.nix
generated
|
|
@ -31,43 +31,43 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
pname = "BTCPayServer.Lightning.All";
|
||||
version = "1.3.6";
|
||||
sha256 = "0jdpqy6kxg0lyh4n88wsvrcqc0kk7s7zn5lw7ivwys716m69qrdl";
|
||||
version = "1.3.8";
|
||||
sha256 = "0xjhxxp8gc06ivbxjbmcacq4pq1c3l3b03pwd785kblxbh7d8zxj";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "BTCPayServer.Lightning.Charge";
|
||||
version = "1.3.2";
|
||||
sha256 = "0v5rss6dg7297kq1frhn2pj9gd0rd8g1p5d316x5wkd4w7pmrm2w";
|
||||
version = "1.3.4";
|
||||
sha256 = "1ic2kz9mpgcjkmj6a0kscn3iqqp905a4768bn2fx454swpn2w6f9";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "BTCPayServer.Lightning.CLightning";
|
||||
version = "1.3.2";
|
||||
sha256 = "0qs5p6pm54il23j8yysw0pzvrki37y6z8cd2gdknpz2f3wg7slm9";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "BTCPayServer.Lightning.Common";
|
||||
version = "1.2.7";
|
||||
sha256 = "1hz4bn3aw537r253ipdpa6sydwhb6dh3r82xp1jizn9a6mnw54x6";
|
||||
version = "1.3.5";
|
||||
sha256 = "0k9v28h0kvcbwxrjmalk14sna505li125i9aigcj6lddsg1d3xr7";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "BTCPayServer.Lightning.Common";
|
||||
version = "1.3.2";
|
||||
sha256 = "119zplkc7iy9wc95iz1qnyi42fr99ar4hp8a11p708a22w941yi0";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "BTCPayServer.Lightning.Common";
|
||||
version = "1.3.4";
|
||||
sha256 = "1bic7hxw731c0mkjgak0pwlrc7a4yqsr1xi7r3x04cz98nvdlqfc";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "BTCPayServer.Lightning.Eclair";
|
||||
version = "1.3.2";
|
||||
sha256 = "08gw1gqng1khxzvvhlwsg6lw1w56ylilg738wi6cbcwy7vl7f6bb";
|
||||
version = "1.3.4";
|
||||
sha256 = "0im3nzr7ki0nlr5miy7i7b9869vi7frq5g1idwfshqincpgps05g";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "BTCPayServer.Lightning.LNBank";
|
||||
version = "1.3.4";
|
||||
sha256 = "1vyz63pi5j31y8pz0b4hp9c4j249rszzfcymk3z3b2clwq32s4i4";
|
||||
version = "1.3.6";
|
||||
sha256 = "08myhnk41l1zc3ih1h8l6583g4spgfgl1i65sjp02ab9v4i9lalw";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "BTCPayServer.Lightning.LND";
|
||||
version = "1.3.3";
|
||||
sha256 = "137azpxxmp2q69bp07ky1jsgnfy9lf0dg5ba8l654flvvrgxaq6y";
|
||||
version = "1.3.5";
|
||||
sha256 = "1k5i4x382hx3zwczpjvzpxv4nmmlnnlaxcy018bz7b4hvd0l49wq";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "BuildBundlerMinifier";
|
||||
|
|
@ -181,8 +181,8 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
pname = "LNURL";
|
||||
version = "0.0.15";
|
||||
sha256 = "1fy6ywzqs5y9c6d156v08dg8c6689d5xb4y1ar7gqgz6f3cl842n";
|
||||
version = "0.0.18";
|
||||
sha256 = "1dy0if091s8j0klv58v8xy0lnwyw0mxl89m09wkfcs0d4kzmjsrj";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "MailKit";
|
||||
|
|
@ -209,6 +209,11 @@
|
|||
version = "5.2.7";
|
||||
sha256 = "1j0wbdmycj5xbk06p32f7xrddc40sbj3yca4d7ywg611yk26mvi1";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "Microsoft.AspNet.WebApi.Client";
|
||||
version = "5.2.8";
|
||||
sha256 = "1dbwdbxr6npyc82zwl0g9bhifkpcqfzyhx1ihd8rzcmzprw70yfj";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "Microsoft.AspNetCore.Connections.Abstractions";
|
||||
version = "3.1.10";
|
||||
|
|
@ -349,11 +354,6 @@
|
|||
version = "4.0.1";
|
||||
sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "Microsoft.CSharp";
|
||||
version = "4.3.0";
|
||||
sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "Microsoft.CSharp";
|
||||
version = "4.5.0";
|
||||
|
|
@ -834,11 +834,6 @@
|
|||
version = "6.0.18";
|
||||
sha256 = "1dr669h68cx6yfzr3n97yzzwbgnsv5g2008diyxngdjm55nh3q9s";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "NBitcoin";
|
||||
version = "6.0.3";
|
||||
sha256 = "1kfq1q86844ssp8myy5vmvg33h3x0p9gqrlc99fl9gm1vzjc723f";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "NBitcoin";
|
||||
version = "6.0.8";
|
||||
|
|
@ -879,11 +874,6 @@
|
|||
version = "3.0.14";
|
||||
sha256 = "1njk1arrf8pbx0i0p3yww459i70p0fcx02vs0jnbb6znvcy4mvh6";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "Newtonsoft.Json";
|
||||
version = "10.0.3";
|
||||
sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "Newtonsoft.Json";
|
||||
version = "11.0.2";
|
||||
|
|
@ -1081,18 +1071,18 @@
|
|||
})
|
||||
(fetchNuGet {
|
||||
pname = "Selenium.Support";
|
||||
version = "3.141.0";
|
||||
sha256 = "1gqwzbfq7i9jz830b0jibsis0qfxs8sl10n1nja02c6s637cwzib";
|
||||
version = "4.1.1";
|
||||
sha256 = "1bcvvcybbw22yv9bz10jdms5za2ajczil9kzwjh9zs6yy41gqnwl";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "Selenium.WebDriver.ChromeDriver";
|
||||
version = "100.0.4896.6000";
|
||||
sha256 = "1pfdvxjy4xiw1j7787lf07w9nr0dmj589vf6p4aqmk2cfz8j35c6";
|
||||
version = "101.0.4951.4100";
|
||||
sha256 = "0iqkcmfgzvir4h24qz3namgv7pc14hancb26gqa9j3izb1813ndf";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "Selenium.WebDriver";
|
||||
version = "3.141.0";
|
||||
sha256 = "09g0zhz6n7yhxmxlrpzjdykfavr3m4z1gb4cmq304dw0gr8s89mq";
|
||||
version = "4.1.1";
|
||||
sha256 = "0gavlsanyiff9rxn34cinv0q2m3a8wh66ynlm9mxwkmmybzbbqz4";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "Serilog.AspNetCore";
|
||||
|
|
@ -1209,16 +1199,6 @@
|
|||
version = "6.0.0";
|
||||
sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "System.Collections.NonGeneric";
|
||||
version = "4.3.0";
|
||||
sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "System.Collections.Specialized";
|
||||
version = "4.3.0";
|
||||
sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "System.Collections";
|
||||
version = "4.0.11";
|
||||
|
|
@ -1229,21 +1209,6 @@
|
|||
version = "4.3.0";
|
||||
sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "System.ComponentModel.Primitives";
|
||||
version = "4.3.0";
|
||||
sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "System.ComponentModel.TypeConverter";
|
||||
version = "4.3.0";
|
||||
sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "System.ComponentModel";
|
||||
version = "4.3.0";
|
||||
sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "System.Configuration.ConfigurationManager";
|
||||
version = "4.5.0";
|
||||
|
|
@ -1304,11 +1269,6 @@
|
|||
version = "4.0.11";
|
||||
sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "System.Dynamic.Runtime";
|
||||
version = "4.3.0";
|
||||
sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "System.Formats.Asn1";
|
||||
version = "5.0.0";
|
||||
|
|
@ -1669,21 +1629,11 @@
|
|||
version = "4.3.0";
|
||||
sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "System.Runtime.Serialization.Formatters";
|
||||
version = "4.3.0";
|
||||
sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "System.Runtime.Serialization.Primitives";
|
||||
version = "4.1.1";
|
||||
sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "System.Runtime.Serialization.Primitives";
|
||||
version = "4.3.0";
|
||||
sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "System.Runtime";
|
||||
version = "4.1.0";
|
||||
|
|
@ -1959,11 +1909,6 @@
|
|||
version = "4.0.1";
|
||||
sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "System.Xml.XmlDocument";
|
||||
version = "4.3.0";
|
||||
sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi";
|
||||
})
|
||||
(fetchNuGet {
|
||||
pname = "System.Xml.XPath.XmlDocument";
|
||||
version = "4.0.1";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "nbxplorer";
|
||||
version = "2.3.20";
|
||||
version = "2.3.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgarage";
|
||||
repo = "NBXplorer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cAko5s1bFSI7HOcXg/tZtdMMe0S9zkRBeZ6bispxgwc=";
|
||||
sha256 = "sha256-PaunSwbIf9hGmZeS8ZI4M0C6T76bLCalnS4/x9TWrtY=";
|
||||
};
|
||||
|
||||
projectFile = "NBXplorer/NBXplorer.csproj";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p dotnet-sdk_3
|
||||
#!nix-shell -i bash -p dotnet-sdk_6
|
||||
set -euo pipefail
|
||||
|
||||
# Writes deps for dotnet package in $pkgSrc to $depsFile.
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 git gnupg nixFlakes
|
||||
#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_6 git gnupg nixFlakes
|
||||
set -euo pipefail
|
||||
|
||||
# This script uses the following env vars:
|
||||
# getVersionFromTags
|
||||
# refetch
|
||||
|
||||
trap 'echo "Error at ${BASH_SOURCE[0]}:$LINENO"' ERR
|
||||
|
||||
pkgName=$1
|
||||
depsFile=$2
|
||||
customFlags=$3
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "apostrophe";
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
domain = "gitlab.gnome.org";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-At3kaVJE07j/QWXerYnvxleE2Cbn0FjlBXH69tkuFys=";
|
||||
sha256 = "sha256-RBrrG1TO810LidIelYGNaK7PjDq84D0cA8VcMojAW3M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pygobject3
|
||||
pyxdg
|
||||
pdfminer
|
||||
pdfminer-six
|
||||
pycairo
|
||||
pexpect
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1700,7 +1700,8 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
matklad.rust-analyzer = callPackage ./rust-analyzer { };
|
||||
rust-lang.rust-analyzer = callPackage ./rust-analyzer { };
|
||||
matklad.rust-analyzer = self.rust-lang.rust-analyzer; # Previous publisher
|
||||
|
||||
ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension {
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -672,7 +672,7 @@ in
|
|||
license = "MAME";
|
||||
|
||||
extraBuildInputs = [ libpng SDL ];
|
||||
SDL_CONFIG = "${SDL.dev}/bin/sdl-config";
|
||||
SDL_CONFIG = "${lib.getDev SDL}/bin/sdl-config";
|
||||
dontAddPrefix = true;
|
||||
configurePlatforms = [ ];
|
||||
makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpu-x";
|
||||
version = "4.3.0";
|
||||
version = "4.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "X0rg";
|
||||
repo = "CPU-X";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pYinePs7WFVfRMNYTY+Is8B+cv5w6IF7Ce+9v/mLRYg=";
|
||||
sha256 = "sha256-9oRNyspFmvIG63aJ8qyaVmi1GW1eW+Rg0+z8la3LuKA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
, pyshp
|
||||
, fonttools
|
||||
, pyyaml
|
||||
, pdfminer
|
||||
, pdfminer-six
|
||||
, vobject
|
||||
, tabulate
|
||||
, wcwidth
|
||||
|
|
@ -55,7 +55,7 @@ buildPythonApplication rec {
|
|||
pyyaml
|
||||
#namestand
|
||||
#datapackage
|
||||
pdfminer
|
||||
pdfminer-six
|
||||
#tabula
|
||||
vobject
|
||||
tabulate
|
||||
|
|
|
|||
|
|
@ -1,32 +1,12 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, alsa-lib
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
, atk
|
||||
, autoPatchelfHook
|
||||
, cairo
|
||||
, cups
|
||||
, dbus
|
||||
, dpkg
|
||||
, expat
|
||||
, fetchurl
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gtk3
|
||||
, libdrm
|
||||
, libxkbcommon
|
||||
, dpkg
|
||||
, electron_16
|
||||
, makeWrapper
|
||||
, mesa
|
||||
, nixosTests
|
||||
, nspr
|
||||
, nss
|
||||
, pango
|
||||
, pciutils
|
||||
, systemd
|
||||
, nodePackages
|
||||
, undmg
|
||||
, writeShellScriptBin
|
||||
, xorg
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -34,19 +14,6 @@ let
|
|||
|
||||
version = "3.1.0";
|
||||
|
||||
# At first start, the program checks for supported operating systems by calling `lsb_release -a`
|
||||
# and only runs when it finds Debian/Ubuntu. So we present us as Debian an make it happy.
|
||||
fake-lsb-release = writeShellScriptBin "lsb_release" ''
|
||||
echo "Distributor ID: Debian"
|
||||
echo "Description: Debian GNU/Linux 10 (buster)"
|
||||
echo "Release: 10"
|
||||
echo "Codename: buster"
|
||||
'';
|
||||
|
||||
binPath = lib.makeBinPath [
|
||||
fake-lsb-release
|
||||
];
|
||||
|
||||
systemArgs = rec {
|
||||
x86_64-linux = rec {
|
||||
src = fetchurl {
|
||||
|
|
@ -54,68 +21,41 @@ let
|
|||
sha256 = "sha256-jSP+H9ej9Wd+swBZSy9uMi2ExSTZ191FGZhqaocTl7w=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
makeWrapper
|
||||
nodePackages.asar
|
||||
];
|
||||
|
||||
buildInputs = runtimeDependencies;
|
||||
|
||||
runtimeDependencies = [
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
at-spi2-core
|
||||
atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
expat
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
libdrm
|
||||
libxkbcommon
|
||||
mesa
|
||||
nspr
|
||||
nss
|
||||
pango
|
||||
pciutils
|
||||
systemd
|
||||
xorg.libX11
|
||||
xorg.libXcomposite
|
||||
xorg.libXdamage
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXrandr
|
||||
xorg.libxcb
|
||||
xorg.libxshmfence
|
||||
];
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
||||
installPhase = ''
|
||||
dpkg-deb -x $src $out
|
||||
mkdir -p $out/bin
|
||||
mv usr/share $out/share
|
||||
mkdir -p $out/share/breitbandmessung/resources
|
||||
|
||||
chmod -R g-w $out
|
||||
asar e opt/Breitbandmessung/resources/app.asar $out/share/breitbandmessung/resources
|
||||
|
||||
addAutoPatchelfSearchPath --no-recurse $out/opt/Breitbandmessung
|
||||
autoPatchelfFile $out/opt/Breitbandmessung/breitbandmessung
|
||||
# At first start, the program checks for supported operating systems by using the `bizzby-lsb-release`
|
||||
# module and only runs when it finds Debian/Ubuntu. So we present us as Debian and make it happy.
|
||||
cat <<EOF > $out/share/breitbandmessung/resources/node_modules/bizzby-lsb-release/lib/lsb-release.js
|
||||
module.exports = function release() {
|
||||
return {
|
||||
distributorID: "Debian",
|
||||
description: "Debian GNU/Linux 10 (buster)",
|
||||
release: "10",
|
||||
codename: "buster"
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
makeWrapper $out/opt/Breitbandmessung/breitbandmessung $out/bin/breitbandmessung \
|
||||
--prefix PATH : ${binPath}
|
||||
|
||||
mv $out/usr/share $out/share
|
||||
rmdir $out/usr
|
||||
makeWrapper ${electron_16}/bin/electron $out/bin/breitbandmessung \
|
||||
--add-flags $out/share/breitbandmessung/resources/build/electron.js
|
||||
|
||||
# Fix the desktop link
|
||||
substituteInPlace $out/share/applications/breitbandmessung.desktop \
|
||||
--replace /opt/Breitbandmessung $out/bin
|
||||
'';
|
||||
|
||||
dontAutoPatchelf = true;
|
||||
dontPatchELF = true;
|
||||
};
|
||||
|
||||
x86_64-darwin = {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "asuka";
|
||||
version = "0.8.3";
|
||||
version = "0.8.5";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~julienxx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-l3SgIyApASllHVhAc2yoUYc2x7QtCdzBrMYaXCp65m8=";
|
||||
sha256 = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-twECZM1KcWeQptLhlKlIz16r3Q/xMb0e+lBG+EX79mU=";
|
||||
cargoSha256 = "sha256-XrFpvH3qiMvpgbH7Q+KC1zFAqJT4rjxux6Q5KLY2ufI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ let
|
|||
./patches/m102-fix-dawn_version_generator-failure.patch
|
||||
];
|
||||
|
||||
postPatch = optionalString (chromiumVersionAtLeast "102") ''
|
||||
postPatch = ''
|
||||
# Workaround/fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1313361:
|
||||
substituteInPlace BUILD.gn \
|
||||
--replace '"//infra/orchestrator:orchestrator_all",' ""
|
||||
|
|
@ -174,7 +174,6 @@ let
|
|||
substituteInPlace build/config/compiler/BUILD.gn \
|
||||
--replace '"-Xclang",' "" \
|
||||
--replace '"-no-opaque-pointers",' ""
|
||||
'' + ''
|
||||
# remove unused third-party
|
||||
for lib in ${toString gnSystemLibraries}; do
|
||||
if [ -d "third_party/$lib" ]; then
|
||||
|
|
@ -194,7 +193,7 @@ let
|
|||
--replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
|
||||
fi
|
||||
chmod -x third_party/webgpu-cts/src/tools/run_deno
|
||||
${lib.optionalString (chromiumVersionAtLeast "102") "chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno"}
|
||||
chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno
|
||||
|
||||
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
|
||||
substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "103.0.5060.13",
|
||||
"sha256": "1y7nadfmw4yxc2za7ln3h7xywlzdiscmsa8kjar17gmqz6ic69id",
|
||||
"sha256bin64": "0crs07sjqhgpr22vxa7c52ai8xvxp6c4cs82kaqzc5cgg97076gq",
|
||||
"version": "103.0.5060.24",
|
||||
"sha256": "1vdnq7vd0jdxkpc00xwvvk1mmyq2hcydms64l16nv3v8jgvizrha",
|
||||
"sha256bin64": "0590ffrbpnd4v8z1wzn1baqvj59gx2yc3zp3qvhvmfrdmxz9i9b4",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-05-11",
|
||||
|
|
@ -45,19 +45,19 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "101.0.4951.64",
|
||||
"sha256": "1xyqm32y9v1hn8ji6qfw6maynqgg3266j58dq4x4aqsm2gj9cn4w",
|
||||
"sha256bin64": "14ijrj7h2y72ppyysz6jv40c01lbnan7z69cl24asch2zjlgwv8v",
|
||||
"version": "102.0.5005.61",
|
||||
"sha256": "07vbi3gn9g4n04b2qi2hm34r122snrqaifa46yk3pyh1d79rfdqs",
|
||||
"sha256bin64": "100n8k3d9k5bq58irc36ig6m5m0lxggffyk4crqqqcib2anqd0zv",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-03-14",
|
||||
"version": "2022-04-14",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb",
|
||||
"sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"
|
||||
"rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167",
|
||||
"sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "101.0.4951.64-1",
|
||||
"sha256": "0k7w6xvjf1yzyak9ywvcdw762d8zbx6d8haz35q87jz0mxfn2mr3"
|
||||
"rev": "102.0.5005.61-1",
|
||||
"sha256": "1hlyi6k894blkkqmqsizx72bag2vj6wlpza0fvi8db5wp6i5b58g"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, # Incompatible licenses, LGPLv3 - GPLv2
|
||||
enableGuile ? false, guile ? null
|
||||
, enablePython ? false, python ? null
|
||||
, enablePerl ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null
|
||||
, enablePerl ? (!stdenv.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null
|
||||
# re-add javascript support when upstream supports modern spidermonkey
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.3.13";
|
||||
version = "3.3.14";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
src = fetchFromGitHub {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QfsHVP2FIp2kn6blKbeerNxUOWXbxpgRkSBGorViVYs=";
|
||||
hash = "sha256-v52QVyd2Rl1nixKD1TY1YQaSPKRsbw4BCtfRly9aMrM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alfaview";
|
||||
version = "8.44.0";
|
||||
version = "8.45.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb";
|
||||
sha256 = "sha256-6BhhUfULtCUO5jZFF+HxGuFCg0XojQ0NJUXHxMtnwN4=";
|
||||
sha256 = "sha256-qSLKPtBjhbPGX9axbQnyCb+Tcq47xDMvVGj18hEPw28=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -43,21 +43,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
gettext wrapGAppsHook
|
||||
];
|
||||
|
||||
# Workaround for https://dev.gajim.org/gajim/gajim/-/issues/10719.
|
||||
# We don't use plugin release URL because it's updated in place.
|
||||
plugins = fetchFromGitLab {
|
||||
domain = "dev.gajim.org";
|
||||
owner = "gajim";
|
||||
repo = "gajim-plugins";
|
||||
rev = "fea522e4360cec6ceacbf1df92644ab3343d4b99";
|
||||
sha256 = "sha256-CmwEiLsdldoOfgHfWL/5hf/dp0HEDNAIlc5N0Np20KE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
mkdir -p gajim/data/plugins
|
||||
cp -r $plugins/plugin_installer gajim/data/plugins
|
||||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
|
|
@ -65,7 +50,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging
|
||||
nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging gssapi
|
||||
] ++ lib.optionals enableE2E [ pycrypto python-gnupg ]
|
||||
++ lib.optional enableRST docutils
|
||||
++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
|
||||
|
|
@ -88,7 +73,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
description = "Jabber client written in PyGTK";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ raskin abbradar ];
|
||||
downloadPage = "http://gajim.org/downloads.php";
|
||||
downloadPage = "http://gajim.org/download/";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mailspring";
|
||||
version = "1.10.2";
|
||||
version = "1.10.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb";
|
||||
sha256 = "sha256-6KHhkmHWhj/AgECYqNuJ0iSPEYyuBDac/3fW6J0fgTg=";
|
||||
sha256 = "sha256-+H2KeaRBApveUG6Vz+Z8LWpmNpZ4lwyeX1LK0AKx/bw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
25
pkgs/applications/networking/wgcf/default.nix
Normal file
25
pkgs/applications/networking/wgcf/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wgcf";
|
||||
version = "2.2.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ViRb3";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6V4fIoFB0fuCEu1Rj8QWGDNdgystrD/gefjbshvxVsw=";
|
||||
};
|
||||
|
||||
subPackages = ".";
|
||||
|
||||
vendorSha256 = "sha256-NGlV/qcnUlNLvt3uVRdfx+lUDgqAEBEowW9WIHBY+AI=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform, unofficial CLI for Cloudflare Warp";
|
||||
homepage = "https://github.com/ViRb3/wgcf";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ yureien ];
|
||||
};
|
||||
}
|
||||
|
|
@ -92,7 +92,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
|
|||
numpy
|
||||
ocrmypdf
|
||||
pathvalidate
|
||||
pdfminer
|
||||
pdfminer-six
|
||||
pikepdf
|
||||
pillow
|
||||
pluggy
|
||||
|
|
|
|||
52
pkgs/applications/office/scribus/1_4.nix
Normal file
52
pkgs/applications/office/scribus/1_4.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2
|
||||
, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg
|
||||
, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }:
|
||||
|
||||
let
|
||||
icon = fetchurl {
|
||||
url = "https://gist.githubusercontent.com/ejpcmac/a74b762026c9bc4000be624c3d085517/raw/18edc497c5cb6fdeef1c8aede37a0ee68413f9d3/scribus-icon-centered.svg";
|
||||
sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3";
|
||||
};
|
||||
|
||||
pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "scribus";
|
||||
version = "1.4.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
buildInputs = with xorg;
|
||||
[ freetype lcms libtiff libxml2 libart_lgpl qt4
|
||||
pythonEnv cups fontconfig
|
||||
libjpeg zlib libpng podofo hunspell cairo
|
||||
boost # for internal 2geom library
|
||||
libXaw libXext libX11 libXtst libXi libXinerama
|
||||
libpthreadstubs libXau libXdmcp
|
||||
imagemagick # To build the icon
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace scribus/util_ghostscript.cpp \
|
||||
--replace 'QString gsName("gs");' \
|
||||
'QString gsName("${ghostscript}/bin/gs");'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
for i in 16 24 48 64 96 128 256 512; do
|
||||
mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
|
||||
convert -background none -resize ''${i}x''${i} ${icon} $out/share/icons/hicolor/''${i}x''${i}/apps/scribus.png
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.marcweber ];
|
||||
platforms = lib.platforms.linux;
|
||||
description = "Desktop Publishing (DTP) and Layout program for Linux";
|
||||
homepage = "https://www.scribus.net";
|
||||
license = lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,52 +1,143 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2
|
||||
, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg
|
||||
, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }:
|
||||
{ boost
|
||||
, cairo
|
||||
, cmake
|
||||
, cups
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, fontconfig
|
||||
, freetype
|
||||
, harfbuzzFull
|
||||
, hunspell
|
||||
, lcms2
|
||||
, libjpeg
|
||||
, libtiff
|
||||
, libxml2
|
||||
, mkDerivation
|
||||
, pixman
|
||||
, pkg-config
|
||||
, podofo
|
||||
, poppler
|
||||
, poppler_data
|
||||
, python3
|
||||
, qtbase
|
||||
, qtimageformats
|
||||
, qttools
|
||||
, lib
|
||||
}:
|
||||
|
||||
let
|
||||
icon = fetchurl {
|
||||
url = "https://gist.githubusercontent.com/ejpcmac/a74b762026c9bc4000be624c3d085517/raw/18edc497c5cb6fdeef1c8aede37a0ee68413f9d3/scribus-icon-centered.svg";
|
||||
sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3";
|
||||
};
|
||||
|
||||
pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
|
||||
in stdenv.mkDerivation rec {
|
||||
pythonEnv = python3.withPackages (
|
||||
ps: [
|
||||
ps.pillow
|
||||
ps.tkinter
|
||||
]
|
||||
);
|
||||
in
|
||||
mkDerivation rec {
|
||||
pname = "scribus";
|
||||
version = "1.4.8";
|
||||
|
||||
version = "1.5.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992";
|
||||
url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
buildInputs = with xorg;
|
||||
[ freetype lcms libtiff libxml2 libart_lgpl qt4
|
||||
pythonEnv cups fontconfig
|
||||
libjpeg zlib libpng podofo hunspell cairo
|
||||
boost # for internal 2geom library
|
||||
libXaw libXext libX11 libXtst libXi libXinerama
|
||||
libpthreadstubs libXau libXdmcp
|
||||
imagemagick # To build the icon
|
||||
patches = [
|
||||
# For harfbuzz >= 2.9.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch";
|
||||
sha256 = "sha256-noRCaN63ZYFfXmAluEYXdFPNOk3s5W3KBAsLU1Syxv4=";
|
||||
})
|
||||
# For harfbuzz >= 3.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch";
|
||||
sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y=";
|
||||
})
|
||||
# For Poppler 22.02
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch";
|
||||
sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch";
|
||||
sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c=";
|
||||
})
|
||||
# For Poppler 22.03
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/553d1fd5f76ffb3743583b88c78a7232b076a965.patch";
|
||||
sha256 = "56JrEG3eCzyALTH04yjzurKRj2PocpjO6b4PusMRxjY=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/1f82e38be0782b065910f5fb4cece23f690349ae.patch";
|
||||
sha256 = "qektUfel5KeA327D3THyqi8dznP1SQQFToUC5Kd0+W4=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch";
|
||||
sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/e013e8126d2100e8e56dea5b836ad43275429389.patch";
|
||||
sha256 = "+siPNtJq9Is9V2PgADeQJB+b4lkl5g8uk6zKBu10Jqw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch";
|
||||
sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ=";
|
||||
})
|
||||
# For Poppler 22.04
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch";
|
||||
sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
cairo
|
||||
cups
|
||||
fontconfig
|
||||
freetype
|
||||
harfbuzzFull
|
||||
hunspell
|
||||
lcms2
|
||||
libjpeg
|
||||
libtiff
|
||||
libxml2
|
||||
pixman
|
||||
podofo
|
||||
poppler
|
||||
poppler_data
|
||||
pythonEnv
|
||||
qtbase
|
||||
qtimageformats
|
||||
qttools
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# poppler uses std::optional
|
||||
"-DWANT_CPP17=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [
|
||||
erictapen
|
||||
kiwi
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace scribus/util_ghostscript.cpp \
|
||||
--replace 'QString gsName("gs");' \
|
||||
'QString gsName("${ghostscript}/bin/gs");'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
for i in 16 24 48 64 96 128 256 512; do
|
||||
mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
|
||||
convert -background none -resize ''${i}x''${i} ${icon} $out/share/icons/hicolor/''${i}x''${i}/apps/scribus.png
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.marcweber ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = platforms.linux;
|
||||
description = "Desktop Publishing (DTP) and Layout program for Linux";
|
||||
homepage = "https://www.scribus.net";
|
||||
license = lib.licenses.gpl2;
|
||||
# There are a lot of licenses...
|
||||
# https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19
|
||||
license = with licenses; [
|
||||
bsd3
|
||||
gpl2Plus
|
||||
mit
|
||||
publicDomain
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,143 +0,0 @@
|
|||
{ boost
|
||||
, cairo
|
||||
, cmake
|
||||
, cups
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, fontconfig
|
||||
, freetype
|
||||
, harfbuzzFull
|
||||
, hunspell
|
||||
, lcms2
|
||||
, libjpeg
|
||||
, libtiff
|
||||
, libxml2
|
||||
, mkDerivation
|
||||
, pixman
|
||||
, pkg-config
|
||||
, podofo
|
||||
, poppler
|
||||
, poppler_data
|
||||
, python3
|
||||
, qtbase
|
||||
, qtimageformats
|
||||
, qttools
|
||||
, lib
|
||||
}:
|
||||
|
||||
let
|
||||
pythonEnv = python3.withPackages (
|
||||
ps: [
|
||||
ps.pillow
|
||||
ps.tkinter
|
||||
]
|
||||
);
|
||||
in
|
||||
mkDerivation rec {
|
||||
pname = "scribus";
|
||||
|
||||
version = "1.5.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# For harfbuzz >= 2.9.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch";
|
||||
sha256 = "sha256-noRCaN63ZYFfXmAluEYXdFPNOk3s5W3KBAsLU1Syxv4=";
|
||||
})
|
||||
# For harfbuzz >= 3.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch";
|
||||
sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y=";
|
||||
})
|
||||
# For Poppler 22.02
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch";
|
||||
sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch";
|
||||
sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c=";
|
||||
})
|
||||
# For Poppler 22.03
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/553d1fd5f76ffb3743583b88c78a7232b076a965.patch";
|
||||
sha256 = "56JrEG3eCzyALTH04yjzurKRj2PocpjO6b4PusMRxjY=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/1f82e38be0782b065910f5fb4cece23f690349ae.patch";
|
||||
sha256 = "qektUfel5KeA327D3THyqi8dznP1SQQFToUC5Kd0+W4=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch";
|
||||
sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/e013e8126d2100e8e56dea5b836ad43275429389.patch";
|
||||
sha256 = "+siPNtJq9Is9V2PgADeQJB+b4lkl5g8uk6zKBu10Jqw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch";
|
||||
sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ=";
|
||||
})
|
||||
# For Poppler 22.04
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch";
|
||||
sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
cairo
|
||||
cups
|
||||
fontconfig
|
||||
freetype
|
||||
harfbuzzFull
|
||||
hunspell
|
||||
lcms2
|
||||
libjpeg
|
||||
libtiff
|
||||
libxml2
|
||||
pixman
|
||||
podofo
|
||||
poppler
|
||||
poppler_data
|
||||
pythonEnv
|
||||
qtbase
|
||||
qtimageformats
|
||||
qttools
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# poppler uses std::optional
|
||||
"-DWANT_CPP17=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [
|
||||
erictapen
|
||||
kiwi
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
description = "Desktop Publishing (DTP) and Layout program for Linux";
|
||||
homepage = "https://www.scribus.net";
|
||||
# There are a lot of licenses...
|
||||
# https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19
|
||||
license = with licenses; [
|
||||
bsd3
|
||||
gpl2Plus
|
||||
mit
|
||||
publicDomain
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qalculate-gtk";
|
||||
version = "4.1.1";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-gtk";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-itYNKcdWYMoqlvZ7CYJ6WMv7rS/y1SVdt3O7ahkjPOk=";
|
||||
sha256 = "sha256-SphruQ/b8z5S/wKb9yhbEy9/pwiY+frZltdIYj0CJBM=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
|
|
|||
|
|
@ -172,6 +172,6 @@ let
|
|||
in
|
||||
# A wrapper around sage that makes sure sage finds its docs (if they were build).
|
||||
callPackage ./sage.nix {
|
||||
inherit sage-tests sage-with-env sagedoc jupyter-kernel-specs;
|
||||
inherit sage-tests sage-with-env sagedoc jupyter-kernel-definition jupyter-kernel-specs;
|
||||
inherit withDoc requireSageTests;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, makeWrapper
|
||||
, sage-tests
|
||||
, sage-with-env
|
||||
, jupyter-kernel-definition
|
||||
, jupyter-kernel-specs
|
||||
, sagedoc
|
||||
, withDoc
|
||||
|
|
@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
|
|||
quicktest = sage-tests.override { longTests = false; timeLimit = 600; }; # as many tests as possible in ~10m
|
||||
doc = sagedoc;
|
||||
lib = sage-with-env.env.lib;
|
||||
kernelspec = jupyter-kernel-specs.definition.sagemath;
|
||||
kernelspec = jupyter-kernel-definition;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ghq";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "x-motemen";
|
||||
repo = "ghq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-86ZFKkzDAhx3UYWxreQI2OJJmqGnqaH2TgwQunuYhv4=";
|
||||
sha256 = "sha256-tGublfC6EeY3T/45lxmsm5zsmlgq/guS64OutAWy6AY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-5Eth9v98z1gxf1Fz5Lbn2roX7dSBmA7GRzg8uvT0hTI=";
|
||||
vendorSha256 = "sha256-ZUnnvZERWXnOs4hybw8JDlGdM7QFaMfs6o3SYy0UwTM=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "git-lfs";
|
||||
version = "3.1.4";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "git-lfs";
|
||||
repo = "git-lfs";
|
||||
sha256 = "sha256-dGqb7gw7l2SPGwhHIFbEq6XqMB9QRw3+3Pfbk2S4kW4=";
|
||||
sha256 = "sha256-3gVUPfZs5GViEA3D7Zm5NdxhuEz9DhwPLoQqHFdGCrI=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/git-lfs/git-lfs";
|
||||
|
|
@ -30,7 +30,7 @@ buildGoPackage rec {
|
|||
'';
|
||||
|
||||
postInstall = ''
|
||||
installManPage go/src/${goPackagePath}/man/*.{1,5}
|
||||
installManPage go/src/${goPackagePath}/man/man*/*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/src/resources/ui/virt-viewer.ui b/src/resources/ui/virt-viewer.ui
|
||||
index 430f879..68856fc 100644
|
||||
--- a/src/resources/ui/virt-viewer.ui
|
||||
+++ b/src/resources/ui/virt-viewer.ui
|
||||
@@ -137,7 +137,6 @@
|
||||
</child>
|
||||
<child type="titlebar">
|
||||
<object class="GtkHeaderBar" id="header">
|
||||
- <property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="show-close-button">True</property>
|
||||
<child>
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/src/virt-viewer-display-spice.c b/src/virt-viewer-display-spice.c
|
||||
index 2265f02..1d60d81 100644
|
||||
--- a/src/virt-viewer-display-spice.c
|
||||
+++ b/src/virt-viewer-display-spice.c
|
||||
@@ -317,8 +317,8 @@ virt_viewer_display_spice_new(VirtViewerSessionSpice *session,
|
||||
gtk_container_add(GTK_CONTAINER(self), GTK_WIDGET(self->display));
|
||||
gtk_widget_show(GTK_WIDGET(self->display));
|
||||
g_object_set(self->display,
|
||||
- "grab-keyboard", TRUE,
|
||||
- "grab-mouse", TRUE,
|
||||
+ "grab-keyboard", FALSE,
|
||||
+ "grab-mouse", FALSE,
|
||||
"resize-guest", FALSE,
|
||||
"scaling", TRUE,
|
||||
NULL);
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
|
||||
index fe740ce..d45fd4f 100644
|
||||
--- a/src/virt-viewer-window.c
|
||||
+++ b/src/virt-viewer-window.c
|
||||
@@ -1342,6 +1342,9 @@ virt_viewer_window_update_title(VirtViewerWindow *self)
|
||||
grabhint,
|
||||
g_get_application_name());
|
||||
}
|
||||
+ } else if (g_str_has_prefix(self->subtitle, "appvm_")) {
|
||||
+ /* Use name of the application as a title */
|
||||
+ title = g_strdup_printf(_("%s"), &self->subtitle[strlen("appvm_")]);
|
||||
} else if (self->subtitle) {
|
||||
/* translators:
|
||||
* This is "<subtitle> - <appname>"
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
|
||||
index b977b7b..36bce34 100644
|
||||
--- a/src/virt-viewer-app.c
|
||||
+++ b/src/virt-viewer-app.c
|
||||
@@ -976,6 +976,7 @@ virt_viewer_app_set_window_subtitle(VirtViewerApp *app,
|
||||
*d = '%';
|
||||
} else
|
||||
subtitle = g_strdup_printf("%s (%s)", title, desc);
|
||||
+ subtitle = g_strdup_printf("%s", title);
|
||||
g_free(desc);
|
||||
}
|
||||
|
||||
48
pkgs/applications/virtualization/appvm/default.nix
Normal file
48
pkgs/applications/virtualization/appvm/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, nix
|
||||
, virt-viewer
|
||||
, fetchpatch
|
||||
, makeWrapper }:
|
||||
|
||||
let
|
||||
# Upstream patches fail with newer virt-viewer. These are own ports to the
|
||||
# newest virt-viewer version, see:
|
||||
# https://github.com/jollheef/appvm/issues/28
|
||||
virt-manager-without-menu = virt-viewer.overrideAttrs(oldAttrs: {
|
||||
patches = oldAttrs.patches ++ [
|
||||
./0001-Remove-menu-bar.patch
|
||||
./0002-Do-not-grab-keyboard-mouse.patch
|
||||
./0003-Use-name-of-appvm-applications-as-a-title.patch
|
||||
./0004-Use-title-application-name-as-subtitle.patch
|
||||
];
|
||||
});
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "appvm";
|
||||
version = "unstable-2021-12-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jollheef";
|
||||
repo = pname;
|
||||
rev = "17f17be7846d872e7e26d5cb6759a52ea4113587";
|
||||
sha256 = "sha256-FL5olOy1KufULyqI2dJeS0OnKzC3LfPWxnia2i4f4yY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-8eU+Mf5dxL/bAMMShXvj8I1Kdd4ysBTWvgYIXwLStPI=";
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/appvm \
|
||||
--prefix PATH : "${lib.makeBinPath [ nix virt-manager-without-menu ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Nix-based app VMs";
|
||||
homepage = "https://code.dumpstack.io/tools/${pname}";
|
||||
maintainers = with maintainers; [ dump_stack cab404 onny ];
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
}
|
||||
|
|
@ -7,7 +7,7 @@ runCommand "${firmware.name}-xz" {} ''
|
|||
(cd ${firmware} && find lib/firmware -type d -print0) |
|
||||
(cd $out && xargs -0 mkdir -v --)
|
||||
(cd ${firmware} && find lib/firmware -type f -print0) |
|
||||
(cd $out && xargs -0tP "$NIX_BUILD_CORES" -n1 \
|
||||
(cd $out && xargs -0rtP "$NIX_BUILD_CORES" -n1 \
|
||||
sh -c 'xz -9c -T1 -C crc32 --lzma2=dict=2MiB "${firmware}/$1" > "$1.xz"' --)
|
||||
(cd ${firmware} && find lib/firmware -type l) | while read link; do
|
||||
target="$(readlink "${firmware}/$link")"
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flat-remix-gtk";
|
||||
version = "20220412";
|
||||
version = "20220427";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daniruiz";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-LIGYPsOoPN3KIe0XrjCIf7yV3p3Gfzx8zci57+HzW18=";
|
||||
sha256 = "sha256-nuhJZNsnD/DZ3WOsW+bBYH/OT6ma/qemlGoKaFzfj4c=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -10,19 +10,19 @@ let
|
|||
|
||||
# Decouples flutter derivation from dart derivation,
|
||||
# use specific dart version to not need to bump dart derivation when bumping flutter.
|
||||
dartVersion = "2.16.1";
|
||||
dartVersion = "2.16.2";
|
||||
dartSourceBase = "https://storage.googleapis.com/dart-archive/channels";
|
||||
dartForFlutter = dart.override {
|
||||
version = dartVersion;
|
||||
sources = {
|
||||
"${dartVersion}-x86_64-linux" = fetchurl {
|
||||
url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
|
||||
sha256 = "sha256-PMY6DCFQC8XrlnFzOEPcwgBAs5/cAvNd78969Z+I1Fk=";
|
||||
sha256 = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI=";
|
||||
};
|
||||
};
|
||||
};
|
||||
in {
|
||||
mkFlutter = mkFlutter;
|
||||
inherit mkFlutter;
|
||||
stable = mkFlutter rec {
|
||||
inherit version;
|
||||
dart = dartForFlutter;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
libffi ? null
|
||||
|
||||
, useLLVM ? !(stdenv.targetPlatform.isx86
|
||||
|| stdenv.targetPlatform.isPowerPC
|
||||
|| stdenv.targetPlatform.isPower
|
||||
|| stdenv.targetPlatform.isSparc)
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
libffi ? null
|
||||
|
||||
, useLLVM ? !(stdenv.targetPlatform.isx86
|
||||
|| stdenv.targetPlatform.isPowerPC
|
||||
|| stdenv.targetPlatform.isPower
|
||||
|| stdenv.targetPlatform.isSparc)
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
libffi ? null
|
||||
|
||||
, useLLVM ? !(stdenv.targetPlatform.isx86
|
||||
|| stdenv.targetPlatform.isPowerPC
|
||||
|| stdenv.targetPlatform.isPower
|
||||
|| stdenv.targetPlatform.isSparc)
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
libffi ? null
|
||||
|
||||
, useLLVM ? !(stdenv.targetPlatform.isx86
|
||||
|| stdenv.targetPlatform.isPowerPC
|
||||
|| stdenv.targetPlatform.isPower
|
||||
|| stdenv.targetPlatform.isSparc
|
||||
|| (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin))
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
, elfutils # for DWARF support
|
||||
|
||||
, useLLVM ? !(stdenv.targetPlatform.isx86
|
||||
|| stdenv.targetPlatform.isPowerPC
|
||||
|| stdenv.targetPlatform.isPower
|
||||
|| stdenv.targetPlatform.isSparc
|
||||
|| (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin))
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gleam";
|
||||
version = "0.20.1";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gleam-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AK+eb0eJyI7ALn7sg0wz4GzHthxrJWd1PVT5bL9LKWA=";
|
||||
sha256 = "sha256-BI8qEaNasNxcMJ7jJYKyFP3ypgh+P39F9tAzzqxA4BI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ openssl ] ++
|
||||
lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
|
||||
cargoSha256 = "sha256-kFTAPbP42sbhsvP069ua0ys1Dw7W+Gdsv2YaGrzorIk=";
|
||||
cargoSha256 = "sha256-avwdgX7FaBIOMumJknWBLc50JgtzGpM6S+Du7U/FE6Q=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A statically typed language for the Erlang VM";
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ let
|
|||
x11deps = [ libX11 xorgproto ];
|
||||
inherit (lib) optionals;
|
||||
|
||||
baseOcamlBranch = "4.07";
|
||||
baseOcamlBranch = "4.11";
|
||||
baseOcamlVersion = "${baseOcamlBranch}.1";
|
||||
metaocamlPatch = "107";
|
||||
metaocamlPatch = "111";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-${baseOcamlBranch}/ocaml-${baseOcamlVersion}.tar.gz";
|
||||
sha256 = "1x4sln131mcspisr22qc304590rvg720rbl7g2i4xiymgvhkpm1a";
|
||||
sha256 = "sha256-3Yi2OFvZLgrZInMuKMxoyHd4QXcOoAPCC9FS9dtEFc4=";
|
||||
};
|
||||
|
||||
metaocaml = fetchurl {
|
||||
url = "http://okmij.org/ftp/ML/ber-metaocaml-107.tar.gz";
|
||||
sha256 = "0xy6n0yj1f53pk612zfmn49pn04bd75qa40xgmr0w0lzx6dqsfmm";
|
||||
url = "http://okmij.org/ftp/ML/ber-metaocaml-${metaocamlPatch}.tar.gz";
|
||||
sha256 = "sha256-hDb0w0ZCm0hCz8jktZKmr/7gPSfBoKPT/cc7sPjt0yE=";
|
||||
};
|
||||
|
||||
x11env = buildEnv { name = "x11env"; paths = x11deps; };
|
||||
|
|
@ -33,11 +33,7 @@ stdenv.mkDerivation rec {
|
|||
x11inc = "${x11env}/include";
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags = optionals useX11
|
||||
[ "-x11lib" x11lib
|
||||
"-x11include" x11inc
|
||||
"-flambda"
|
||||
];
|
||||
configureFlags = optionals useX11 [ "--enable-flambda" ];
|
||||
|
||||
dontStrip = true;
|
||||
buildInputs = [ ncurses ] ++ optionals useX11 x11deps;
|
||||
|
|
@ -48,8 +44,8 @@ stdenv.mkDerivation rec {
|
|||
# used SIGSTKSZ as the size of a statically-allocated array. This
|
||||
# patch is also applied by the ocaml/4.07.nix expression.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ocaml/ocaml/commit/00b8c4d503732343d5d01761ad09650fe50ff3a0.patch";
|
||||
sha256 = "sha256:02cfya5ff5szx0fsl5x8ax76jyrla9zmf3qxavf3adhwq5ssrfcv";
|
||||
url = "https://github.com/ocaml/ocaml/commit/dd28ac0cf4365bd0ea1bcc374cbc5e95a6f39bea.patch";
|
||||
sha256 = "sha256-OmyovAu+8sgg3n5YD29Cytx3u/9PO2ofMsmrwiKUxks=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ assert docSupport -> texLive != null && texinfo != null && texi2html != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "avrdude";
|
||||
version = "6.4";
|
||||
version = "7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-qb5wZvcKnc9L8HNvz1MdtqMlCu0aJMxkOt0nZBtxEPk=";
|
||||
sha256 = "sha256-wO9l2Y1gQMoLTytwDVFGPCoflGZUQfOdFdl0Qtu3m1Q=";
|
||||
};
|
||||
|
||||
configureFlags = lib.optionals docSupport "--enable-doc";
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
SDL.dev
|
||||
(lib.getDev SDL)
|
||||
SDL_image
|
||||
SDL_mixer
|
||||
SDL_ttf
|
||||
|
|
|
|||
52
pkgs/development/libraries/SDL_compat/default.nix
Normal file
52
pkgs/development/libraries/SDL_compat/default.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, SDL2
|
||||
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
|
||||
, openglSupport ? libGLSupported
|
||||
, libGL
|
||||
, libGLU
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) optionals makeLibraryPath;
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SDL_compat";
|
||||
version = "1.2.52";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsdl-org";
|
||||
repo = "sdl12-compat";
|
||||
rev = "release-" + version;
|
||||
hash = "sha256-PDGlMI8q74JaqMQ5oX9Zt5CEr7frFQWECbuwq5g25eg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
propagatedBuildInputs = [ SDL2 ]
|
||||
++ optionals openglSupport [ libGL libGLU ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
setupHook = ../SDL/setup-hook.sh;
|
||||
|
||||
postFixup = ''
|
||||
for lib in $out/lib/*.so* ; do
|
||||
if [[ -L "$lib" ]]; then
|
||||
patchelf --set-rpath "$(patchelf --print-rpath $lib):${makeLibraryPath propagatedBuildInputs}" "$lib"
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cross-platform multimedia library - build SDL 1.2 applications against 2.0";
|
||||
homepage = "https://www.libsdl.org/";
|
||||
license = licenses.zlib;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -13,11 +13,11 @@ assert withBlas -> openblas != null && blas.implementation == "openblas" && lapa
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flint";
|
||||
version = "2.8.4";
|
||||
version = "2.8.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.flintlib.org/flint-${version}.tar.gz";
|
||||
sha256 = "sha256-Yd+S6oyOncaS1Gxx1/UKqgmjPUugjQKheEcwpEXl5L4=";
|
||||
sha256 = "sha256-WRH+3/kREA8VeB8146T6k0/mDkrqAqjBDMiRgQHB7tg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "folly";
|
||||
version = "2022.02.28.00";
|
||||
version = "2022.05.16.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "folly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9h2NsfQMQ7ps9Rt0HhTD+YKwk/soGchCC9GyEJGcm4g=";
|
||||
sha256 = "sha256-JCA6NhsL2mVmpXVV5wmZhtjaYrvp39mvy1r8/nMYcuI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-gmmlib";
|
||||
version = "22.1.2";
|
||||
version = "22.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "gmmlib";
|
||||
rev = "intel-gmmlib-${version}";
|
||||
sha256 = "sha256-5exS0B2iRbmFkKtoHzL4NnZ7L3DaukthUYkoj2tpZuE=";
|
||||
sha256 = "sha256-YckzS9f0q+5YOR+8mTZ/u67NVFrwLllxfEuojuJC84E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, qt4, qjson }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libechonest";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lfranchi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0xbavf9f355dl1d3qv59x4ryypqrdanh9xdvw2d0q66l008crdkq";
|
||||
};
|
||||
|
||||
# Fix build with GCC 11.
|
||||
NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lfranchi/libechonest/commit/009514f65044823ef29045397d4b58dd04d09977.patch";
|
||||
sha256 = "0dmmpi7hixdngwiv045ilqrzyzkf56xpfyihcsx5i3xya2m0mynx";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lfranchi/libechonest/commit/3ce779536d56a163656e8098913f923e6cda2b5c.patch";
|
||||
sha256 = "1vasd3sgqah562vxk71jibyws5cbihjjfnffd50qvdm2xqgvbx94";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen ];
|
||||
buildInputs = [ qt4 qjson ];
|
||||
|
||||
doCheck = false; # requires network access
|
||||
|
||||
meta = {
|
||||
description = "A C++/Qt wrapper around the Echo Nest API";
|
||||
homepage = "https://projects.kde.org/projects/playground/libs/libechonest";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libqalculate";
|
||||
version = "4.1.1";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "libqalculate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-y9GNf2xR3bZ8Pj99Y8qSBbK+hQEkg/+xOzUdyFI5HLw=";
|
||||
sha256 = "sha256-mIzHizoDsdSVcepWACeVkCTgt4gxd99WKXrrGi+qASo=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
, openjpeg
|
||||
, pkg-config
|
||||
, python3
|
||||
, scribusUnstable
|
||||
, scribus
|
||||
, texlive
|
||||
, zlib
|
||||
, withData ? true, poppler_data
|
||||
|
|
@ -35,7 +35,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "poppler-${suffix}";
|
||||
version = "22.04.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
|
||||
version = "22.04.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
|
|||
passthru = {
|
||||
tests = {
|
||||
# These depend on internal poppler code that frequently changes.
|
||||
inherit inkscape cups-filters texlive scribusUnstable;
|
||||
inherit inkscape cups-filters texlive scribus;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, qt4 }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, qtbase }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.0";
|
||||
|
|
@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ qt4 ];
|
||||
buildInputs = [ qtbase ];
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightweight data-interchange format";
|
||||
homepage = "http://qjson.sourceforge.net/";
|
||||
license = licenses.lgpl21;
|
||||
inherit (qt4.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
wrapProgram $out/bin/smpeg-config \
|
||||
--prefix PATH ":" "${pkg-config}/bin" \
|
||||
--prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig"
|
||||
--prefix PKG_CONFIG_PATH ":" "${lib.getDev SDL}/lib/pkgconfig"
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = "-lX11";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "androidtv";
|
||||
version = "0.0.67";
|
||||
version = "0.0.68";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "JeffLIrion";
|
||||
repo = "python-androidtv";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MAlKD2PDQJQaKPiMQDu1CMvn4xnxb8FmeYqzcW4hso0=";
|
||||
hash = "sha256-cRupsdHpzzxV57ZsuWqZBvtbMYWwXFSVLqsNJ7kfpPA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,97 +9,97 @@
|
|||
, numpy
|
||||
, pandas
|
||||
, pytest
|
||||
, cloudpickle
|
||||
, scipy
|
||||
, setuptools
|
||||
, cloudpickle
|
||||
, pytestCheckHook
|
||||
, scipy
|
||||
, packaging
|
||||
, typing-extensions
|
||||
# , tensorflow-probability (incompatible version)
|
||||
, pythonOlder
|
||||
, xarray
|
||||
, xarray-einstats
|
||||
, zarr
|
||||
, h5py
|
||||
#, pymc3 (broken)
|
||||
#, pyro-ppl (broken)
|
||||
#, pystan (not packaged)
|
||||
#, numpyro (not packaged)
|
||||
, jaxlib
|
||||
, torchvision
|
||||
, jax
|
||||
# , pymc3 (circular dependency)
|
||||
, pyro-ppl
|
||||
#, pystan (not packaged)
|
||||
, numpyro
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "arviz";
|
||||
version = "0.12.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arviz-devs";
|
||||
repo = "arviz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ClARxgfji/CavEy8g5oeYK7pwSZS1yUIZnBiyTbZ/zU=";
|
||||
hash = "sha256-ClARxgfji/CavEy8g5oeYK7pwSZS1yUIZnBiyTbZ/zU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# needed to install
|
||||
matplotlib
|
||||
netcdf4
|
||||
pandas
|
||||
xarray
|
||||
# needed to import
|
||||
setuptools
|
||||
# not needed to import, but used by many functions
|
||||
# and is listed as a dependency in the documentation
|
||||
numpy
|
||||
packaging
|
||||
pandas
|
||||
scipy
|
||||
setuptools
|
||||
xarray
|
||||
xarray-einstats
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "typing_extensions>=3.7.4.3,<4" "typing_extensions>=3.7.4.3"
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
bokeh
|
||||
emcee
|
||||
numba
|
||||
pytest
|
||||
cloudpickle
|
||||
zarr
|
||||
#tensorflow-probability (used by disabled tests)
|
||||
emcee
|
||||
h5py
|
||||
#pymc3 (broken, used by disabled tests)
|
||||
#pyro-ppl (broken, used by disabled tests)
|
||||
#pystan (not packaged)
|
||||
#numpyro (not packaged, used by disabled tests)
|
||||
jax
|
||||
jaxlib
|
||||
numba
|
||||
numpyro
|
||||
# pymc3 (circular dependency)
|
||||
pyro-ppl
|
||||
# pystan (not packaged)
|
||||
pytestCheckHook
|
||||
torchvision
|
||||
zarr
|
||||
];
|
||||
|
||||
# check requires pymc3 and pyro-ppl, which are currently broken, and pystan
|
||||
# and numpyro, which are not yet packaged, and an incompatible (old) version
|
||||
# of tensorflow-probability. some checks also need to make
|
||||
# directories and do not have permission to do so. So we can only check part
|
||||
# of the package
|
||||
# Additionally, there are some failures with the plots test, which revolve
|
||||
# around attempting to output .mp4 files through an interface that only wants
|
||||
# to output .html files.
|
||||
# The following test have been disabled as a result: data_cmdstanpy,
|
||||
# data_numpyro, data_pyro, data_pystan, data_tfp, data_pymc3 and plots.
|
||||
checkPhase = ''
|
||||
cd arviz/tests/
|
||||
export HOME=$TMPDIR
|
||||
pytest \
|
||||
base_tests/test_data.py \
|
||||
base_tests/test_diagnostics.py \
|
||||
base_tests/test_plot_utils.py \
|
||||
base_tests/test_rcparams.py \
|
||||
base_tests/test_stats.py \
|
||||
base_tests/test_stats_numba.py \
|
||||
base_tests/test_stats_utils.py \
|
||||
base_tests/test_utils.py \
|
||||
base_tests/test_utils_numba.py \
|
||||
base_tests/test_data_zarr.py \
|
||||
external_tests/test_data_cmdstan.py \
|
||||
external_tests/test_data_emcee.py
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
pytestFlagsArray = [
|
||||
"arviz/tests/base_tests/"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Remove tests as dependency creates a circular dependency
|
||||
"arviz/tests/external_tests/test_data_pymc.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"test_plot_separation"
|
||||
"test_plot_trace_legend"
|
||||
"test_cov"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"arviz"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "ArviZ is a Python package for exploratory analysis of Bayesian models";
|
||||
description = "Library for exploratory analysis of Bayesian models";
|
||||
homepage = "https://arviz-devs.github.io/arviz/";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.omnipotententity ];
|
||||
maintainers = with maintainers; [ omnipotententity ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
77
pkgs/development/python-modules/drf-spectacular/default.nix
Normal file
77
pkgs/development/python-modules/drf-spectacular/default.nix
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, dj-rest-auth
|
||||
, django
|
||||
, django-allauth
|
||||
, django-filter
|
||||
, django-oauth-toolkit
|
||||
, django-polymorphic
|
||||
, django-rest-auth
|
||||
, django-rest-polymorphic
|
||||
, djangorestframework
|
||||
, djangorestframework-camel-case
|
||||
, djangorestframework-dataclasses
|
||||
, djangorestframework-recursive
|
||||
, djangorestframework-simplejwt
|
||||
, drf-jwt
|
||||
, drf-nested-routers
|
||||
, drf-spectacular-sidecar
|
||||
, inflection
|
||||
, jsonschema
|
||||
, psycopg2
|
||||
, pytest-django
|
||||
, pytestCheckHook
|
||||
, pyyaml
|
||||
, uritemplate
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "drf-spectacular";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tfranzel";
|
||||
repo = "drf-spectacular";
|
||||
rev = version;
|
||||
sha256 = "sha256-SgzyIzgFBXsNHfY2OfCq0LhJyi/ZCOSA8QveKNduIBc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
djangorestframework
|
||||
inflection
|
||||
jsonschema
|
||||
pyyaml
|
||||
uritemplate
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
dj-rest-auth
|
||||
django-allauth
|
||||
django-filter
|
||||
django-oauth-toolkit
|
||||
django-polymorphic
|
||||
django-rest-auth
|
||||
django-rest-polymorphic
|
||||
djangorestframework-camel-case
|
||||
djangorestframework-dataclasses
|
||||
djangorestframework-recursive
|
||||
djangorestframework-simplejwt
|
||||
drf-jwt
|
||||
drf-nested-routers
|
||||
drf-spectacular-sidecar
|
||||
psycopg2
|
||||
pytest-django
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "drf_spectacular" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sane and flexible OpenAPI 3 schema generation for Django REST framework";
|
||||
homepage = "https://github.com/tfranzel/drf-spectacular";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.20.40";
|
||||
version = "0.20.42";
|
||||
pname = "dulwich";
|
||||
format = "setuptools";
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vtcO/gt91RpHvOqbmEqwamdddDi3izLaHLr891D7utc=";
|
||||
hash = "sha256-cro7YK5qVU0TMrO0CjRf6+FuxGnPYBS7RDtxmQLjPvA=";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, certifi
|
||||
, ecs-logging
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, httpx
|
||||
, jinja2
|
||||
, jsonschema
|
||||
|
|
@ -40,6 +41,14 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-IaCl39rhsFLQwvQdPcqKruV/Mo3f7WH91UVgMG/cnOc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# fix tests with sanic>=22.3.0
|
||||
url = "https://github.com/elastic/apm-agent-python/commit/114ee6ca998b4d6a5cb075a289af39cb963cf08a.patch";
|
||||
hash = "sha256-M6yEHjThKDCRQOmR0L94KEt8tUun1tPRULI6PNIlE/8=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
blinker
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "feedparser";
|
||||
version = "6.0.9";
|
||||
version = "6.0.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-2tQue+rsVfmcCLKwz3KIvHz9JLb3LI74VHi8tVZIzUI=";
|
||||
sha256 = "sha256-J9pIX0Y3znFjzeqxOoAxK5O30MG3db70pHYpoxELylE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flux-led";
|
||||
version = "0.28.29";
|
||||
version = "0.28.30";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,8 +16,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "Danielhiversen";
|
||||
repo = "flux_led";
|
||||
rev = version;
|
||||
sha256 = "sha256-Hwe8eshY5j+10fARCp7fMnZf2Sxal7+7Vj5DYVPNXks=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-ujox3Q8oyPw8+SBdF9O7ezu8FC/NnWxeSGW8Nfh7tZ8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "1.5.3";
|
||||
version = "1.5.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-4fB0IIKZNNU7MfHRhdjNhP7RQMWcvfqawj2P01LIPa0=";
|
||||
sha256 = "sha256-V9wQXXPeoplxVcFDIhQcJFnKkewwDEaoQfTsQ7IyjOU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hsluv";
|
||||
version = "5.0.2";
|
||||
version = "5.0.3";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hsluv";
|
||||
repo = "hsluv-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "0r0w8ycjwfg3pmzjghzrs0lkam93fzvgiqvrwh3nl9jnqlpw7v7j";
|
||||
sha256 = "sha256-p3KD+zhHCOs/rLUVf1IkW/isfpUPQstB2VHGmZ/aEPU=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,18 @@
|
|||
{ buildPythonPackage, freezegun, fetchFromGitHub, lib, pytestCheckHook
|
||||
, pytest-mock, pytest-runner, six, tornado_4 }:
|
||||
{ buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
|
||||
# runtime
|
||||
, six
|
||||
|
||||
# tests
|
||||
, freezegun
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, tornado_4
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lomond";
|
||||
|
|
@ -12,11 +25,33 @@ buildPythonPackage rec {
|
|||
sha256 = "0lydq0imala08wxdyg2iwhqa6gcdrn24ah14h91h2zcxjhjk4gv8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytest-runner ];
|
||||
propagatedBuildInputs = [ six ];
|
||||
checkInputs = [ pytestCheckHook freezegun pytest-mock tornado_4 ];
|
||||
# Makes HTTP requests
|
||||
disabledTests = [ "test_proxy" "test_live" ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
freezegun
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
] ++ lib.optionals (pythonOlder "3.10") [
|
||||
tornado_4
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Makes HTTP requests
|
||||
"test_proxy"
|
||||
"test_live"
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [
|
||||
# requires tornado_4, which is not compatible with python3.10
|
||||
"tests/test_integration.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Websocket Client Library";
|
||||
|
|
|
|||
62
pkgs/development/python-modules/numpyro/default.nix
Normal file
62
pkgs/development/python-modules/numpyro/default.nix
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, jax
|
||||
, jaxlib
|
||||
, multipledispatch
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, tqdm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "numpyro";
|
||||
version = "0.9.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
hash = "sha256-TbzyIt17/z56juc8kH1L8rTkvSgcsT5ah6xmvWTo6tM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jax
|
||||
jaxlib
|
||||
numpy
|
||||
multipledispatch
|
||||
tqdm
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"numpyro"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError due to tolerance issues
|
||||
"test_beta_binomial_log_prob"
|
||||
"test_collapse_beta"
|
||||
"test_cpu"
|
||||
"test_gamma_poisson"
|
||||
"test_gof"
|
||||
"test_hpdi"
|
||||
"test_kl_univariate"
|
||||
"test_mean_var"
|
||||
# Tests want to download data
|
||||
"data_load"
|
||||
"test_jsb_chorales"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for probabilistic programming with NumPy";
|
||||
homepage = "https://num.pyro.ai/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
, importlib-metadata
|
||||
, importlib-resources
|
||||
, jbig2enc
|
||||
, pdfminer
|
||||
, pdfminer-six
|
||||
, pikepdf
|
||||
, pillow
|
||||
, pluggy
|
||||
|
|
@ -63,7 +63,7 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [
|
||||
coloredlogs
|
||||
img2pdf
|
||||
pdfminer
|
||||
pdfminer-six
|
||||
pikepdf
|
||||
pillow
|
||||
pluggy
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "panel";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
format = "wheel";
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
# tries to fetch even more artifacts
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
hash = "sha256-Iv1Lb45n2XUHSluZzdF2Bf/hXZmgs++9/av26rHgePc=";
|
||||
hash = "sha256-1GC119AUfmse3fhQQxSi9eDJJorYvt2NeE7UY1GrW3E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pdfminer_six";
|
||||
version = "20220506";
|
||||
pname = "pdfminer-six";
|
||||
version = "20220524";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "pdfminer";
|
||||
repo = "pdfminer.six";
|
||||
rev = version;
|
||||
sha256 = "sha256-Lq+ou7+Lmr1H69L8X/vuky+/tXDD3bBBaCysymeRuXA=";
|
||||
sha256 = "sha256-XO9sdHeS/8MgVW0mxbTe2AY5BDfnBSDNzZwLsSKmQh0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ charset-normalizer cryptography ];
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytestCheckHook }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, pdfminer-six, chardet, pytestCheckHook }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pdfx";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
--replace "pdfminer.six==20201018" "pdfminer.six"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ pdfminer chardet ];
|
||||
propagatedBuildInputs = [ pdfminer-six chardet ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
|
|
|
|||
|
|
@ -61,6 +61,9 @@ buildPythonPackage rec {
|
|||
--replace " --junit-xml=junit-results.xml" ""
|
||||
substituteInPlace setup.py \
|
||||
--replace '"oldest-supported-numpy", ' ""
|
||||
|
||||
# we don't need setup.py to find the macos sdk for us
|
||||
sed -i '/sdk_path/d' setup.py
|
||||
'';
|
||||
|
||||
# To prevent importing of an incomplete package from the build directory
|
||||
|
|
|
|||
|
|
@ -1,17 +1,37 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, docutils, pybtex, six }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, docutils
|
||||
, fetchPypi
|
||||
, pybtex
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.0.1";
|
||||
pname = "pybtex-docutils";
|
||||
version = "1.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
doCheck = false;
|
||||
buildInputs = [ docutils pybtex six ];
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d53aa0c31dc94d61fd30ea3f06c749e6f510f9ff0e78cb2765a9300f173d8626";
|
||||
hash = "sha256-Q6o1O21Jj9WsMPAHOpjjMtBh00/mGdPVDRdh+P1KoBY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
docutils
|
||||
pybtex
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pybtex_docutils"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A docutils backend for pybtex";
|
||||
homepage = "https://github.com/mcmtroffaes/pybtex-docutils";
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
|
@ -19,6 +20,14 @@ buildPythonPackage rec {
|
|||
sha256 = "1xwx0c1dp2374bwigzwhvcj4577vrxyhn6i5zv73k9ydc7w1xgyz";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Python3.10 compatibility; https://github.com/nielstron/pyfronius/pull/7
|
||||
url = "https://github.com/nielstron/pyfronius/commit/9deb209d4246ff575cd3c4c5373037bf11df6719.patch";
|
||||
hash = "sha256-srXYCvp86kGYUYZIXMcu68hEbkTspD945J+hc/AhqSw=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,27 @@
|
|||
{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, libgit2, cached-property, pytestCheckHook, cffi, cacert }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, cacert
|
||||
, cached-property
|
||||
, cffi
|
||||
, fetchPypi
|
||||
, isPyPy
|
||||
, libgit2
|
||||
, pycparser
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygit2";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-72R5w7YZKCUxawVjNtt36/9ueEmusfu4i3YAGsM3uck=";
|
||||
hash = "sha256-IIlEM98RRkgarK434rDzu7/eoCbbL1UGEXC9mCPkCxk=";
|
||||
};
|
||||
|
||||
preConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
|
|
@ -19,14 +34,21 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
cached-property
|
||||
] ++ lib.optional (!isPyPy) cffi;
|
||||
pycparser
|
||||
] ++ lib.optional (!isPyPy) [
|
||||
cffi
|
||||
];
|
||||
|
||||
propagatedNativeBuildInputs = lib.optional (!isPyPy) cffi;
|
||||
propagatedNativeBuildInputs = lib.optional (!isPyPy) [
|
||||
cffi
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# disable tests that require networking
|
||||
# Disable tests that require networking
|
||||
"test/test_repository.py"
|
||||
"test/test_credentials.py"
|
||||
"test/test_submodule.py"
|
||||
|
|
@ -44,10 +66,14 @@ buildPythonPackage rec {
|
|||
# https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582681068
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pygit2"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A set of Python bindings to the libgit2 shared library";
|
||||
homepage = "https://pypi.python.org/pypi/pygit2";
|
||||
license = licenses.gpl2;
|
||||
homepage = "https://github.com/libgit2/pygit2";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pykeepass";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libkeepass";
|
||||
repo = "pykeepass";
|
||||
rev = version;
|
||||
sha256 = "sha256-D+loaPBpKdXyiqpdth3ANDjH6IewuKYhj/DzRE2hDn4=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-q6cBowEki5iJh04Hp1jwbWdteEu3HXtD3tG/TsYDRNI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -30,9 +30,11 @@ buildPythonPackage rec {
|
|||
${python.interpreter} -m unittest tests.tests
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pykeepass" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/libkeepass/pykeepass";
|
||||
changelog = "https://github.com/libkeepass/pykeepass/blob/${version}/CHANGELOG.rst";
|
||||
changelog = "https://github.com/libkeepass/pykeepass/blob/${src.rev}/CHANGELOG.rst";
|
||||
description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
|
|
|
|||
|
|
@ -1,72 +1,64 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, theano-pymc
|
||||
, pandas
|
||||
, patsy
|
||||
, joblib
|
||||
, cachetools
|
||||
, tqdm
|
||||
, six
|
||||
, h5py
|
||||
, aeppl
|
||||
, aesara
|
||||
, arviz
|
||||
, packaging
|
||||
, pytest
|
||||
, nose
|
||||
, parameterized
|
||||
, buildPythonPackage
|
||||
, cachetools
|
||||
, cloudpickle
|
||||
, fastprogress
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, pythonOlder
|
||||
, scipy
|
||||
, typing-extensions
|
||||
, dill
|
||||
, semver
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymc3";
|
||||
version = "3.11.5";
|
||||
disabled = pythonOlder "3.5";
|
||||
version = "unstable-2022-05-23";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-M0HLvZYpCROLfV6+TtfP7in0Cy/nyt64iLOda7wXE4w=";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pymc-devs";
|
||||
repo = "pymc3";
|
||||
rev = "b5a5b569779673914c9420c1cc0135b118505ff5";
|
||||
hash = "sha256-vkIFwdjX2Rex8oqscVMP4xh0K4bjmN/RL7aQmOI//Dw=";
|
||||
};
|
||||
|
||||
# No need for coverage stats in Nix builds
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace ", 'pytest-cov'" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pandas
|
||||
patsy
|
||||
joblib
|
||||
tqdm
|
||||
six
|
||||
h5py
|
||||
aeppl
|
||||
aesara
|
||||
arviz
|
||||
packaging
|
||||
fastprogress
|
||||
typing-extensions
|
||||
dill
|
||||
theano-pymc
|
||||
cachetools
|
||||
semver
|
||||
cloudpickle
|
||||
fastprogress
|
||||
numpy
|
||||
scipy
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace ', "pytest-cov"' ""
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "aesara==2.6.2" "aesara" \
|
||||
--replace "aeppl==0.0.28" "aeppl"
|
||||
'';
|
||||
|
||||
# The test suite is computationally intensive and test failures are not
|
||||
# indicative for package usability hence tests are disabled by default.
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pymc3" ];
|
||||
|
||||
# For some reason tests are run as a part of the *install* phase if enabled.
|
||||
# Theano writes compiled code to ~/.theano hence we set $HOME.
|
||||
preInstall = "export HOME=$(mktemp -d)";
|
||||
postInstall = "rm -rf $HOME";
|
||||
pythonImportsCheck = [
|
||||
"pymc"
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)";
|
||||
homepage = "https://github.com/pymc-devs/pymc3";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ nidabdella ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ nidabdella ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,20 +1,40 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, precice, numpy, mpi4py, cython }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, cython
|
||||
, fetchFromGitHub
|
||||
, mpi4py
|
||||
, numpy
|
||||
, precice
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyprecice";
|
||||
version = "2.3.0.1";
|
||||
version = "2.4.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "precice";
|
||||
repo = "python-bindings";
|
||||
rev = "v${version}";
|
||||
sha256 = "1yz96pif63ms797bzxbfrjba4mgz7cz5dqrqghn5sg0g1b9qxnn5";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Endy5oiC1OWdtZlVPUkIdkzoDTc1b5TaQ6VEUWq5iSg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
propagatedBuildInputs = [ numpy mpi4py precice ];
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
mpi4py
|
||||
precice
|
||||
];
|
||||
|
||||
# Disable Test because everything depends on open mpi which requires network
|
||||
doCheck = false;
|
||||
|
||||
doCheck = false; # Disable Test because everything depends on open mpi which requires network.
|
||||
# Do not use pythonImportsCheck because this will also initialize mpi which requires a network interface
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,29 +1,62 @@
|
|||
{ buildPythonPackage, fetchPypi, lib, pytorch, contextlib2
|
||||
, graphviz, networkx, six, opt-einsum, tqdm, pyro-api }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, graphviz
|
||||
, jupyter
|
||||
, matplotlib
|
||||
, networkx
|
||||
, opt-einsum
|
||||
, pandas
|
||||
, pillow
|
||||
, pyro-api
|
||||
, pythonOlder
|
||||
, pytorch
|
||||
, scikit-learn
|
||||
, seaborn
|
||||
, torchvision
|
||||
, tqdm
|
||||
, wget
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.8.1";
|
||||
pname = "pyro-ppl";
|
||||
version = "1.8.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
sha256 = "sha256-18BJ6y50haYStN2ZwkwwnMhgx8vGsZczhwNPVDbRyNY=";
|
||||
hash = "sha256-18BJ6y50haYStN2ZwkwwnMhgx8vGsZczhwNPVDbRyNY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyro-api
|
||||
pytorch
|
||||
contextlib2
|
||||
# TODO(tom): graphviz pulls in a lot of dependencies - make
|
||||
# optional when some time to figure out how.
|
||||
graphviz
|
||||
networkx
|
||||
six
|
||||
opt-einsum
|
||||
tqdm
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
extras = [
|
||||
graphviz
|
||||
jupyter
|
||||
# lap
|
||||
matplotlib
|
||||
pandas
|
||||
pillow
|
||||
scikit-learn
|
||||
seaborn
|
||||
torchvision
|
||||
# visdom
|
||||
wget
|
||||
];
|
||||
};
|
||||
|
||||
# pyro not shipping tests do simple smoke test instead
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyro"
|
||||
"pyro.distributions"
|
||||
|
|
@ -31,12 +64,10 @@ buildPythonPackage rec {
|
|||
"pyro.optim"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "A Python library for probabilistic modeling and inference";
|
||||
meta = with lib; {
|
||||
description = "Library for probabilistic modeling and inference";
|
||||
homepage = "http://pyro.ai";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ teh georgewhewell ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ teh georgewhewell ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,6 +25,11 @@ buildPythonPackage rec {
|
|||
sanic-testing
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# incompatible with sanic>=22.3.0
|
||||
"test_login_required"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Support for httpx>=0.20.0
|
||||
substituteInPlace tests/test_auth.py \
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sanic-routing";
|
||||
version = "0.7.2";
|
||||
version = "22.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sanic-org";
|
||||
repo = "sanic-routing";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MN6A8CtDVxj34eehr3UIwCT09VOfcruVX+/iImr1MgY=";
|
||||
hash = "sha256-dX+uxrVjtPxX0ba3WUE/JKgj0PZzvFdKr/lXQgASN6Y=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook pytest-asyncio ];
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sanic-testing";
|
||||
version = "0.8.2";
|
||||
version = "22.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sanic-org";
|
||||
repo = "sanic-testing";
|
||||
rev = "v${version}";
|
||||
sha256 = "17fbb78gvic5s9nlcgwj817fq1f9j9d1d7z6n2ahhinmvyzl9gc8";
|
||||
sha256 = "sha256-ZsLQA8rP4RrbVSUy5n0WZs903fnF7jtFqrIe5JVuRIg=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
@ -23,11 +23,6 @@ buildPythonPackage rec {
|
|||
"testsout"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "httpx>=0.18,<0.22" "httpx"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
httpx
|
||||
sanic
|
||||
|
|
|
|||
|
|
@ -24,32 +24,23 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sanic";
|
||||
version = "21.12.1";
|
||||
version = "22.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7" ||
|
||||
pythonAtLeast "3.10"; # see GHSA-7p79-6x2v-5h88
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sanic-org";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0jyl23q7b7fyqzan97qflkqcvmfpzbxbzv0qgygxasrzh80zx67g";
|
||||
hash = "sha256-4zdPp3X22dfZ5YlW3G5/OqeUxrt+NiFO9dk2XjEKXEg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Loosen dependency requirements.
|
||||
substituteInPlace setup.py \
|
||||
--replace "pytest==6.2.5" "pytest" \
|
||||
--replace "gunicorn==20.0.4" "gunicorn" \
|
||||
--replace "multidict>=5.0,<6.0" "multidict"
|
||||
|
||||
sed '/pytest-sanic/d' setup.py
|
||||
|
||||
# Patch a request headers test to allow brotli encoding
|
||||
# (we build httpx with brotli support, upstream doesn't).
|
||||
substituteInPlace tests/test_headers.py \
|
||||
--replace "deflate\r\n" "deflate, br\r\n"
|
||||
--replace "gunicorn==20.0.4" "gunicorn"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -66,8 +57,6 @@ buildPythonPackage rec {
|
|||
beautifulsoup4
|
||||
gunicorn
|
||||
pytest-asyncio
|
||||
pytest-benchmark
|
||||
pytest-sugar
|
||||
pytestCheckHook
|
||||
sanic-testing
|
||||
uvicorn
|
||||
|
|
@ -95,49 +84,34 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
disabledTests = [
|
||||
# Lack of uvloop setup through fixtures
|
||||
"test_create_asyncio_server"
|
||||
"test_listeners_triggered_async"
|
||||
"test_tls_options"
|
||||
# Tests are flaky
|
||||
"test_keep_alive_client_timeout"
|
||||
"test_check_timeouts_request_timeout"
|
||||
"test_check_timeouts_response_timeout"
|
||||
"test_reloader_live"
|
||||
"test_zero_downtime"
|
||||
# Not working from 21.9.1
|
||||
"test_create_server_main"
|
||||
"test_create_server_main_convenience"
|
||||
"test_debug"
|
||||
# Fails to parse cmdline arguments
|
||||
"test_dev"
|
||||
"test_auto_reload"
|
||||
"test_no_exceptions_when_cancel_pending_request"
|
||||
"test_ipv6_address_is_not_wrapped"
|
||||
# Failure of the redirect tests seems to be related to httpx>0.20.0
|
||||
"test_redirect"
|
||||
"test_chained_redirect"
|
||||
"test_unix_connection"
|
||||
# These appear to be very sensitive to output of commands
|
||||
"test_access_logs"
|
||||
"test_auto_reload"
|
||||
"test_host_port"
|
||||
"test_no_exceptions_when_cancel_pending_request"
|
||||
"test_host_port_ipv6_loopback"
|
||||
"test_num_workers"
|
||||
"test_server_run"
|
||||
"test_version"
|
||||
# Sensitive comparison of raw HTTP header fails
|
||||
"test_raw_headers"
|
||||
# noisy_exceptions sometimes missing from sanic stdout
|
||||
"test_debug"
|
||||
"test_access_logs"
|
||||
"test_noisy_exceptions"
|
||||
] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
|
||||
# test fail on aarch64
|
||||
"test_tls_wrong_options"
|
||||
"test_cookie_expires"
|
||||
"test_gunicorn_worker"
|
||||
"test_gunicorn_worker_no_logs"
|
||||
"test_gunicorn_worker_with_logs"
|
||||
# OSError: foo
|
||||
"test_bad_headers"
|
||||
"test_create_server_trigger_events"
|
||||
"test_json_body_requests"
|
||||
"test_missing_startup_raises_exception"
|
||||
"test_no_body_requests"
|
||||
"test_oserror_warning"
|
||||
"test_running_multiple_offset_warning"
|
||||
"test_streaming_body_requests"
|
||||
"test_trigger_before_events_create_server"
|
||||
"test_keep_alive_connection_context"
|
||||
# Racy tests
|
||||
"test_keep_alive_client_timeout"
|
||||
"test_keep_alive_server_timeout"
|
||||
"test_zero_downtime"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# We are not interested in benchmarks
|
||||
"benchmark/"
|
||||
# unable to create async loop
|
||||
"test_app.py"
|
||||
"test_asgi.py"
|
||||
|
|
|
|||
|
|
@ -1,43 +1,47 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
|
||||
# runtime
|
||||
, certifi
|
||||
, urllib3
|
||||
|
||||
# optionals
|
||||
, aiohttp
|
||||
, asttokens
|
||||
, apache-beam
|
||||
, blinker
|
||||
, botocore
|
||||
, bottle
|
||||
, buildPythonPackage
|
||||
, celery
|
||||
, certifi
|
||||
, chalice
|
||||
, django
|
||||
, executing
|
||||
, fakeredis
|
||||
, falcon
|
||||
, fetchFromGitHub
|
||||
, flask
|
||||
, flask_login
|
||||
, gevent
|
||||
, httpx
|
||||
, iana-etc
|
||||
, isPy3k
|
||||
, jsonschema
|
||||
, libredirect
|
||||
, pure-eval
|
||||
, pyramid
|
||||
, pyspark
|
||||
, pytest-django
|
||||
, pytest-forked
|
||||
, pytest-localserver
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, rq
|
||||
, sanic
|
||||
, sanic-testing
|
||||
, sqlalchemy
|
||||
, tornado
|
||||
, trytond
|
||||
, urllib3
|
||||
, werkzeug
|
||||
, multidict
|
||||
|
||||
# tests
|
||||
, asttokens
|
||||
, executing
|
||||
, gevent
|
||||
, jsonschema
|
||||
, mock
|
||||
, pyrsistent
|
||||
, pytest-forked
|
||||
, pytest-localserver
|
||||
, pytest-watch
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -59,37 +63,73 @@ buildPythonPackage rec {
|
|||
urllib3
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
aiohttp = [
|
||||
aiohttp
|
||||
];
|
||||
beam = [
|
||||
apache-beam
|
||||
];
|
||||
bottle = [
|
||||
bottle
|
||||
];
|
||||
celery = [
|
||||
celery
|
||||
];
|
||||
chalice = [
|
||||
chalice
|
||||
];
|
||||
django = [
|
||||
django
|
||||
];
|
||||
falcon = [
|
||||
falcon
|
||||
];
|
||||
flask = [
|
||||
flask
|
||||
blinker
|
||||
];
|
||||
httpx = [
|
||||
httpx
|
||||
];
|
||||
pyspark = [
|
||||
pyspark
|
||||
];
|
||||
pure_eval = [
|
||||
asttokens
|
||||
executing
|
||||
pure-eval
|
||||
];
|
||||
quart = [
|
||||
# quart missing
|
||||
blinker
|
||||
];
|
||||
rq = [
|
||||
rq
|
||||
];
|
||||
sanic = [
|
||||
sanic
|
||||
];
|
||||
sqlalchemy = [
|
||||
sqlalchemy
|
||||
];
|
||||
tornado = [
|
||||
tornado
|
||||
];
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
aiohttp
|
||||
asttokens
|
||||
blinker
|
||||
botocore
|
||||
bottle
|
||||
celery
|
||||
chalice
|
||||
django
|
||||
executing
|
||||
fakeredis
|
||||
falcon
|
||||
flask_login
|
||||
gevent
|
||||
httpx
|
||||
jsonschema
|
||||
mock
|
||||
pure-eval
|
||||
pyramid
|
||||
pyspark
|
||||
pytest-django
|
||||
pyrsistent
|
||||
pytest-forked
|
||||
pytest-localserver
|
||||
pytest-watch
|
||||
pytestCheckHook
|
||||
rq
|
||||
sanic
|
||||
sanic-testing
|
||||
sqlalchemy
|
||||
tornado
|
||||
trytond
|
||||
werkzeug
|
||||
multidict
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
|
@ -97,53 +137,15 @@ buildPythonPackage rec {
|
|||
disabledTests = [
|
||||
# Issue with the asseration
|
||||
"test_auto_enabling_integrations_catches_import_error"
|
||||
# Output mismatch in sqlalchemy test
|
||||
"test_too_large_event_truncated"
|
||||
# Failing falcon tests
|
||||
"test_has_context"
|
||||
"uri_template-"
|
||||
"path-"
|
||||
"test_falcon_large_json_request"
|
||||
"test_falcon_empty_json_request"
|
||||
"test_falcon_raw_data_request"
|
||||
# Failing spark tests
|
||||
"test_set_app_properties"
|
||||
"test_start_sentry_listener"
|
||||
# Failing threading test
|
||||
"test_circular_references"
|
||||
# Failing wsgi tests
|
||||
"test_session_mode_defaults_to_request_mode_in_wsgi_handler"
|
||||
"test_auto_session_tracking_with_aggregates"
|
||||
# Network requests to public web
|
||||
"test_crumb_capture"
|
||||
# TypeError: cannot unpack non-iterable TestResponse object
|
||||
"test_rpc_error_page"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Some tests are failing (network access, assertion errors)
|
||||
"tests/integrations/aiohttp/"
|
||||
"tests/integrations/gcp/"
|
||||
"tests/integrations/httpx/"
|
||||
"tests/integrations/stdlib/test_httplib.py"
|
||||
# Tests are blocking
|
||||
"tests/integrations/celery/"
|
||||
# pytest-chalice is not available in nixpkgs yet
|
||||
"tests/integrations/chalice/"
|
||||
# broken since rq-1.10.1: https://github.com/getsentry/sentry-python/issues/1274
|
||||
"tests/integrations/rq/"
|
||||
# broken since pytest 7.0.1; AssertionError: previous item was not torn down properly
|
||||
"tests/utils/test_contextvars.py"
|
||||
# broken since Flask and Werkzeug update to 2.1.0 (different error messages)
|
||||
"tests/integrations/flask/test_flask.py"
|
||||
"tests/integrations/bottle/test_bottle.py"
|
||||
"tests/integrations/django/test_basic.py"
|
||||
"tests/integrations/pyramid/test_pyramid.py"
|
||||
]
|
||||
# test crashes on aarch64
|
||||
++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [
|
||||
# Varius integration tests fail every once in a while when we
|
||||
# upgrade depencies, so don't bother testing them.
|
||||
"tests/integrations/"
|
||||
] ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [
|
||||
# test crashes on aarch64
|
||||
"tests/test_transport.py"
|
||||
"tests/integrations/threading/test_threading.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-spelling";
|
||||
version = "7.3.3";
|
||||
version = "7.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-OBnRJinZXgyQkiT6QLRipn4K2zIdUCg9f8DRFobIrH4=";
|
||||
hash = "sha256-GLsQu912pXRg7dejBka9lXZt+oxv50/T7J2ZQ2BlmGA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "3.12.3";
|
||||
version = "3.12.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-MrvfSC6Uz/EJXQ3F5jAbWR0YJYRjqjwO7SIe0AUSOfA=";
|
||||
sha256 = "sha256-lAbeCTjEUsNnjhJZNHs4ir8V0bJZUnBIGYYEXV80wyg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, buildPythonPackage
|
||||
, setuptools-scm
|
||||
, attrs
|
||||
, pdfminer
|
||||
, pdfminer-six
|
||||
, commoncode
|
||||
, plugincode
|
||||
, binaryornot
|
||||
|
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
pdfminer
|
||||
pdfminer-six
|
||||
commoncode
|
||||
plugincode
|
||||
binaryornot
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue