Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
sternenseemann
commit
4eafb91fbf
154 changed files with 1350 additions and 795 deletions
|
|
@ -46,6 +46,12 @@ Bash-only variables:
|
|||
- `postgresqlEnableTCP`: set to `1` to enable TCP listening. Flaky; not recommended.
|
||||
- `postgresqlStartCommands`: defaults to `pg_ctl start`.
|
||||
|
||||
## Hooks {#sec-postgresqlTestHook-hooks}
|
||||
|
||||
A number of additional hooks are ran in postgresqlTestHook
|
||||
|
||||
- `postgresqlTestSetupPost`: ran after postgresql has been set up.
|
||||
|
||||
## TCP and the Nix sandbox {#sec-postgresqlTestHook-tcp}
|
||||
|
||||
`postgresqlEnableTCP` relies on network sandboxing, which is not available on macOS and some custom Nix installations, resulting in flaky tests.
|
||||
|
|
|
|||
|
|
@ -480,8 +480,13 @@ rec {
|
|||
|
||||
|
||||
/* Like `mapAttrs`, except that it recursively applies itself to
|
||||
attribute sets. Also, the first argument of the argument
|
||||
function is a *list* of the names of the containing attributes.
|
||||
the *leaf* attributes of a potentially-nested attribute set:
|
||||
the second argument of the function will never be an attrset.
|
||||
Also, the first argument of the argument function is a *list*
|
||||
of the attribute names that form the path to the leaf attribute.
|
||||
|
||||
For a function that gives you control over what counts as a leaf,
|
||||
see `mapAttrsRecursiveCond`.
|
||||
|
||||
Example:
|
||||
mapAttrsRecursive (path: value: concatStringsSep "-" (path ++ [value]))
|
||||
|
|
|
|||
|
|
@ -3747,12 +3747,6 @@
|
|||
fingerprint = "A8DF 1326 9E5D 9A38 E57C FAC2 9D20 F650 3E33 8888";
|
||||
}];
|
||||
};
|
||||
doublec = {
|
||||
email = "chris.double@double.co.nz";
|
||||
github = "doublec";
|
||||
githubId = 16599;
|
||||
name = "Chris Double";
|
||||
};
|
||||
dpaetzel = {
|
||||
email = "david.paetzel@posteo.de";
|
||||
github = "dpaetzel";
|
||||
|
|
@ -9150,6 +9144,12 @@
|
|||
fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94";
|
||||
}];
|
||||
};
|
||||
mdr = {
|
||||
email = "MattRussellUK@gmail.com";
|
||||
github = "mdr";
|
||||
githubId = 241257;
|
||||
name = "Matt Russell";
|
||||
};
|
||||
meain = {
|
||||
email = "mail@meain.io";
|
||||
matrix = "@meain:matrix.org";
|
||||
|
|
|
|||
|
|
@ -172,7 +172,6 @@
|
|||
./programs/geary.nix
|
||||
./programs/git.nix
|
||||
./programs/gnome-disks.nix
|
||||
./programs/gnome-documents.nix
|
||||
./programs/gnome-terminal.nix
|
||||
./programs/gnupg.nix
|
||||
./programs/gpaste.nix
|
||||
|
|
|
|||
|
|
@ -1,54 +0,0 @@
|
|||
# GNOME Documents.
|
||||
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
|
||||
meta = {
|
||||
maintainers = teams.gnome.members;
|
||||
};
|
||||
|
||||
# Added 2019-08-09
|
||||
imports = [
|
||||
(mkRenamedOptionModule
|
||||
[ "services" "gnome" "gnome-documents" "enable" ]
|
||||
[ "programs" "gnome-documents" "enable" ])
|
||||
];
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
programs.gnome-documents = {
|
||||
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Whether to enable GNOME Documents, a document
|
||||
manager application for GNOME.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf config.programs.gnome-documents.enable {
|
||||
|
||||
environment.systemPackages = [ pkgs.gnome.gnome-documents ];
|
||||
|
||||
services.dbus.packages = [ pkgs.gnome.gnome-documents ];
|
||||
|
||||
services.gnome.gnome-online-accounts.enable = true;
|
||||
|
||||
services.gnome.gnome-online-miners.enable = true;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -36,6 +36,7 @@ with lib;
|
|||
'')
|
||||
(mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.")
|
||||
(mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "programs" "gnome-documents" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " +
|
||||
"https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"))
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ makeInstalledTest {
|
|||
|
||||
testConfig = {
|
||||
services.fwupd.enable = true;
|
||||
services.fwupd.disabledPlugins = lib.mkForce []; # don't disable test plugin
|
||||
services.fwupd.daemonSettings.DisabledPlugins = lib.mkForce [ ]; # don't disable test plugin
|
||||
services.fwupd.enableTestRemote = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -88,14 +88,6 @@ let
|
|||
|
||||
#(mkFlag vtxSupport "CONFIG_VTX=y" libayemu)
|
||||
];
|
||||
|
||||
clangGCC = runCommand "clang-gcc" {} ''
|
||||
#! ${stdenv.shell}
|
||||
mkdir -p $out/bin
|
||||
ln -s ${stdenv.cc}/bin/clang $out/bin/gcc
|
||||
ln -s ${stdenv.cc}/bin/clang++ $out/bin/g++
|
||||
'';
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -111,17 +103,18 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [ ./option-debugging.patch ];
|
||||
|
||||
configurePhase = "./configure " + lib.concatStringsSep " " ([
|
||||
"prefix=$out"
|
||||
"CONFIG_WAV=y"
|
||||
] ++ lib.concatMap (a: a.flags) opts);
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ ncurses ]
|
||||
++ lib.optional stdenv.cc.isClang clangGCC
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit VideoToolbox ]
|
||||
++ lib.flatten (lib.concatMap (a: a.deps) opts);
|
||||
|
||||
prefixKey = "prefix=";
|
||||
|
||||
configureFlags = [
|
||||
"CONFIG_WAV=y"
|
||||
"HOSTCC=${stdenv.cc.targetPrefix}cc"
|
||||
] ++ lib.concatMap (a: a.flags) opts;
|
||||
|
||||
makeFlags = [ "LD=$(CC)" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "btcpayserver";
|
||||
version = "1.7.3";
|
||||
version = "1.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wjtiircPPQgWg1GGQsesEEeOF+h1+tc591YI0l/JlwQ=";
|
||||
sha256 = "sha256-xycNt3jzZY2a4hNv3arWLt+EfMqpFVMDHMuzOWnL7aQ=";
|
||||
};
|
||||
|
||||
projectFile = "BTCPayServer/BTCPayServer.csproj";
|
||||
|
|
|
|||
44
pkgs/applications/blockchains/btcpayserver/deps.nix
generated
44
pkgs/applications/blockchains/btcpayserver/deps.nix
generated
|
|
@ -8,15 +8,15 @@
|
|||
(fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; })
|
||||
(fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.14"; sha256 = "1k5m6jc585hnkkl019diz2gycfnsv2kx4g4cfs4awlpr42k8s3ph"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.18"; sha256 = "0zpqi8dpk91sqg7njxbs64m9598fmmalcc1w97v60xlhp9afjmdb"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.21"; sha256 = "0qq6ppr5vw4k8hjnz5xp29fc82z32vh6bc389dnr439gw7hmwkp9"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.18"; sha256 = "1w1h6za2mjk04njkw4hny3lx38h2m03gmvwrihj9h2rak7jf2gij"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.24"; sha256 = "0i0lqpxx0gy9zbssjigz0vq0way88x0slyyfijsx4sasrhrbv5qs"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.19"; sha256 = "046vvlxlg8div4a2v6pnxz4iwji93s688jgnvav3hl6c22b9lvs0"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.18"; sha256 = "04lp90rr61p7n39bfmia6jamgr0jjfns9987py64iazi236dl74g"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.20"; sha256 = "1kwyh71zzfij07r6nvcf7k2gdpjdhh90imwh6s255ws13m1fj3sn"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.11"; sha256 = "0zm0b45npacknir6b6a6v717kp3yz8hxv1qy2v65g2zp3ad2wij4"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.14"; sha256 = "1hhznv07bd1f3rn9d1rpg61ln68vqfjg7ypxif9lx4l3vfcj5j04"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.23"; sha256 = "036cggc386448i05s38pnhzs7qqbix6lml7j2zn84gcgk8w741gi"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.14"; sha256 = "1gzqz34lgk42kf86ldi3z0k4m9x91hlkqh6d7rq93nphl57mwqar"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.16"; sha256 = "0l6pnjc6phsacwg145kwsakjpkd44jm1w53y0s166bwzpcdmljq0"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; })
|
||||
(fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; })
|
||||
(fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; })
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
(fetchNuGet { pname = "HtmlSanitizer"; version = "5.0.372"; sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; })
|
||||
(fetchNuGet { pname = "Humanizer.Core"; version = "2.8.26"; sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; })
|
||||
(fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; })
|
||||
(fetchNuGet { pname = "LNURL"; version = "0.0.27"; sha256 = "126rhls5yxxw4i419w59762cq3zmjccjd8x42qmb4nhqmbgybkzm"; })
|
||||
(fetchNuGet { pname = "LNURL"; version = "0.0.28"; sha256 = "1fcrq5ib02scz6n4zvmnbvm2aahj6qwwq6wsfix90caqm2c2bq64"; })
|
||||
(fetchNuGet { pname = "MailKit"; version = "3.3.0"; sha256 = "18l0jkrc4d553kiw4vdjzzpafpvsgjs1n19kjbi8isnhzidmsl4j"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNet.SignalR.Client"; version = "2.4.3"; sha256 = "1whxcmxydcxjkw84sqk5idd406v3ia0xj2m4ia4b6wqbvkdqn7rf"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; })
|
||||
|
|
@ -87,9 +87,9 @@
|
|||
(fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "6.0.0"; sha256 = "0qn30d3pg4rx1x2k525jj4x5g1fxm2v5m0ksz2dmk1gmqalpask8"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "6.0.1"; sha256 = "0ra0ldbg09r40jzvfqhpb3h42h80nafvka9hg51dja32k3mxn5gk"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.1.0"; sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.10"; sha256 = "04xjhi2pmvycx4yam7i3j2l2yjzzbzvxn4i12f00r39j4kkfwqsn"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.5"; sha256 = "1i7zm8ghgxwp655anyfm910qm7rcpvrz48fxjyzw9w63hj4sv6bk"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.0"; sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.10"; sha256 = "1pj4n3c015ils13fwky2rfv5q8xza671ixb54vr479pc7an2fah3"; })
|
||||
|
|
@ -98,9 +98,9 @@
|
|||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.10"; sha256 = "004f9nshm5jg0g4n9f48phjx90pzmj88qbqyiimzgvwl0qkk870q"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.5"; sha256 = "0310pvrwbbqak7k4s32syryqxlkwli8w8bwlpnqmz42svh2302wv"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "2.1.0"; sha256 = "0xx3idb1l5y1da5zynlys5gyarijmw5pc9hgci8xdxbrcv6rzbjb"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "2.1.0"; sha256 = "1lz2xwm63clbh9dfhmygbqvcp4dsrwh5jihv82dmqd5h7lqngl40"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Ini"; version = "2.1.0"; sha256 = "0bchsljywcq36si4zs2dcx2gj8x98ww93dh2bx2z6x5ilxyjnfip"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.0"; sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Ini"; version = "6.0.0"; sha256 = "18qg1f7yvgvrgsq40cgc1yvpb9av84ma80k3grhvwn1cyam2img6"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.1.10"; sha256 = "0if1g8gj3ngvqf4ddkjhz30p4y2yax8m5vlbrjzgixq80g3apy6d"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; })
|
||||
|
|
@ -113,8 +113,9 @@
|
|||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.0.0"; sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.1.0"; sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "2.1.0"; sha256 = "1firpsl5bk219i9gdfgiqw1zm68146h1dzx9hvawfpw9slfaa56w"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "2.1.0"; sha256 = "1d2622qp22x1cnlwycnzjbc3sgi9jria26fk78zwzsa08npa3avv"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.0.0"; sha256 = "056wgjcdzvz1qwb26xv6hgxq4xya56qiimhk30v8an8cgsrjk3mc"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.1.0"; sha256 = "04vm9mdjjzg3lpp2rzpgkpn8h5bzdl3bwcr22lshd3kp602ws4k9"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; version = "6.0.9"; sha256 = "1g9jsqxaif9z5m228rci54w6cqmg07i0cm618iwa0jibsphx86fk"; })
|
||||
|
|
@ -156,19 +157,18 @@
|
|||
(fetchNuGet { pname = "NBitcoin"; version = "5.0.40"; sha256 = "1rqzn84yaww4afagwg8jg1l5qdkvqyjdfcyd5widddqwxabbsjvh"; })
|
||||
(fetchNuGet { pname = "NBitcoin"; version = "6.0.8"; sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; })
|
||||
(fetchNuGet { pname = "NBitcoin"; version = "7.0.1"; sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; })
|
||||
(fetchNuGet { pname = "NBitcoin"; version = "7.0.18"; sha256 = "02kkgymdb80cidibrs6qpy1zjwcfbkwv9zqz9s0swf5zp7qvcakn"; })
|
||||
(fetchNuGet { pname = "NBitcoin"; version = "7.0.23"; sha256 = "10dy58gq644561svc67pm37rlb44mymbnlfz409dhclmfhmqmd5s"; })
|
||||
(fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.17"; sha256 = "1rqcfpcs3c7zqlw3fnvnyw3d3mmplg5nsaikm50lnzpl8z3cq936"; })
|
||||
(fetchNuGet { pname = "NBitcoin"; version = "7.0.24"; sha256 = "0yc6cgwp2xr2dzjsrkawyh43whixv66nvvq6rh1pi6gi14iaqmfa"; })
|
||||
(fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.18"; sha256 = "054i15qan5154iy8m13jmhnz1w5rs208i1xhlfnivwiq2v1c2qby"; })
|
||||
(fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; sha256 = "1sgwradg7jnb4n3chwqfkximj1qhgl3r23p0sifmaa0kql2hlira"; })
|
||||
(fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.2"; sha256 = "0a8zy9iasgmr7mqhjrbxa2shnygpp97pbg5qnk7ix50y01k9blyw"; })
|
||||
(fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.3"; sha256 = "0lf5qsf5yr5m1fx826mn47l237x5y2wkimv6klc3rvwwc7f10dmm"; })
|
||||
(fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; })
|
||||
(fetchNuGet { pname = "NicolasDorier.CommandLine"; version = "1.0.0.2"; sha256 = "08a9l18zkhcfa6f56xqylzvmqjzgxsmgkpm2r3ckvxfyml6w0qyy"; })
|
||||
(fetchNuGet { pname = "NicolasDorier.CommandLine.Configuration"; version = "1.0.0.3"; sha256 = "0al0pd4zhjpmn8m208xjmy17cbyab68grzdvzr2lhsckwkl6b1jg"; })
|
||||
(fetchNuGet { pname = "NicolasDorier.CommandLine"; version = "2.0.0"; sha256 = "0gywvl0gqs3crlzwgwzcqf0qsrbhk3dxjycpimxqvs1ihg4dhb1f"; })
|
||||
(fetchNuGet { pname = "NicolasDorier.CommandLine.Configuration"; version = "2.0.0"; sha256 = "1cng096r3kb85lf5wjill4yhxx8nv9v0d6ksbn1i1vvdawwl6fkw"; })
|
||||
(fetchNuGet { pname = "NicolasDorier.RateLimits"; version = "1.2.3"; sha256 = "197cqb0yxd2hfxyikxw53m4lmxh87l9sqrr8xihg1j0knvwzgyyp"; })
|
||||
(fetchNuGet { pname = "NicolasDorier.StandardConfiguration"; version = "1.0.0.18"; sha256 = "0lgssxafv6cqlw21fb79fm0fcln0clgsk6zadcwrnjv9vampfw7b"; })
|
||||
(fetchNuGet { pname = "NicolasDorier.StandardConfiguration"; version = "2.0.1"; sha256 = "1jiinqj1y8vv78p766asml4bd0k5gwrpl9ksi176h0z7wsj6ilrx"; })
|
||||
(fetchNuGet { pname = "NLog"; version = "4.7.14"; sha256 = "1pjkxlf20vrh9b8r6wzay1563fdhhxslxb7acdkn5ss8gvd2m23n"; })
|
||||
(fetchNuGet { pname = "Npgsql"; version = "6.0.7"; sha256 = "0c5zyd9n3597ryzqh9qfisp3wvr7q0krbnl26w2sy33xm4hvls2c"; })
|
||||
(fetchNuGet { pname = "Npgsql.EntityFrameworkCore.PostgreSQL"; version = "6.0.7"; sha256 = "0gsvjf0vk7anmc889my8x68wpd47bsdgsk1rwbg77rrb9zsf4nxp"; })
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "nbxplorer";
|
||||
version = "2.3.54";
|
||||
version = "2.3.57";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgarage";
|
||||
repo = "NBXplorer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WINanMGAlZioD6XP0xK6H+KTlF/NRMAmhylmRV6y2uI=";
|
||||
sha256 = "sha256-oLkkGdzjyvgIXi0HZiFPCShzbBR8cOgMf1h1Nf1U6Rk=";
|
||||
};
|
||||
|
||||
projectFile = "NBXplorer/NBXplorer.csproj";
|
||||
|
|
|
|||
4
pkgs/applications/blockchains/nbxplorer/deps.nix
generated
4
pkgs/applications/blockchains/nbxplorer/deps.nix
generated
|
|
@ -34,8 +34,8 @@
|
|||
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; })
|
||||
(fetchNuGet { pname = "NBitcoin"; version = "7.0.22"; sha256 = "1911mwz23qm9qnlfsm2j6qdkj1l43gjym4di8r50zikfnyd654sx"; })
|
||||
(fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.17"; sha256 = "1rqcfpcs3c7zqlw3fnvnyw3d3mmplg5nsaikm50lnzpl8z3cq936"; })
|
||||
(fetchNuGet { pname = "NBitcoin"; version = "7.0.24"; sha256 = "0yc6cgwp2xr2dzjsrkawyh43whixv66nvvq6rh1pi6gi14iaqmfa"; })
|
||||
(fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.18"; sha256 = "054i15qan5154iy8m13jmhnz1w5rs208i1xhlfnivwiq2v1c2qby"; })
|
||||
(fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
|
||||
|
|
|
|||
|
|
@ -141,6 +141,9 @@ stdenv.mkDerivation rec {
|
|||
"--set QT_XCB_NO_XI2 1"
|
||||
];
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
|
||||
|
||||
# Use nix-provided libraries instead of submodules
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
|
|
@ -187,5 +190,7 @@ stdenv.mkDerivation rec {
|
|||
xfix
|
||||
ivar
|
||||
];
|
||||
# Requires both LLVM and SDK bump
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoPackage
|
||||
, fetchpatch
|
||||
, buildGoModule
|
||||
}:
|
||||
# upstream is pretty stale, but it still works, so until they merge module
|
||||
# support we have to use gopath: see sgreben/jp#29
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "json-plot";
|
||||
version = "1.1.12";
|
||||
|
||||
|
|
@ -15,7 +14,17 @@ buildGoPackage rec {
|
|||
hash = "sha256-WWARAh/CF3lGli3VLRzAGaCA8xQyryPi8WcuwvdInjk=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/sgreben/jp";
|
||||
vendorHash = "sha256-EPrlaUHAGATNFv3qgWKGmJdu9EHsV/0DJKEvQck+fWc=";
|
||||
|
||||
patches = [
|
||||
# Add Go Modules support
|
||||
(fetchpatch {
|
||||
url = "https://github.com/sgreben/jp/commit/9516fb4d7c5b011071b4063ea8e8e9667e57a777.patch";
|
||||
hash = "sha256-Vz5HnStrCpMN1L7dne7JDX5F57up3EBPPf/9hN9opRc=";
|
||||
})
|
||||
];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dead simple terminal plots from JSON (or CSV) data. Bar charts, line charts, scatter plots, histograms and heatmaps are supported.";
|
||||
|
|
|
|||
|
|
@ -7,24 +7,24 @@ let
|
|||
bgrabitmap = fetchFromGitHub {
|
||||
owner = "bgrabitmap";
|
||||
repo = "bgrabitmap";
|
||||
rev = "v11.2.5";
|
||||
sha256 = "0w5pdihsxn039kalkf4cx23j69hz5r09qmhd358h2n74irv1r3x1";
|
||||
rev = "v11.5.3";
|
||||
sha256 = "sha256-qjBD9TVZQy1tKWHFWkuu6vdLjASzQb3+HRy0FLdd9a8=";
|
||||
};
|
||||
bgracontrols = fetchFromGitHub {
|
||||
owner = "bgrabitmap";
|
||||
repo = "bgracontrols";
|
||||
rev = "v7.0";
|
||||
sha256 = "0qz3cscrc9jvhrix1hbmzhdxv6mxk0mz9azr46canflsydda8fjy";
|
||||
rev = "v7.6";
|
||||
sha256 = "sha256-btg9DMdYg+C8h0H7MU+uoo2Kb4OeLHoxFYHAv7LbLBA=";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "lazpaint";
|
||||
version = "7.1.5";
|
||||
version = "7.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bgrabitmap";
|
||||
repo = "lazpaint";
|
||||
rev = "v${version}";
|
||||
sha256 = "0bpk3rlqzbxvgrxmrzs0hcrgwhsqnpjqv1kdd9cp09knimmksvy5";
|
||||
sha256 = "sha256-J6s0GnGJ7twEYW5+B72bB3EX4AYvLnhSPLbdhZWzlkw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ lazarus fpc makeWrapper ];
|
||||
|
|
@ -33,6 +33,10 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs configure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap
|
||||
cp -r --no-preserve=mode ${bgracontrols} bgracontrols
|
||||
|
|
@ -47,6 +51,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
# Reuse existing install script
|
||||
substituteInPlace Makefile --replace "/bin/bash" $BASH
|
||||
cd lazpaint/release/debian
|
||||
substituteInPlace makedeb.sh --replace "rm -rf" "ls"
|
||||
patchShebangs ./makedeb.sh
|
||||
|
|
@ -64,6 +69,5 @@ in stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ];
|
||||
broken = true; # 2022-11-16
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,29 @@
|
|||
{ buildGoPackage, fetchFromGitHub, lib }:
|
||||
{ buildGoModule, fetchFromGitHub, fetchpatch, lib }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "yeetgif";
|
||||
version = "1.23.6";
|
||||
|
||||
goPackagePath = "github.com/sgreben/yeetgif";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sgreben";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "05z1ylsra60bb4cvr383g9im94zsph1dgicqbv5p73qgs634ckk7";
|
||||
hash = "sha256-Z05GhtEPj3PLXpjF1wK8+pNUY3oDjbwZWQsYlTX14Rc=";
|
||||
};
|
||||
|
||||
deleteVendor = true;
|
||||
vendorHash = "sha256-LhkOMCuYO4GHezk21SlI2dP1UPmBp4bv2SdNbUQMKsI=";
|
||||
|
||||
patches = [
|
||||
# Add Go Modules support
|
||||
(fetchpatch {
|
||||
url = "https://github.com/sgreben/yeetgif/commit/5d2067b9832898c2b1ac51bf6a5f107619038270.patch";
|
||||
hash = "sha256-3eyqbpPyuQHjAN5mjQyZo0xY6L683T5Ytyx02II/iU4=";
|
||||
})
|
||||
];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "gif effects CLI. single binary, no dependencies. linux, osx, windows. #1 workplace productivity booster. #yeetgif #eggplant #golang";
|
||||
homepage = "https://github.com/sgreben/yeetgif";
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@ let
|
|||
if extension == "zip" then fetchzip args else fetchurl args;
|
||||
|
||||
pname = "1password-cli";
|
||||
version = "2.12.0";
|
||||
version = "2.13.0";
|
||||
sources = rec {
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-WCu1/5dewsjVMyFo+BaAgCOcK08Fe3ldJhDzCl8B+2M=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-eRNX7+IF9v3JzXxwp5WshqYOC5/uizniWOKSc3q2yL8=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-wvhWwcDufwvh8Isx4QpyyHEJ+3yU7f/0a4r5Itns68c=" "zip";
|
||||
aarch64-darwin = fetch "apple_universal" "sha256-ZOU4huC1FUj0ZiqIgs+4tU8t/w5VVD/UiWGVFHS50sw=" "pkg";
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-B9XVejPge8wxWAoxj974rLz0dfaZEAaGn2mUcPeqFIo=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-kLW9PmhCNDosKn1nmtzo8tBjBOaUyzqlLad332UACio=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-jbvkTlIuAm5tHzGm42kO+jykUffKwfOVSOh33i0URtM=" "zip";
|
||||
aarch64-darwin = fetch "apple_universal" "sha256-kA+NjXrNcX0dKh+gNJT82vbQGKFOU8zPvGPqBtuBqOA=" "pkg";
|
||||
x86_64-darwin = aarch64-darwin;
|
||||
};
|
||||
platforms = builtins.attrNames sources;
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "AusweisApp2";
|
||||
version = "1.26.1";
|
||||
version = "1.26.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Governikus";
|
||||
repo = "AusweisApp2";
|
||||
rev = version;
|
||||
sha256 = "sha256-Q+ZWnbYH80FMazKB1iSTh9cuYvuPom+qDjMZvC1gUoY=";
|
||||
hash = "sha256-jN4xKgdNO+LyDy+ySM13M5YCaijDq8zAxS+x4Io1ThE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -5,19 +5,19 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dasel";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TomWright";
|
||||
repo = "dasel";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7JGafJE9nwZ95bOWUyVw2uWA2LltE9HxolHGYU079to=";
|
||||
sha256 = "sha256-27tQEWnirDhqYt5smRFwADa9wKXSk6yXR8+mXvJVtYI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GO5Vg8zsXfjMBzRDC1/s/SYpviKUf59JB14vauKVFcE=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}"
|
||||
"-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
|
|
|||
|
|
@ -13,17 +13,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "faircamp";
|
||||
version = "unstable-2022-10-08";
|
||||
version = "unstable-2022-12-28";
|
||||
|
||||
# TODO when switching to a stable release, use fetchFromGitea and add a
|
||||
# version test. Meanwhile, fetchgit is used to make unstableGitUpdater work.
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/simonrepp/faircamp.git";
|
||||
rev = "630415985127298bf82bfc210d2fc8b214758db1";
|
||||
sha256 = "sha256-4pzDey0iV7LtHI0rbbcCjjuTaFt0CR88Vl0B1RU96v0=";
|
||||
rev = "c77fd779cea6daecbac9a9beea65c1dc1ac56bc4";
|
||||
sha256 = "sha256-Tl3T/IoBIhYCNDEYT6cV1UyksDkoEDydBjYM9yzT4VQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-GgWxxKHLGtsSGVbhli6HTfUu4TmbY4J9N7UA7AOzUkc=";
|
||||
cargoHash = "sha256-20rtE8+LLDz97yvk0gKoUielsGZXEEOu2pfShf2WvHA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "parsec-bin";
|
||||
version = "150_28";
|
||||
version = "150_86e";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20220622215230id_/https://builds.parsecgaming.com/package/parsec-linux.deb";
|
||||
sha256 = "1hfdzjd8qiksv336m4s4ban004vhv00cv2j461gc6zrp37s0fwhc";
|
||||
url = "https://web.archive.org/web/20230124210253/https://builds.parsecgaming.com/package/parsec-linux.deb";
|
||||
sha256 = "sha256-wwBy86TdrHaH9ia40yh24yd5G84WTXREihR+9I6o6uU=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
@ -76,6 +76,7 @@ stdenvNoCC.mkDerivation {
|
|||
|
||||
meta = with lib; {
|
||||
homepage = "https://parsecgaming.com/";
|
||||
changelog = "https://parsec.app/changelog";
|
||||
description = "Remote streaming service client";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ arcnmx ];
|
||||
|
|
|
|||
|
|
@ -222,13 +222,13 @@
|
|||
"vendorHash": "sha256-PALZGyGZ6Ggccl4V9gG+gsEdNipYG+DCaZkqF0W1IMQ="
|
||||
},
|
||||
"cloudflare": {
|
||||
"hash": "sha256-X7rNVMl5K/Z0w/N6+5fuODjR08gF9s3jQ1HqCo3b1WU=",
|
||||
"hash": "sha256-Y48H7P69ORr8U0yXf1HEBqh//oOmWn3Uj8GQ12PsV/M=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
|
||||
"owner": "cloudflare",
|
||||
"repo": "terraform-provider-cloudflare",
|
||||
"rev": "v3.32.0",
|
||||
"rev": "v3.33.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-7X2T3C775Nq5jc7n41nBREUsOa+EYmBsfBJM5YIo9xI="
|
||||
"vendorHash": "sha256-3JH+4ExREL3vtq6CiQN0G0x08ScrzOf2pTAnsWcGgq8="
|
||||
},
|
||||
"cloudfoundry": {
|
||||
"hash": "sha256-/Zxj9cous0SjYxeDo+8/u61pqDwMGt/UsS/OC1oSR2U=",
|
||||
|
|
@ -1050,13 +1050,13 @@
|
|||
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
|
||||
},
|
||||
"spotinst": {
|
||||
"hash": "sha256-JT+kWE6k22qp905soDbnptr7gJZiZ8uRZ4+ZBw++8Mo=",
|
||||
"hash": "sha256-2w4Qh9S0YxvcNdgtPLsNEumZiJn3+VH80zwamJW1FWQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
|
||||
"owner": "spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.95.2",
|
||||
"rev": "v1.96.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-vW+1tH+3bT70RrHOTKemM23e0EoX3AO5AMXOAuyyKPA="
|
||||
"vendorHash": "sha256-SRQWZGyQDbESrpu0tsy6EBfvjY/l89fQexCdhSYPzGI="
|
||||
},
|
||||
"stackpath": {
|
||||
"hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=",
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, autoPatchelfHook
|
||||
, dpkg
|
||||
, makeWrapper
|
||||
, wrapGAppsHook
|
||||
, alsa-lib
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
|
|
@ -53,7 +54,9 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook ];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
|
|
@ -109,6 +112,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Wrap the startup command
|
||||
makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \
|
||||
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openasar";
|
||||
version = "unstable-2022-12-11";
|
||||
version = "unstable-2023-01-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GooseMod";
|
||||
repo = "OpenAsar";
|
||||
rev = "0b1d4685cb2c94f42441fc616eb24e69eda04647";
|
||||
hash = "sha256-cRYXgVgA5B9MaDGJIACJYjFNDAMajReKud0akiGBR4Q=";
|
||||
rev = "40b27dd1b8dd48277207db1b165c220c3441484c";
|
||||
hash = "sha256-tDJxcnbX0REu8DX+bQ7i4JzvLl6lRyB7+/dnAJI18Ss=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "1.10.3";
|
||||
version = "1.10.4";
|
||||
pname = "session-desktop";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
|
||||
sha256 = "sha256-I9YyzfI8EqH8LZe5E5BnD9lGPAdQo++l3yRClfN7+pY=";
|
||||
sha256 = "sha256-pSVTfZvjqWVgx3FAbIJO6e26GHZbhZBppxEptEuozQo=";
|
||||
};
|
||||
appimage = appimageTools.wrapType2 {
|
||||
inherit version pname src;
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "unstable-2023-01-20";
|
||||
version = "unstable-2023-01-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "4d48bbe730b19963efeb3bb6f59e92aa3968b229";
|
||||
sha256 = "03REE7/jn1uuU89DKkGD1QqqzOt+DR6qmoyyaf8042c=";
|
||||
rev = "f676cba7f9749825744ec705ee58b9fbea47db51";
|
||||
sha256 = "Zx1fGicCuX+HJm2QFSYQhcd9Ibg3qj5h9NPlSNNVLag=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, ocaml, opaline }:
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, ocamlPackages, opaline }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ott";
|
||||
version = "0.32";
|
||||
version = "0.33";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ott-lang";
|
||||
repo = "ott";
|
||||
rev = version;
|
||||
sha256 = "sha256-vdDsfsIi1gRW1Sowf29VyQ4C5UKyQZaVgS2uTb8VeW4=";
|
||||
hash = "sha256-GzeEiok5kigcmfqf/K/UxvlKkl55zy0vOyiRZ2HyMiE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config opaline ];
|
||||
buildInputs = [ ocaml ];
|
||||
buildInputs = with ocamlPackages; [ ocaml findlib ocamlgraph ];
|
||||
|
||||
installTargets = "ott.install";
|
||||
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "smartgithg";
|
||||
version = "22.1.1";
|
||||
version = "22.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz";
|
||||
sha256 = "sha256-twN1Clnj17A2IUOOhvs8hs6PuvC81j9GqF0yKIk3IkQ=";
|
||||
sha256 = "sha256-TnpjRFInqmlY02fGi7oxoS4P1DzahryFvNLitJ5NjM4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
|
@ -87,6 +87,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "GUI for Git, Mercurial, Subversion";
|
||||
homepage = "https://www.syntevo.com/smartgit/";
|
||||
changelog = "https://www.syntevo.com/smartgit/changelog.txt";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ jraygauthier ];
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, webfs }:
|
||||
{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, git }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "srvc";
|
||||
version = "0.10.1";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "insilica";
|
||||
repo = "rs-srvc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yeyAorVMHFl9wm57gmK6ZAI1w5daN2xl29Gqq0DsTtc=";
|
||||
sha256 = "sha256-m4mN+vDEKPHRavtI9CbszOOdJcLYa+XqlzEyPvPXE0g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/1TL0lWb4I9h6nGV7exx7U6ACrieN0EULTWg7Weexeg=";
|
||||
cargoHash = "sha256-USOYXb6/hEE9HVz5YcNZPY5yuvDxbrH4YyZxY7XNAto=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ webfs ];
|
||||
nativeCheckInputs = [ git ];
|
||||
|
||||
# remove timeouts in tests to make them less flaky
|
||||
TEST_SRVC_DISABLE_TIMEOUT = 1;
|
||||
|
|
|
|||
|
|
@ -71,6 +71,8 @@ EOF
|
|||
header 'setting up postgresql'
|
||||
eval "$postgresqlTestSetupCommands"
|
||||
|
||||
runHook postgresqlTestSetupPost
|
||||
|
||||
}
|
||||
|
||||
postgresqlStop() {
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@ stdenv.mkDerivation {
|
|||
INSERT INTO hello VALUES ('it '||'worked');
|
||||
SELECT * FROM hello;
|
||||
'';
|
||||
postgresqlTestSetupPost = ''
|
||||
TEST_POST_HOOK_RAN=1
|
||||
'';
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
psql <$sqlPath | grep 'it worked'
|
||||
|
|
@ -21,7 +24,7 @@ stdenv.mkDerivation {
|
|||
runHook postCheck
|
||||
'';
|
||||
installPhase = ''
|
||||
[[ $TEST_RAN == 1 ]]
|
||||
[[ $TEST_RAN == 1 && $TEST_POST_HOOK_RAN == 1 ]]
|
||||
touch $out
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +1,29 @@
|
|||
{ lib, fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchzip }:
|
||||
|
||||
let
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "liberastika";
|
||||
version = "1.1.5";
|
||||
in fetchzip rec {
|
||||
name = "liberastika-${version}";
|
||||
|
||||
url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip";
|
||||
src = fetchzip {
|
||||
url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-woUpOmxhj6eEw7PKJ8EyRcs3ORj0gCZhxHP5a5dy5z0=";
|
||||
};
|
||||
|
||||
stripRoot = false;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
install -Dm644 $out/*.ttf -t $out/share/fonts/truetype
|
||||
shopt -s extglob dotglob
|
||||
rm -rf $out/!(share)
|
||||
shopt -u extglob dotglob
|
||||
install -Dm644 *.ttf -t $out/share/fonts/truetype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
sha256 = "sha256-1hoETOjPRUIzzM+NUR+g/Ph16jXmH2ARSlZHjgEwoeM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Liberation Sans fork with improved cyrillic support";
|
||||
homepage = "https://sourceforge.net/projects/lib-ka/";
|
||||
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.all;
|
||||
hydraPlatforms = [];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,21 @@
|
|||
{ fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchzip }:
|
||||
|
||||
fetchzip {
|
||||
name = "MPH-2B-Damase-2";
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mph-2b-damase";
|
||||
version = "2";
|
||||
|
||||
url = "http://www.wazu.jp/downloads/damase_v.2.zip";
|
||||
src = fetchzip {
|
||||
url = "https://web.archive.org/web/20160322114946/http://www.wazu.jp/downloads/damase_v.2.zip";
|
||||
hash = "sha256-4x78D+c3ZBxfhTQQ4+gyxvrsuztHF2ItXLh4uA0PxvU=";
|
||||
};
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 *.ttf -t $out/share/fonts/truetype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
sha256 = "0yzf12z6fpbgycqwiz88f39iawdhjabadfa14wxar3nhl9n434ql";
|
||||
|
||||
meta = {
|
||||
};
|
||||
meta = { };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,23 @@
|
|||
{ lib, fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchurl }:
|
||||
|
||||
fetchzip {
|
||||
name = "mro-unicode-2013-05-25";
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "mro-unicode";
|
||||
version = "unstable-2013-05-25";
|
||||
|
||||
url = "https://github.com/phjamr/MroUnicode/raw/f297de070f7eba721a47c850e08efc119d3bfbe8/MroUnicode-Regular.ttf";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/phjamr/MroUnicode/raw/f297de070f7eba721a47c850e08efc119d3bfbe8/MroUnicode-Regular.ttf";
|
||||
hash = "sha256-hcQmTuRWxaU5KEMXg/O0b1olE8YxXWz0PAlqAJknR/0=";
|
||||
};
|
||||
|
||||
postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/MroUnicode-Regular.ttf";
|
||||
dontUnpack = true;
|
||||
|
||||
sha256 = "1i71bjd9gdyn8ladfncbfhz6xz1h8xx8yf876j1z8lh719410c8g";
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 $src $out/share/fonts/truetype/MroUnicode-Regular.ttf
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/phjamr/MroUnicode";
|
||||
|
|
|
|||
|
|
@ -1,21 +1,24 @@
|
|||
{ lib, fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchzip }:
|
||||
|
||||
let
|
||||
version = "1.3.3";
|
||||
|
||||
mkPretendard = { pname, typeface, sha256 }:
|
||||
fetchzip {
|
||||
name = "${pname}-${version}";
|
||||
mkPretendard = { pname, typeface, hash }:
|
||||
stdenvNoCC.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
url = "https://github.com/orioncactus/pretendard/releases/download/v${version}/${typeface}-${version}.zip";
|
||||
inherit sha256;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/orioncactus/pretendard/releases/download/v${version}/${typeface}-${version}.zip";
|
||||
stripRoot = false;
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
stripRoot = false;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/
|
||||
install -Dm644 $out/public/static/*.otf -t $out/share/fonts/opentype
|
||||
rm -rf $out/{public,web,LICENSE.txt}
|
||||
install -Dm644 public/static/*.otf -t $out/share/fonts/opentype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -32,18 +35,18 @@ in
|
|||
pretendard = mkPretendard {
|
||||
pname = "pretendard";
|
||||
typeface = "Pretendard";
|
||||
sha256 = "sha256-lRHRdCAg3i3+3Y6j0dCXUgwLdeS/VeI6KNkbDKchNEY=";
|
||||
hash = "sha256-xCEZlwTPhrNIO6WODl55wo2oin+iMYOL/rVaEybpzr0=";
|
||||
};
|
||||
|
||||
pretendard-jp = mkPretendard {
|
||||
pname = "pretendard-jp";
|
||||
typeface = "PretendardJP";
|
||||
sha256 = "sha256-VgGt/WoaaJJDAzw+gUQVgTQ+q34bdAaKUB4cA9eU0dQ=";
|
||||
hash = "sha256-x0G7ULzkIJqZlK995+wWKHXZdWryUTRouGTa5LsJQzk=";
|
||||
};
|
||||
|
||||
pretendard-std = mkPretendard {
|
||||
pname = "pretendard-std";
|
||||
typeface = "PretendardStd";
|
||||
sha256 = "sha256-FOlZrr6CHPfUm9Q+Yoi0HLQUI7cAhQYq6P6sJGXBIWg=";
|
||||
hash = "sha256-/I8LZhFB86/+o+IzUP+bSIq7scKPOL7k/6/Bom0ZSqg=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,23 @@
|
|||
{ lib, fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchzip }:
|
||||
|
||||
fetchzip rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "ruwudu";
|
||||
version = "2.000";
|
||||
|
||||
url = "https://software.sil.org/downloads/r/ruwudu/Ruwudu-${version}.zip";
|
||||
src = fetchzip {
|
||||
url = "https://software.sil.org/downloads/r/ruwudu/Ruwudu-${version}.zip";
|
||||
hash = "sha256-FP+ZHm1fKlozAAI2PbJ4r4v5OwRxBtYMRLmRwPbqx2I=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
postFetch = ''
|
||||
rm -rf $out/web $out/manifest.json
|
||||
mkdir -p $out/share/{doc/${pname},fonts/truetype}
|
||||
mv $out/*.ttf $out/share/fonts/truetype/
|
||||
mv $out/*.txt $out/documentation $out/share/doc/${pname}/
|
||||
'';
|
||||
mv *.ttf $out/share/fonts/truetype/
|
||||
mv *.txt documentation $out/share/doc/${pname}/
|
||||
|
||||
sha256 = "sha256-JCvVPbAFBWHL2eEnEUSgdTZ+Vkw3wkS3aS85xQZKNQs=";
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://software.sil.org/ruwudu/";
|
||||
|
|
|
|||
|
|
@ -1,16 +1,26 @@
|
|||
{ lib, fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchurl }:
|
||||
|
||||
fetchzip {
|
||||
name = "sampradaya-2015-05-26";
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "sampradaya";
|
||||
version = "0.5.0";
|
||||
|
||||
url = "https://bitbucket.org/OorNaattaan/sampradaya/raw/afa9f7c6ab17e14bd7dd74d0acaec2f75454dfda/Sampradaya.ttf";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/deepestblue/sampradaya/releases/download/v${version}/Sampradaya.ttf";
|
||||
hash = "sha256-ygKMNzHvbLR2A5HHrfY2C9ZUg0yng+JL3cyg6sBKqeQ=";
|
||||
};
|
||||
|
||||
postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/Sampradaya.ttf";
|
||||
dontUnpack = true;
|
||||
|
||||
sha256 = "1pqyj5r5jc7dk8yyzl7i6qq2m9zvahcjj49a66wwzdby5zyw8dqv";
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 $src $out/share/fonts/truetype/Sampradaya.ttf
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://bitbucket.org/OorNaattaan/sampradaya/";
|
||||
homepage = "https://github.com/deepestblue/sampradaya";
|
||||
description = "Unicode-compliant Grantha font";
|
||||
maintainers = with maintainers; [ mathnerd314 ];
|
||||
license = licenses.ofl; # See font metadata
|
||||
|
|
|
|||
|
|
@ -1,15 +1,23 @@
|
|||
{ lib, fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchurl }:
|
||||
|
||||
let
|
||||
version = "2016-03-03";
|
||||
in fetchzip {
|
||||
name = "shrikhand-${version}";
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "shrikhand";
|
||||
version = "unstable-2016-03-03";
|
||||
|
||||
url = "https://github.com/jonpinhorn/shrikhand/raw/c11c9b0720fba977fad7cb4f339ebacdba1d1394/build/Shrikhand-Regular.ttf";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jonpinhorn/shrikhand/raw/c11c9b0720fba977fad7cb4f339ebacdba1d1394/build/Shrikhand-Regular.ttf";
|
||||
hash = "sha256-wHP1Bwu5Yw3a+RwDOHrmthsnuvwyCV4l6ma5EjA6EMA=";
|
||||
};
|
||||
|
||||
postFetch = "install -D -m644 $downloadedFile $out/share/fonts/truetype/Shrikhand-Regular.ttf";
|
||||
dontUnpack = true;
|
||||
|
||||
sha256 = "0s54k9cs1g2yz6lwg5gakqb12vg5qkfdz3pc8mh7mib2s6q926hs";
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D -m644 $src $out/share/fonts/truetype/Shrikhand-Regular.ttf
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://jonpinhorn.github.io/shrikhand/";
|
||||
|
|
|
|||
|
|
@ -1,18 +1,22 @@
|
|||
{ fetchzip, lib }:
|
||||
{ lib, stdenvNoCC, fetchzip }:
|
||||
|
||||
let
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "sil-abyssinica";
|
||||
version = "2.200";
|
||||
in
|
||||
fetchzip rec {
|
||||
name = "sil-abyssinica-${version}";
|
||||
url = "https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-${version}.zip";
|
||||
sha256 = "sha256-Kvswqzw8remcu36QaVjeyk03cR4wW5BKQMDihiaxJoE=";
|
||||
|
||||
postFetch = ''
|
||||
rm -rf $out/web
|
||||
mkdir -p $out/share/{fonts/truetype,doc/${name}}
|
||||
mv $out/*.ttf $out/share/fonts/truetype/
|
||||
mv $out/*.txt $out/documentation $out/share/doc/${name}/
|
||||
src = fetchzip {
|
||||
url = "https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-${version}.zip";
|
||||
hash = "sha256-IdWMZHm9VoLVDO0//ISujxlXUxe0O6+aEcdP63YRmPg=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/{fonts/truetype,doc/${pname}-${version}}
|
||||
mv *.ttf $out/share/fonts/truetype/
|
||||
mv *.txt documentation $out/share/doc/${pname}-${version}/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,19 +1,23 @@
|
|||
{ fetchzip, lib }:
|
||||
{ lib, stdenvNoCC, fetchzip }:
|
||||
|
||||
let
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "sil-padauk";
|
||||
version = "5.001";
|
||||
in
|
||||
fetchzip rec {
|
||||
name = "sil-padauk-${version}";
|
||||
url = "https://software.sil.org/downloads/r/padauk/Padauk-${version}.zip";
|
||||
sha256 = "sha256-6H9EDmXr1Ox2fgLw9sG5JrCAllK3tbjvMfLi8DTF1f0=";
|
||||
|
||||
postFetch = ''
|
||||
src = fetchzip {
|
||||
url = "https://software.sil.org/downloads/r/padauk/Padauk-${version}.zip";
|
||||
hash = "sha256-rLzuDUd+idjTN0xQxblXQ9V2rQtJPN2EtWGmTRY1R7U=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/fonts/truetype
|
||||
rm -rf $out/{manifest.json,web/}
|
||||
mv $out/*.ttf $out/share/fonts/truetype/
|
||||
mkdir -p $out/share/doc/${name}
|
||||
mv $out/*.txt $out/documentation/ $out/share/doc/${name}/
|
||||
mv *.ttf $out/share/fonts/truetype/
|
||||
mkdir -p $out/share/doc/${pname}-${version}
|
||||
mv *.txt documentation/ $out/share/doc/${pname}-${version}/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,20 +1,23 @@
|
|||
{ lib, fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchzip }:
|
||||
|
||||
let
|
||||
rev = "69132c99873894746c9710707aaeb2cea2609709";
|
||||
in
|
||||
fetchzip {
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "sitelen-seli-kiwen";
|
||||
version = "unstable-2022-06-28";
|
||||
|
||||
url = "https://raw.githubusercontent.com/kreativekorp/sitelen-seli-kiwen/${rev}/sitelenselikiwen.zip";
|
||||
hash = "sha256-63sl/Ha2QAe8pVKCpLNs//DB0kjLdW01u6tVMrGquIU=";
|
||||
stripRoot = false;
|
||||
src = fetchzip {
|
||||
url = "https://raw.githubusercontent.com/kreativekorp/sitelen-seli-kiwen/69132c99873894746c9710707aaeb2cea2609709/sitelenselikiwen.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-viOLAj9Rn60bcQkkDHVuKHCE8KPnIz/L0hIJhum1SSQ=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/{opentype,truetype}
|
||||
mv $out/*.eot $out/share/fonts/opentype/
|
||||
mv $out/*.ttf $out/share/fonts/truetype/
|
||||
mv *.eot $out/share/fonts/opentype/
|
||||
mv *.ttf $out/share/fonts/truetype/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,24 +1,28 @@
|
|||
{ lib, fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchzip }:
|
||||
|
||||
let
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "stix-otf";
|
||||
version = "1.1.1";
|
||||
in fetchzip {
|
||||
name = "stix-otf-${version}";
|
||||
|
||||
url = "http://ftp.fi.muni.cz/pub/linux/gentoo/distfiles/STIXv${version}-word.zip";
|
||||
src = fetchzip {
|
||||
url = "https://sources.debian.org/src/fonts-stix/1.1.1-4.1/STIXv${version}-word.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-M3STue+RPHi8JgZZupV0dVLZYKBiFutbBOlanuKkD08=";
|
||||
};
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 Fonts/STIX-Word/*.otf -t $out/share/fonts/opentype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
sha256 = "04d4qxq3i9fyapsmxk6d9v1xirjam8c74fyxs6n24d3gf2945zmw";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.stixfonts.org/";
|
||||
description = "Fonts for Scientific and Technical Information eXchange";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [maintainers.rycee];
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,34 @@
|
|||
{ lib, fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchurl }:
|
||||
|
||||
{
|
||||
tai-ahom = fetchzip {
|
||||
name = "tai-ahom-2015-07-06";
|
||||
tai-ahom = stdenvNoCC.mkDerivation rec {
|
||||
pname = "tai-ahom";
|
||||
version = "unstable-2015-07-06";
|
||||
|
||||
url = "https://github.com/enabling-languages/tai-languages/blob/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf?raw=true";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/enabling-languages/tai-languages/raw/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf";
|
||||
hash = "sha256-U1vcVf/VgXhvK1f2Iw2JKkd2EzJgz7KbHAwnUanX8n4=";
|
||||
};
|
||||
|
||||
postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/AhomUnicode.ttf";
|
||||
dontUnpack = true;
|
||||
|
||||
sha256 = "03h8ql9d5bzq4j521j0cz08ddf717bzim1nszh2aar6kn0xqnp9q";
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/enabling-languages/tai-languages";
|
||||
description = "Unicode-compliant Tai Ahom font";
|
||||
maintainers = with maintainers; [ mathnerd314 ];
|
||||
license = licenses.ofl; # See font metadata
|
||||
platforms = platforms.all;
|
||||
install -Dm644 $src $out/share/fonts/truetype/AhomUnicode.ttf
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/enabling-languages/tai-languages";
|
||||
description = "Unicode-compliant Tai Ahom font";
|
||||
maintainers = with maintainers; [ mathnerd314 ];
|
||||
license = licenses.ofl; # See font metadata
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# TODO: package others (Khamti Shan, Tai Aiton, Tai Phake, and/or Assam Tai)
|
||||
# TODO: package others (Khamti Shan, Tai Aiton, Tai Phake, and/or Assam Tai)
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +1,23 @@
|
|||
{ lib, fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchzip }:
|
||||
|
||||
let
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "ttf-envy-code-r";
|
||||
version = "PR7";
|
||||
in fetchzip {
|
||||
name = "${pname}-0.${version}";
|
||||
|
||||
url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip";
|
||||
src = fetchzip {
|
||||
url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip";
|
||||
hash = "sha256-pJqC/sbNjxEwbVf2CVoXMBI5zvT3DqzRlKSqFT8I2sM=";
|
||||
};
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/{doc,fonts}
|
||||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
|
||||
unzip -j $downloadedFile \*.txt -d "$out/share/doc/${pname}"
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 *.ttf -t $out/share/fonts/truetype
|
||||
install -Dm644 *.txt -t $out/share/doc/${pname}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
sha256 = "0x0r07nax68cmz7490x2crzzgdg4j8fg63wppcmjqm0230bggq2z";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://damieng.com/blog/tag/envy-code-r";
|
||||
description = "Free scalable coding font by DamienG";
|
||||
|
|
|
|||
|
|
@ -1,19 +1,22 @@
|
|||
{ lib, fetchzip }:
|
||||
let
|
||||
{ lib, stdenvNoCC, fetchzip }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "ttf-tw-moe";
|
||||
version = "2020-11-14";
|
||||
in
|
||||
fetchzip {
|
||||
name = "ttf-tw-moe";
|
||||
|
||||
url = "https://github.com/Jiehong/TW-fonts/archive/${version}.zip";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/Jiehong/TW-fonts/archive/${version}.zip";
|
||||
hash = "sha256-9gy8xO93ViIPmpg1du0DbXVCR2FowourLH8nP9d6HK0=";
|
||||
};
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
unzip -j $downloadedFile TW-fonts-${version}/\*.ttf -d $out/share/fonts/truetype
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm644 *.ttf -t $out/share/fonts/truetype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
sha256 = "1jd3gjjfa4vadp6d499n0irz5b22z611kd7q5qgqf6s2fwbxfhiz";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.moe.gov.tw/";
|
||||
description = "Set of KAI and SONG fonts from the Ministry of Education of Taiwan";
|
||||
|
|
|
|||
|
|
@ -1,18 +1,22 @@
|
|||
{ lib, fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchzip }:
|
||||
|
||||
fetchzip rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "ubuntu-font-family";
|
||||
version = "0.83";
|
||||
|
||||
url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-${version}.zip";
|
||||
src = fetchzip {
|
||||
url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-${version}.zip";
|
||||
hash = "sha256-FAg1xn8Gcbwmuvqtg9SquSet4oTT9nqE+Izeq7ZMVcA=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/ubuntu
|
||||
mv $out/*.ttf $out/share/fonts/ubuntu
|
||||
find $out -maxdepth 1 ! -type d -exec rm {} +
|
||||
'';
|
||||
mv *.ttf $out/share/fonts/ubuntu
|
||||
|
||||
sha256 = "090y665h4kf2bi623532l6wiwkwnpd0xds0jr7560xwfwys1hiqh";
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Ubuntu Font Family";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,8 @@
|
|||
{ lib, fetchzip }:
|
||||
{ lib, stdenvNoCC, fetchzip }:
|
||||
|
||||
let
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "victor-mono";
|
||||
version = "1.5.4";
|
||||
in
|
||||
fetchzip {
|
||||
name = "victor-mono-${version}";
|
||||
stripRoot = false;
|
||||
|
||||
# Upstream prefers we download from the website,
|
||||
# but we really insist on a more versioned resource.
|
||||
|
|
@ -14,19 +11,23 @@ fetchzip {
|
|||
# so we extract it from the tagged release.
|
||||
# Both methods produce the same file, but this way
|
||||
# we can safely reason about what version it is.
|
||||
url = "https://github.com/rubjo/victor-mono/raw/v${version}/public/VictorMonoAll.zip";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/rubjo/victor-mono/raw/v${version}/public/VictorMonoAll.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-E8j1bfYrM8yRtasiwgTvyE4EYx2LyAbmw3MXH1l+owk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p "$out/share/fonts/"
|
||||
|
||||
mv $out/OTF $out/share/fonts/opentype
|
||||
mv $out/TTF $out/share/fonts/truetype
|
||||
mv OTF $out/share/fonts/opentype
|
||||
mv TTF $out/share/fonts/truetype
|
||||
|
||||
rm -r $out/{EOT,WOFF,WOFF2,LICENSE.txt}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
sha256 = "sha256-1si0d2lpuXaDcSc3giVMMMbZc/eKbHKU3wmwfYHZ8o0=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free programming font with cursive italics and ligatures";
|
||||
homepage = "https://rubjo.github.io/victor-mono";
|
||||
|
|
|
|||
|
|
@ -50,5 +50,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ dtzWill AdsonCicilioti ];
|
||||
# unmaintained as of Nov 9, 2022. unable to be build with clickgen version 2.x
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,15 +25,21 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appcenter";
|
||||
version = "4.0.0";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-6QWvDBhOxoK8HjmygV92WPDgq2Jbk4igWDbXrXc7/FQ=";
|
||||
sha256 = "sha256-fRurEkatWbtGiTRNe6tA2NyYk1IRCBW8SKBSUm4FrO4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Having a working nix packagekit backend will supersede this.
|
||||
# https://github.com/NixOS/nixpkgs/issues/177946
|
||||
./disable-packagekit-backend.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
dbus # for pkg-config
|
||||
meson
|
||||
|
|
|
|||
|
|
@ -0,0 +1,167 @@
|
|||
diff --git a/src/Application.vala b/src/Application.vala
|
||||
index a1c4e0d4..35555946 100644
|
||||
--- a/src/Application.vala
|
||||
+++ b/src/Application.vala
|
||||
@@ -180,9 +180,6 @@ public class AppCenter.App : Gtk.Application {
|
||||
}
|
||||
|
||||
public override void activate () {
|
||||
- if (fake_update_packages != null) {
|
||||
- AppCenterCore.PackageKitBackend.get_default ().fake_packages = fake_update_packages;
|
||||
- }
|
||||
|
||||
var client = AppCenterCore.Client.get_default ();
|
||||
|
||||
@@ -200,12 +197,6 @@ public class AppCenter.App : Gtk.Application {
|
||||
|
||||
if (local_path != null) {
|
||||
var file = File.new_for_commandline_arg (local_path);
|
||||
-
|
||||
- try {
|
||||
- local_package = AppCenterCore.PackageKitBackend.get_default ().add_local_component_file (file);
|
||||
- } catch (Error e) {
|
||||
- warning ("Failed to load local AppStream XML file: %s", e.message);
|
||||
- }
|
||||
}
|
||||
|
||||
if (active_window == null) {
|
||||
diff --git a/src/Core/BackendAggregator.vala b/src/Core/BackendAggregator.vala
|
||||
index 1747cd3b..20077394 100644
|
||||
--- a/src/Core/BackendAggregator.vala
|
||||
+++ b/src/Core/BackendAggregator.vala
|
||||
@@ -26,8 +26,6 @@ public class AppCenterCore.BackendAggregator : Backend, Object {
|
||||
|
||||
construct {
|
||||
backends = new Gee.ArrayList<unowned Backend> ();
|
||||
- backends.add (PackageKitBackend.get_default ());
|
||||
- backends.add (UbuntuDriversBackend.get_default ());
|
||||
backends.add (FlatpakBackend.get_default ());
|
||||
|
||||
unowned Gtk.Application app = (Gtk.Application) GLib.Application.get_default ();
|
||||
diff --git a/src/Core/Package.vala b/src/Core/Package.vala
|
||||
index 40fa8262..e6b90dd9 100644
|
||||
--- a/src/Core/Package.vala
|
||||
+++ b/src/Core/Package.vala
|
||||
@@ -327,23 +327,13 @@ public class AppCenterCore.Package : Object {
|
||||
public string origin_description {
|
||||
owned get {
|
||||
unowned string origin = component.get_origin ();
|
||||
- if (backend is PackageKitBackend) {
|
||||
- if (origin == APPCENTER_PACKAGE_ORIGIN) {
|
||||
- return _("AppCenter");
|
||||
- } else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) {
|
||||
- return _("elementary Updates");
|
||||
- } else if (origin.has_prefix ("ubuntu-")) {
|
||||
- return _("Ubuntu (non-curated)");
|
||||
- }
|
||||
- } else if (backend is FlatpakBackend) {
|
||||
+ if (backend is FlatpakBackend) {
|
||||
var fp_package = this as FlatpakPackage;
|
||||
if (fp_package == null) {
|
||||
return origin;
|
||||
}
|
||||
|
||||
return fp_package.remote_title;
|
||||
- } else if (backend is UbuntuDriversBackend) {
|
||||
- return _("Ubuntu Drivers");
|
||||
}
|
||||
|
||||
return _("Unknown Origin (non-curated)");
|
||||
@@ -435,9 +425,7 @@ public class AppCenterCore.Package : Object {
|
||||
|
||||
// The version on a PackageKit package comes from the package not AppStream, so only reset the version
|
||||
// on other backends
|
||||
- if (!(backend is PackageKitBackend)) {
|
||||
- _latest_version = null;
|
||||
- }
|
||||
+ _latest_version = null;
|
||||
|
||||
this.component = component;
|
||||
}
|
||||
diff --git a/src/Core/UpdateManager.vala b/src/Core/UpdateManager.vala
|
||||
index 4d844abc..457137eb 100644
|
||||
--- a/src/Core/UpdateManager.vala
|
||||
+++ b/src/Core/UpdateManager.vala
|
||||
@@ -71,35 +71,9 @@ public class AppCenterCore.UpdateManager : Object {
|
||||
installed_package.update_state ();
|
||||
}
|
||||
|
||||
- Pk.Results pk_updates;
|
||||
- unowned PackageKitBackend client = PackageKitBackend.get_default ();
|
||||
- try {
|
||||
- pk_updates = yield client.get_updates (cancellable);
|
||||
- } catch (Error e) {
|
||||
- warning ("Unable to get updates from PackageKit backend: %s", e.message);
|
||||
- return 0;
|
||||
- }
|
||||
-
|
||||
uint os_count = 0;
|
||||
string os_desc = "";
|
||||
|
||||
- var package_array = pk_updates.get_package_array ();
|
||||
- debug ("PackageKit backend reports %d updates", package_array.length);
|
||||
-
|
||||
- package_array.foreach ((pk_package) => {
|
||||
- var pkg_name = pk_package.get_name ();
|
||||
- debug ("Added %s to OS updates", pkg_name);
|
||||
- os_count++;
|
||||
- unowned string pkg_summary = pk_package.get_summary ();
|
||||
- unowned string pkg_version = pk_package.get_version ();
|
||||
- os_desc += Markup.printf_escaped (
|
||||
- " • %s\n\t%s\n\t%s\n",
|
||||
- pkg_name,
|
||||
- pkg_summary,
|
||||
- _("Version: %s").printf (pkg_version)
|
||||
- );
|
||||
- });
|
||||
-
|
||||
os_updates.component.set_pkgnames ({});
|
||||
os_updates.change_information.clear_update_info ();
|
||||
|
||||
@@ -207,30 +181,13 @@ public class AppCenterCore.UpdateManager : Object {
|
||||
count += 1;
|
||||
}
|
||||
|
||||
- pk_updates.get_details_array ().foreach ((pk_detail) => {
|
||||
- var pk_package = new Pk.Package ();
|
||||
- try {
|
||||
- pk_package.set_id (pk_detail.get_package_id ());
|
||||
- var pkg_name = pk_package.get_name ();
|
||||
-
|
||||
- var pkgnames = os_updates.component.pkgnames;
|
||||
- pkgnames += pkg_name;
|
||||
- os_updates.component.pkgnames = pkgnames;
|
||||
-
|
||||
- os_updates.change_information.updatable_packages.@set (client, pk_package.get_id ());
|
||||
- os_updates.change_information.size += pk_detail.size;
|
||||
- } catch (Error e) {
|
||||
- critical (e.message);
|
||||
- }
|
||||
- });
|
||||
-
|
||||
os_updates.update_state ();
|
||||
runtime_updates.update_state ();
|
||||
return count;
|
||||
}
|
||||
|
||||
public void update_restart_state () {
|
||||
- var should_restart = restart_file.query_exists () || PackageKitBackend.get_default ().is_restart_required ();
|
||||
+ var should_restart = restart_file.query_exists ();
|
||||
|
||||
if (should_restart) {
|
||||
if (!restart_required) {
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index e0ef5342..14319492 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -12,10 +12,8 @@ appcenter_files = files(
|
||||
'Core/FlatpakBackend.vala',
|
||||
'Core/Job.vala',
|
||||
'Core/Package.vala',
|
||||
- 'Core/PackageKitBackend.vala',
|
||||
'Core/ScreenshotCache.vala',
|
||||
'Core/Task.vala',
|
||||
- 'Core/UbuntuDriversBackend.vala',
|
||||
'Core/UpdateManager.vala',
|
||||
'Dialogs/InstallFailDialog.vala',
|
||||
'Dialogs/StripeDialog.vala',
|
||||
|
|
@ -28,21 +28,21 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-code";
|
||||
version = "6.2.0";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "code";
|
||||
rev = version;
|
||||
sha256 = "sha256-QhJNRhYgGbPMd7B1X3kG+pnC/lGUoF7gc7O1PdG49LI=";
|
||||
sha256 = "sha256-6ZOdlOCIDy5aWQre15+SrTH/vhY9OeTffY/uTSroELc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix drag and drop of accented text and between tabs
|
||||
# https://github.com/elementary/code/pull/1194
|
||||
# Fix global search action disabled at startup
|
||||
# https://github.com/elementary/code/pull/1254
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/code/commit/1ed7b590768ea9cb5b4658e27d9dc7ac224442ae.patch";
|
||||
sha256 = "sha256-VrYcEbkzQKi5gFB/Vw/0NITZvSXKXfuEv2R3m0VALVM=";
|
||||
url = "https://github.com/elementary/code/commit/1e75388b07c060cc10ecd612076f235b1833fab8.patch";
|
||||
sha256 = "sha256-8Djh1orMcmICdYwQFENJCaYlXK0E52NhCmuhlHCz7oM=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
|
|||
# build: support webkit2gtk-4.1
|
||||
# https://github.com/elementary/mail/pull/794
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/mail/commit/7d4878543b27251664852c708d54abc1e4580eab.patch";
|
||||
sha256 = "sha256-yl6Bzjinp+ti/aX+t22GibGeQFtharZNk3MmbuJm0Tk=";
|
||||
url = "https://github.com/elementary/mail/commit/9e6eb73a8420c9bf327e59c25e7e6d8fa87d480a.patch";
|
||||
sha256 = "sha256-idkVymePLa7vgfuou0HIrbWRCaWAgZliDcp4HyZBArs=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -28,10 +28,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [
|
||||
# build: support evolution-data-server 3.45
|
||||
# https://github.com/elementary/switchboard-plug-onlineaccounts/pull/244
|
||||
# https://github.com/elementary/switchboard-plug-onlineaccounts/pull/248
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch";
|
||||
sha256 = "sha256-C7woN4shPrVlSWZeW0Fz+xFi5CTQd2K5BsF5YeI9x0Y=";
|
||||
url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/08faf7b4241547b7900596af12a03d816712a808.patch";
|
||||
sha256 = "sha256-QLe+NPHuo3hLM9n1f4hT5IK4nkWtYSe91L1wVSBzw6k=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
let
|
||||
useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV;
|
||||
goBootstrap = if useGccGoBootstrap then buildPackages.gccgo else buildPackages.callPackage ./bootstrap116.nix { };
|
||||
goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap116.nix { };
|
||||
|
||||
skopeoTest = skopeo.override { buildGoModule = buildGo118Module; };
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
let
|
||||
useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV;
|
||||
goBootstrap = if useGccGoBootstrap then buildPackages.gccgo else buildPackages.callPackage ./bootstrap116.nix { };
|
||||
goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap116.nix { };
|
||||
|
||||
skopeoTest = skopeo.override { buildGoModule = buildGo119Module; };
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
let
|
||||
useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV;
|
||||
goBootstrap = if useGccGoBootstrap then buildPackages.gccgo else buildPackages.callPackage ./bootstrap117.nix { };
|
||||
goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap117.nix { };
|
||||
|
||||
skopeoTest = skopeo.override { buildGoModule = buildGo120Module; };
|
||||
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
let
|
||||
callPackage = newScope self;
|
||||
|
||||
version = "6.1.5";
|
||||
version = "6.1.6";
|
||||
|
||||
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
|
||||
src = fetchFromGitHub {
|
||||
owner = "platformio";
|
||||
repo = "platformio-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7Wx3O2zL5Dlbk7rooiHutpN63kAjhuYijgsZru+oaOI=";
|
||||
sha256 = "sha256-BEeMfdmAWqFbQUu8YKKrookQVgmhfZBqXnzeb2gfhms=";
|
||||
};
|
||||
|
||||
self = {
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@ index 1e5f935a..26d1ac6a 100644
|
|||
@staticmethod
|
||||
@memoized(expire="1h")
|
||||
def load_spdx_licenses():
|
||||
- version = "3.18"
|
||||
- version = "3.19"
|
||||
- spdx_data_url = (
|
||||
- "https://raw.githubusercontent.com/spdx/license-list-data/"
|
||||
- "v%s/json/licenses.json" % version
|
||||
- )
|
||||
- return json.loads(fetch_remote_content(spdx_data_url))
|
||||
+ # version = "3.18"
|
||||
+ # version = "3.19"
|
||||
+ # spdx_data_url = (
|
||||
+ # "https://raw.githubusercontent.com/spdx/license-list-data/"
|
||||
+ # "v%s/json/licenses.json" % version
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "babashka";
|
||||
version = "1.0.170";
|
||||
version = "1.1.172";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||
sha256 = "sha256-NM1lcDi60DuBr67kOx6CVLyO8p2DUq6c2oTZEiHBFjw=";
|
||||
sha256 = "sha256-mdcG4zKC9zX0J2S2lWCvFdFFr5sOxfOe9/iPzvEyImM=";
|
||||
};
|
||||
|
||||
executable = "bb";
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine";
|
||||
homepage = "https://selflanguage.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.doublec ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dqlite";
|
||||
version = "1.9.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0zalsvr0vy7632nhm96a29lrfy18iqsmbxpyz2lvq80mrjlbrzsn";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KVQa11gw/8h3Be+52V44W2M+fd7sB35emrS/aUEUGl0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook file pkg-config ];
|
||||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://dqlite.io/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ joko ];
|
||||
maintainers = with maintainers; [ joko adamcstephens ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@
|
|||
, withRemote ? false
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libpcap";
|
||||
version = "1.10.1";
|
||||
|
|
@ -21,20 +19,20 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-7ShfSsyvBTRPkJdXV7Pb/ncrpB0cQBwmSLf6RbcRvdQ=";
|
||||
};
|
||||
|
||||
buildInputs = optionals withRemote [ libxcrypt ];
|
||||
buildInputs = lib.optionals withRemote [ libxcrypt ];
|
||||
|
||||
nativeBuildInputs = [ flex bison ]
|
||||
++ optionals withBluez [ bluez.dev pkg-config ];
|
||||
++ lib.optionals withBluez [ bluez.dev pkg-config ];
|
||||
|
||||
# We need to force the autodetection because detection doesn't
|
||||
# work in pure build environments.
|
||||
configureFlags = [
|
||||
"--with-pcap=${if stdenv.isLinux then "linux" else "bpf"}"
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"--disable-universal"
|
||||
] ++ optionals withRemote [
|
||||
] ++ lib.optionals withRemote [
|
||||
"--enable-remote"
|
||||
] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform)
|
||||
] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform)
|
||||
[ "ac_cv_linux_vers=2" ];
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -43,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
fi
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = "https://www.tcpdump.org";
|
||||
description = "Packet Capture Library";
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mdds";
|
||||
version = "2.1.0";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mdds";
|
||||
repo = "mdds";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-RZ2wGwle4raWlogc5X+VEeriPGS0Nqs7CWGENFEotvs=";
|
||||
hash = "sha256-Y9uBJKM34UTEj/3c1w69QHhvwFcMNlAohEco0O0B+xI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "maestro";
|
||||
version = "1.19.5";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
|
||||
sha256 = "1chrfwpxbnbn6k6ciwbflz1b8d7sd3r945m5g2d9gz1r1nn6d4v1";
|
||||
sha256 = "0hrfnx66yr1q57875m3ff4b2blq0k641iqjxjys8kwzp3nix34w2";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -5,21 +5,20 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "ca-certs";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
minimumOCamlVersion = "4.07";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-v${version}.tbz";
|
||||
sha256 = "sha256-Tx53zBJemZh3ODh/8izahxDoJvXvNFLyAA8LMM1mhlI=";
|
||||
url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-${version}.tbz";
|
||||
hash = "sha256-0tjWRX2RXvbXg974Lzvl7C9W+S4gIU9Y7dY8nC/GDpw=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ bos fpath ptime mirage-crypto x509 astring logs ];
|
||||
|
||||
# Assumes nss-cacert < 3.74 https://github.com/mirage/ca-certs/issues/21
|
||||
doCheck = false;
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [
|
||||
cacert # for /etc/ssl/certs/ca-bundle.crt
|
||||
alcotest
|
||||
|
|
|
|||
|
|
@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ ocaml findlib libjpeg libpng ];
|
||||
propagatedBuildInputs = [ gd zlib freetype ];
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $OCAMLFIND_DESTDIR/stublibs
|
||||
|
|
|
|||
|
|
@ -1,25 +1,24 @@
|
|||
{ lib, buildDunePackage, fetchurl, num }:
|
||||
{ lib, buildDunePackage, fetchurl, camlp-streams, num }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "lutils";
|
||||
version = "1.51.2";
|
||||
|
||||
useDune2 = true;
|
||||
version = "1.54.1";
|
||||
|
||||
minimalOCamlVersion = "4.02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lutils.1.51.2.tgz";
|
||||
sha512 = "f94696be379c62e888410ec3d940c888ca4b607cf59c2e364e93a2a694da65ebe6d531107198b795e80eecc3c6865eedb02659c7e7c4e15c9b28d74aa35d09f8";
|
||||
url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lutils.v${version}.tgz";
|
||||
hash = "sha512:d3c3b80286b1aa236ba922d9e18a133721fc80126c8b89520fb811dce9400e217aaa75b5d49e03988be7f6bf5f2e1a391d02ceeaa5ec0a0cd5ce218083a29514";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
num
|
||||
camlp-streams num
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/";
|
||||
description = "Tools and libs shared by Verimag/synchronous tools (lustre, lutin, rdbg)";
|
||||
changelog = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/-/releases/v${version}";
|
||||
license = lib.licenses.cecill21;
|
||||
mainProgram = "gnuplot-rif";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, packaging
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -9,18 +12,35 @@ buildPythonPackage rec {
|
|||
version = "1.14.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jongracecox";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-+CkkFCShCYtxKiCWRQcgTFcekc/g7ujQj9MdnG1+a0A=";
|
||||
hash = "sha256-+CkkFCShCYtxKiCWRQcgTFcekc/g7ujQj9MdnG1+a0A=";
|
||||
};
|
||||
|
||||
# setup.py reads its version from the TRAVIS_TAG environment variable
|
||||
TRAVIS_TAG = "v${version}";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
packaging
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
requests
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Comparison of CLI output fails
|
||||
"test_module_same_output_as_main_cli"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# No anybadge-server
|
||||
"tests/test_server.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
@ -30,6 +50,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python tool for generating badges for your projects";
|
||||
homepage = "https://github.com/jongracecox/anybadge";
|
||||
changelog = "https://github.com/jongracecox/anybadge/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fabiangd ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bthome-ble";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-nNvPSp1Ij7JPXVFt8ediNtJaiuIDxRQFl3gySivJdqs=";
|
||||
hash = "sha256-xxdCuTSpGe89TjF0YPmD4i1Fx1WfaQTTataFRnbcaos=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "denonavr";
|
||||
version = "0.10.12";
|
||||
version = "0.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "scarface-4711";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-QNiDoPjOuwwAgUqDzXHzn0BE9bwXQrQKAIFlHCywl88=";
|
||||
hash = "sha256-0zclIoEGKjA8Ro8k+HYX/d77U+ntQZv0vq6gC4Sa7zE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -49,6 +49,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Automation Library for Denon AVR receivers";
|
||||
homepage = "https://github.com/scarface-4711/denonavr";
|
||||
changelog = "https://github.com/ol-iver/denonavr/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ colemickens ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fakeredis";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "dsoftwareinc";
|
||||
repo = "fakeredis-py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-LKUDwx3EEcOQFhUjTe5xm3AQRuwTGsYY27Vmg2R9ofc=";
|
||||
hash = "sha256-yb6Tuko7swrrFRQmtXAhm1kl16O813epOOCzOMEg58E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flowlogs-reader";
|
||||
version = "4.0.0";
|
||||
version = "5.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
repo = pname;
|
||||
# https://github.com/obsrvbl/flowlogs-reader/issues/57
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-PGyuzOhq1TC/nGsGJYQYTDpcsYzcwNPiaHWd66tfzQQ=";
|
||||
hash = "sha256-XHRibTSzFzWPz50elz+KdbCwTrd1DKfVMSg6UamNbzc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "geoalchemy2";
|
||||
version = "0.12.5";
|
||||
version = "0.13.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "GeoAlchemy2";
|
||||
inherit version;
|
||||
hash = "sha256-McJQLc4xe1ezNeTrh1YtUB+jnkbHKL5RTZuGCR4I3Wc=";
|
||||
hash = "sha256-VyRtRK6pC0xS+EwAb2dY0OGVHrkBjxBAmocUHwIVmxM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-asset";
|
||||
version = "3.17.0";
|
||||
version = "3.17.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-CsTfdEgDeHdrYWLqMt3WpYOcxT9BuQ2M8sqg0ZIwmvM=";
|
||||
hash = "sha256-EFMiiPlHwKkc7tjOcbqiAlnb+3oBsTBlg6Ey0vvs+Mc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery-datatransfer";
|
||||
version = "3.10.0";
|
||||
version = "3.10.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-R6CIL1CA3UR81kUeIlFGJaxDGO33GBKOzT4Qo2LWlQk=";
|
||||
hash = "sha256-GcgJhFT3L5TlVZYXjQQ9eENRcv/V176hF86BSsN7K/A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-container";
|
||||
version = "2.17.0";
|
||||
version = "2.17.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-UlZJ4nh7BOw4HfFGZucU7Kom7/EuSdgZZzZ30f4wL+0=";
|
||||
hash = "sha256-PXDUjipUG7cYqeO2ivqrqLybHzDIssvBtdZixEMqXOA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datacatalog";
|
||||
version = "3.11.0";
|
||||
version = "3.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wu53nKA4nmXHuJ+dr9r/A9xDYec1bkW4S8gfgiLBctw=";
|
||||
hash = "sha256-X4h6hrEfjiroAgtG26bz70P2PsEileHmZ5Jq6iPHqCs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datastore";
|
||||
version = "2.11.0";
|
||||
version = "2.13.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-PSk6IYBfGL7g0FBCqUgT4T8k1IYprtLGQQQEybEO99o=";
|
||||
hash = "sha256-ikstW53KrRr4vnmtbr0AOG8/kHaF8excJFbwclhCA7A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-org-policy";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-V1Fpm8P4XD0USNNG1oD6OFrOeDcJyEvYPaHcWKQhLCQ=";
|
||||
hash = "sha256-ivlerguhDb7zhRfizIPGQWwwLOUhyoj2xWAy9inSklQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-securitycenter";
|
||||
version = "1.18.0";
|
||||
version = "1.18.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gtzSB70x7oN6EiTP1U5P1dV4a4eWZNGtRFInYz7AyCA=";
|
||||
hash = "sha256-O1jSSozVmeDRoTCtRhsBDlZ/o8g/8ccGkJCg6hp7ob8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-videointelligence";
|
||||
version = "2.10.0";
|
||||
version = "2.10.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-SzCzTYyvf85E7BDBV0lX4g0hiNyZ5Ebo1m+WR4AjoBk=";
|
||||
hash = "sha256-HlmuzMOaCl7z9NBVI5HoCH1vltQCeel30B5roX/+2HE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
|
||||
|
|
@ -22,6 +23,7 @@ buildPythonPackage rec {
|
|||
pname = "graphene-django";
|
||||
version = "3.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -58,9 +60,18 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.11") [
|
||||
# Pèython 3.11 support, https://github.com/graphql-python/graphene-django/pull/1365
|
||||
"test_django_objecttype_convert_choices_enum_naming_collisions"
|
||||
"test_django_objecttype_choices_custom_enum_name"
|
||||
"test_django_objecttype_convert_choices_enum_list"
|
||||
"test_schema_representation"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Integrate GraphQL into your Django project";
|
||||
homepage = "https://github.com/graphql-python/graphene-django";
|
||||
changelog = "https://github.com/graphql-python/graphene-django/releases/tag/v{version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2023.1.6";
|
||||
version = "2023.1.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-bjONfnxJuqo0d/9K4VKyIurcpw5+RgyAij1Hm/mTeUc=";
|
||||
sha256 = "sha256-n/j884ttxFCkNnpRuHquzDeWsJchHS0A13CR2CtO4lo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab";
|
||||
version = "3.5.2";
|
||||
version = "3.5.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-EKwJQhX/uHLd/74pgr8cA5p5/swybhkefMXv2E8zHa0=";
|
||||
hash = "sha256-UeiJRIrhlO7vjlD2P1xPSH9yj0d77+Q26XSWcvdRHb4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -44,6 +44,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/jupyterlab/jupyterlab/releases/tag/v${version}";
|
||||
description = "Jupyter lab environment notebook server extension";
|
||||
license = with licenses; [ bsd3 ];
|
||||
homepage = "https://jupyter.org/";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, cmake
|
||||
|
|
@ -6,15 +7,19 @@
|
|||
, scipy
|
||||
, scikit-learn
|
||||
, llvmPackages ? null
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lightgbm";
|
||||
version = "3.3.3";
|
||||
version = "3.3.5";
|
||||
format = "other";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-hX5VmuhKIpY84rYhaCkpadIa3TC8kkaoTU5+7a5nlm0=";
|
||||
hash = "sha256-ELj73PhR5PaKHwLzjZm9xEx8f7mxpi3PkkoNKf9zOVw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -23,7 +28,10 @@ buildPythonPackage rec {
|
|||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
|
||||
buildInputs = lib.optionals stdenv.cc.isClang [
|
||||
llvmPackages.openmp
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
|
|
@ -38,11 +46,15 @@ buildPythonPackage rec {
|
|||
# repository. It contains c++ tests which don't seem to wired up to
|
||||
# `make check`.
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "lightgbm" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"lightgbm"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fast, distributed, high performance gradient boosting (GBDT, GBRT, GBM or MART) framework";
|
||||
homepage = "https://github.com/Microsoft/LightGBM";
|
||||
changelog = "https://github.com/microsoft/LightGBM/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ teh costrouc ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mailchecker";
|
||||
version = "5.0.6";
|
||||
version = "5.0.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-g70FjY0tc4KjgdVweuBBkFrByt8xlGPJEPz/OvTtjZk=";
|
||||
hash = "sha256-u5htHCI10mn6AQDlAShMpbyI4PcqiRgpRvsy5Q3km+0=";
|
||||
};
|
||||
|
||||
# Module has no tests
|
||||
|
|
|
|||
|
|
@ -20,14 +20,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "whisper";
|
||||
version = "unstable-2022-09-30";
|
||||
version = "20230117";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = pname;
|
||||
rev = "60132ade70e00b843d93542fcb37b58c0d8bf9e7";
|
||||
hash = "sha256-4mhlCvewA0bVo5bq2sbSEKHq99TQ6jUauiCUkdRSdas=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DVYQw+h5xsgWLA6dD+qg4ud0pqFOn6oVAzTqRywE30g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "openai";
|
||||
version = "0.26.1";
|
||||
version = "0.26.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7.1";
|
||||
|
|
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
|||
owner = "openai";
|
||||
repo = "openai-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-M6ZaYTOBAwLogWPafSnBYw3rUry+sS9VwQWAM9tDfr8=";
|
||||
hash = "sha256-rUXwrr8hgKwqJ/ittK2DOKaqxTAs8wKyVTSdEhfiWfI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,23 +1,37 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, six
|
||||
, pytestCheckHook
|
||||
, fetchpatch
|
||||
, mock
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "promise";
|
||||
version = "2.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syrusakbary";
|
||||
repo = "promise";
|
||||
rev = "v${version}";
|
||||
sha256 = "17mq1bm78xfl0x1g50ng502m5ldq6421rzz35hlqafsj0cq8dkp6";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5s6GMANSO4UpLOP/HAQxuNFSBSjPgvJCB9R1dOoKuJ4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Convert @asyncio.coroutine to async def, https://github.com/syrusakbary/promise/pull/99
|
||||
(fetchpatch {
|
||||
name = "use-async-def.patch";
|
||||
url = "https://github.com/syrusakbary/promise/commit/3cde549d30b38dcff81b308e18c7f61783003791.patch";
|
||||
hash = "sha256-XCbTo6RCv75nNrpbK3TFdV0h7tBJ0QK+WOAR8S8w9as=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tests/test_extra.py \
|
||||
--replace "assert_exc.traceback[-1].path.strpath" "str(assert_exc.traceback[-1].path)"
|
||||
|
|
@ -28,21 +42,24 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
mock
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/test_benchmark.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"promise"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Ultra-performant Promise implementation in Python";
|
||||
homepage = "https://github.com/syrusakbary/promise";
|
||||
changelog = "https://github.com/syrusakbary/promise/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
kamadorueda
|
||||
];
|
||||
maintainers = with maintainers; [ kamadorueda ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,13 +5,14 @@
|
|||
, beautifulsoup4
|
||||
, lxml
|
||||
, cssutils
|
||||
, nltk
|
||||
, pytest-lazy-fixture
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycaption";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -19,7 +20,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-mV//EYdP7wKYD3Vc49z6LQVQeOuhzNKFZLf28RYdABk=";
|
||||
hash = "sha256-B+uIh8WTPPeNVU3yP8FEGc8OinY0MpJb9dHLC+nhi4I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -28,6 +29,10 @@ buildPythonPackage rec {
|
|||
cssutils
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
transcript = [ nltk ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-lazy-fixture
|
||||
pytestCheckHook
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylsp-mypy";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "Richardk2n";
|
||||
repo = "pylsp-mypy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BpYg2noReHFgJ/5iQI09XUWNAN7UdcYgqpZ/IPr17Ao=";
|
||||
hash = "sha256-LQ9Kw/dG3XA67WaVObE72fxERb21eZzk+MCqIp2Qy0o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynetbox";
|
||||
version = "7.0.0";
|
||||
version = "7.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbox-community";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-PFSnINbXSnEo1gvntjfH6KCVa/LeaNrsiuWM4H+fOvQ=";
|
||||
hash = "sha256-RAUM79lDz7oNV7Li987Sz7JoNz/feO6BsEcWO0u/Ub8=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-cEEEDbHC0Yf7zNFRSFsSRMQddYvoIXhYR5RjcOtrtwY=";
|
||||
hash = "sha256-d1rO/vTSrOdZHmIAAL3zg8cMi3lpgEhw9sLYIE+iF+A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, buildPythonPackage
|
||||
, eventlet
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, iana-etc
|
||||
, libredirect
|
||||
, mock
|
||||
|
|
@ -24,10 +25,19 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "miguelgrinberg";
|
||||
repo = "python-engineio";
|
||||
rev = "v${version}";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fymO9WqkYaRsHKCJHQJpySHqZor2t8BfVrfYUfYoJno=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Address Python 3.11 mocking issue, https://github.com/miguelgrinberg/python-engineio/issues/279
|
||||
(fetchpatch {
|
||||
name = "mocking-issue-py311.patch";
|
||||
url = "https://github.com/miguelgrinberg/python-engineio/commit/ac3911356fbe933afa7c11d56141f0e228c01528.patch";
|
||||
hash = "sha256-LNMhjX8kqOI3y8XugCHxCPEC6lF83NROfIczXWiLuqY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aiohttp
|
||||
eventlet
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyunifiprotect";
|
||||
version = "4.6.1";
|
||||
version = "4.6.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
|||
owner = "briis";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5xHU4WC7HPDEJsfCX4bVsK3p6SWZ/fHH7APbFtDGC40=";
|
||||
hash = "sha256-sEIjR6ScJNliJJJET06e22x5GMDrmB6fZAzyHr847sk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "requests-aws4auth";
|
||||
version = "1.1.2";
|
||||
version = "1.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,8 +19,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "tedder";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/SqU/ojP9I4JXzR0c5tLzxx9UyNaVsON7LG/dbdeiH0=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-a3OY0Z5GGr3gYa5m4V6ukqQmjZuqtgZjmLGJxmFOPqU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -29,7 +29,9 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
httpx = [ httpx ];
|
||||
httpx = [
|
||||
httpx
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
@ -43,6 +45,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Amazon Web Services version 4 authentication for the Python Requests library";
|
||||
homepage = "https://github.com/sam-washington/requests-aws4auth";
|
||||
changelog = "https://github.com/tedder/requests-aws4auth/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ basvandijk ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sfrbox-api";
|
||||
version = "0.0.4";
|
||||
version = "0.0.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "hacf-fr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mdE7H17vbKwQS7JloYasap8qAjaacdLuDPvIPxJSUXI=";
|
||||
hash = "sha256-6SwZAAWBnxeeunZwUAVQJBU8904czNVheBlRFg5yrOw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -5,43 +5,53 @@
|
|||
, ply
|
||||
, pytestCheckHook
|
||||
, six
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stone";
|
||||
version = "3.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# pypi sdist misses requirements.txt
|
||||
src = fetchFromGitHub {
|
||||
owner = "dropbox";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0FWdYbv+paVU3Wj6g9OrSNUB0pH8fLwTkhVIBPeFB/U=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/pytest-runner/d' setup.py
|
||||
# https://github.com/dropbox/stone/issues/288
|
||||
substituteInPlace stone/frontend/ir_generator.py \
|
||||
--replace "inspect.getargspec" "inspect.getfullargspec"
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner == 5.2.0'," ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ ply six ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook mock ];
|
||||
|
||||
# try to import from `test` directory, which is exported by the python interpreter
|
||||
# and cannot be overridden without removing some py3 to py2 support
|
||||
disabledTestPaths = [
|
||||
"test/test_tsd_types.py"
|
||||
"test/test_js_client.py"
|
||||
propagatedBuildInputs = [
|
||||
ply
|
||||
six
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
mock
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_type_name_with_module"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "stone" ];
|
||||
pythonImportsCheck = [
|
||||
"stone"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Official Api Spec Language for Dropbox";
|
||||
homepage = "https://github.com/dropbox/stone";
|
||||
changelog = "https://github.com/dropbox/stone/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jonringer ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-pyyaml";
|
||||
version = "6.0.12.2";
|
||||
version = "6.0.12.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "types-PyYAML";
|
||||
inherit version;
|
||||
sha256 = "sha256-aECBmHHJLe6+aiBn+4AMEbigY2MutOPnVZFOerNgToM=";
|
||||
sha256 = "sha256-F84Xs+rY8G5BajsdW43cbLgqQiuyACVN2LRpQ0sEX/w=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "whois";
|
||||
version = "0.9.23";
|
||||
version = "0.9.24";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "DannyCork";
|
||||
repo = "python-whois";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-HYzCdWX0gz1W73ZPlrdt+kqUPbBRrDnkGJE56nQ3UVc=";
|
||||
hash = "sha256-DxjfRBJh/qLafxXN2VcXHTWuajDg6lvmJ5U86Na3L5g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue