diff --git a/doc/hooks/postgresql-test-hook.section.md b/doc/hooks/postgresql-test-hook.section.md index c53d841883e5..8b37ca1e4b3e 100644 --- a/doc/hooks/postgresql-test-hook.section.md +++ b/doc/hooks/postgresql-test-hook.section.md @@ -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. diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 1a7b90593b1d..1a51225a80ed 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -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])) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5ef4df5db992..db4854896dd4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -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"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 66bd185da549..5e520c8308cf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -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 diff --git a/nixos/modules/programs/gnome-documents.nix b/nixos/modules/programs/gnome-documents.nix deleted file mode 100644 index 2831ac9aff2e..000000000000 --- a/nixos/modules/programs/gnome-documents.nix +++ /dev/null @@ -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; - - }; - -} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index d88baac7a5d4..b92561ed4859 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -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")) diff --git a/nixos/tests/installed-tests/fwupd.nix b/nixos/tests/installed-tests/fwupd.nix index 65614e2689d8..c095a50dc836 100644 --- a/nixos/tests/installed-tests/fwupd.nix +++ b/nixos/tests/installed-tests/fwupd.nix @@ -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; }; } diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 61ff53aa1d75..6d37e33b5eee 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -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; { diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index fb3912ab4db4..69004bb73c3f 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -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"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 6b67883226fe..8a05f8276b3f 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -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"; }) diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 5e4b0afd385d..08def5dd7917 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -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"; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index 62aeee0f638e..e9b1de7ed900 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -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"; }) diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index 83da181f24b4..7f68b5821495 100644 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -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; }; } diff --git a/pkgs/applications/graphics/json-plot/default.nix b/pkgs/applications/graphics/json-plot/default.nix index 9b43518a87d2..39c4b45cd1d6 100644 --- a/pkgs/applications/graphics/json-plot/default.nix +++ b/pkgs/applications/graphics/json-plot/default.nix @@ -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."; diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix index 37ad3387f834..91562bb5d49e 100644 --- a/pkgs/applications/graphics/lazpaint/default.nix +++ b/pkgs/applications/graphics/lazpaint/default.nix @@ -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 }; } diff --git a/pkgs/applications/graphics/yeetgif/default.nix b/pkgs/applications/graphics/yeetgif/default.nix index 84bcdee5b76e..d464b56cb265 100644 --- a/pkgs/applications/graphics/yeetgif/default.nix +++ b/pkgs/applications/graphics/yeetgif/default.nix @@ -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"; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index d0ace35400d5..e7f094844b9a 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -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; diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index eb773b3c812e..8758e5fe92f6 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -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 ]; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index d69073d710e8..3f613041ff93 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -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; diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index a50c4e42706a..54a3a2ed14c6 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -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 diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix index b15ee2644a74..7aae31152f7f 100644 --- a/pkgs/applications/misc/parsec/bin.nix +++ b/pkgs/applications/misc/parsec/bin.nix @@ -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 ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 81d6f0e90494..69bb9b2e3851 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -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=", diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index bfe7ca2fcbd8..0c43ffbeea91 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -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[@]}" diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/applications/networking/instant-messengers/discord/openasar.nix index 50ca9a3a0fb6..95f1625f1af1 100644 --- a/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -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 = '' diff --git a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix index 6d2d79c6c7a2..bb7c49c3106a 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix @@ -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; diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 926e97af80b3..5566906919a8 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -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 = [ diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 4b7166ad9986..bbc96b2b681c 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -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"; diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 15d26406bb8d..a9aabd7a87da 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -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 ]; diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index 763c60f654bb..cba7be953173 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -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; diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh b/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh index cfc9bd2f83d6..8131304cccf9 100644 --- a/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh +++ b/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh @@ -71,6 +71,8 @@ EOF header 'setting up postgresql' eval "$postgresqlTestSetupCommands" + runHook postgresqlTestSetupPost + } postgresqlStop() { diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix b/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix index adb65fca7ca6..9881ed1016cc 100644 --- a/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix +++ b/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix @@ -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 ''; } diff --git a/pkgs/data/fonts/liberastika/default.nix b/pkgs/data/fonts/liberastika/default.nix index 5435a601d147..7c716c1a354b 100644 --- a/pkgs/data/fonts/liberastika/default.nix +++ b/pkgs/data/fonts/liberastika/default.nix @@ -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 = [ ]; }; } diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index 10a8dc38d954..d5623d907bee 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -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 = { }; } diff --git a/pkgs/data/fonts/mro-unicode/default.nix b/pkgs/data/fonts/mro-unicode/default.nix index 9f4eda63d0fa..9a522c1c2a36 100644 --- a/pkgs/data/fonts/mro-unicode/default.nix +++ b/pkgs/data/fonts/mro-unicode/default.nix @@ -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"; diff --git a/pkgs/data/fonts/pretendard/default.nix b/pkgs/data/fonts/pretendard/default.nix index 40175dc54056..60ecc61c7ec3 100644 --- a/pkgs/data/fonts/pretendard/default.nix +++ b/pkgs/data/fonts/pretendard/default.nix @@ -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="; }; } diff --git a/pkgs/data/fonts/ruwudu/default.nix b/pkgs/data/fonts/ruwudu/default.nix index 2002f4b67203..61f306c71024 100644 --- a/pkgs/data/fonts/ruwudu/default.nix +++ b/pkgs/data/fonts/ruwudu/default.nix @@ -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/"; diff --git a/pkgs/data/fonts/sampradaya/default.nix b/pkgs/data/fonts/sampradaya/default.nix index 749abb71dbd4..8c0545d2c7fe 100644 --- a/pkgs/data/fonts/sampradaya/default.nix +++ b/pkgs/data/fonts/sampradaya/default.nix @@ -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 diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/data/fonts/shrikhand/default.nix index 684f3d0395e9..0db94ebd4ecb 100644 --- a/pkgs/data/fonts/shrikhand/default.nix +++ b/pkgs/data/fonts/shrikhand/default.nix @@ -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/"; diff --git a/pkgs/data/fonts/sil-abyssinica/default.nix b/pkgs/data/fonts/sil-abyssinica/default.nix index b61af144dcc0..f01c50b42608 100644 --- a/pkgs/data/fonts/sil-abyssinica/default.nix +++ b/pkgs/data/fonts/sil-abyssinica/default.nix @@ -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; { diff --git a/pkgs/data/fonts/sil-padauk/default.nix b/pkgs/data/fonts/sil-padauk/default.nix index b993ef5ae6b6..fe45da131738 100644 --- a/pkgs/data/fonts/sil-padauk/default.nix +++ b/pkgs/data/fonts/sil-padauk/default.nix @@ -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; { diff --git a/pkgs/data/fonts/sitelen-seli-kiwen/default.nix b/pkgs/data/fonts/sitelen-seli-kiwen/default.nix index 60f5c3e36e76..de0fec7b6f3e 100644 --- a/pkgs/data/fonts/sitelen-seli-kiwen/default.nix +++ b/pkgs/data/fonts/sitelen-seli-kiwen/default.nix @@ -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; { diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/data/fonts/stix-otf/default.nix index 894fd22c36f9..c5505b7a7948 100644 --- a/pkgs/data/fonts/stix-otf/default.nix +++ b/pkgs/data/fonts/stix-otf/default.nix @@ -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 ]; }; } diff --git a/pkgs/data/fonts/tai-languages/default.nix b/pkgs/data/fonts/tai-languages/default.nix index 71ca170afb1d..4e4c689b6ac6 100644 --- a/pkgs/data/fonts/tai-languages/default.nix +++ b/pkgs/data/fonts/tai-languages/default.nix @@ -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) } diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix index 871bfb0099b2..673d946a1e9a 100644 --- a/pkgs/data/fonts/ttf-envy-code-r/default.nix +++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix @@ -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"; diff --git a/pkgs/data/fonts/ttf-tw-moe/default.nix b/pkgs/data/fonts/ttf-tw-moe/default.nix index bf52d07c52e9..85b2ec1ce787 100644 --- a/pkgs/data/fonts/ttf-tw-moe/default.nix +++ b/pkgs/data/fonts/ttf-tw-moe/default.nix @@ -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"; diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 0458abf91d4f..331e34690a5e 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -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"; diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix index f34baa8a8314..1708a43b8056 100644 --- a/pkgs/data/fonts/victor-mono/default.nix +++ b/pkgs/data/fonts/victor-mono/default.nix @@ -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"; diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/data/icons/bibata-cursors/extra.nix index 15a746eabffb..ed9a70a6d321 100644 --- a/pkgs/data/icons/bibata-cursors/extra.nix +++ b/pkgs/data/icons/bibata-cursors/extra.nix @@ -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; }; } diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 6516db101eb5..4fb9768ef7ee 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -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 diff --git a/pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch b/pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch new file mode 100644 index 000000000000..76d6245628b7 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch @@ -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 (); +- 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', diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 4a33fc2e04a3..388feb83cfe7 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -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="; }) ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index c984824a8c52..31cf6d12eb89 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -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="; }) ]; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 52c92888f97f..11268ab814b4 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -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="; }) ]; diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 4a1e516ff1ce..3c089f02920a 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -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; }; diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix index af6c99a50e25..27223e6dea6e 100644 --- a/pkgs/development/compilers/go/1.19.nix +++ b/pkgs/development/compilers/go/1.19.nix @@ -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; }; diff --git a/pkgs/development/compilers/go/1.20.nix b/pkgs/development/compilers/go/1.20.nix index ec2669ed868f..be569ed688c9 100644 --- a/pkgs/development/compilers/go/1.20.nix +++ b/pkgs/development/compilers/go/1.20.nix @@ -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; }; diff --git a/pkgs/development/embedded/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix index 241914fa3e1e..6fd8592a12cf 100644 --- a/pkgs/development/embedded/platformio/default.nix +++ b/pkgs/development/embedded/platformio/default.nix @@ -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 = { diff --git a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch index 1f809822cb58..6db8585a55f3 100644 --- a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch @@ -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 diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 4f0259c65d85..d50ed8ff0520 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -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"; diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index 58cac6bbe9b1..0da843d3f1a3 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -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; }; } diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 07d753dd8333..331fe93e90de 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -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; }; } diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 443e4de04d9e..312e1dbf87cd 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -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; diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index edce9518c3c5..23059b91e7c0 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -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 ]; diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix index 3a39735aea60..778fddc8c3bb 100644 --- a/pkgs/development/mobile/maestro/default.nix +++ b/pkgs/development/mobile/maestro/default.nix @@ -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; diff --git a/pkgs/development/ocaml-modules/ca-certs/default.nix b/pkgs/development/ocaml-modules/ca-certs/default.nix index 6c6fb87cf3dc..963989cb2236 100644 --- a/pkgs/development/ocaml-modules/ca-certs/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs/default.nix @@ -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 diff --git a/pkgs/development/ocaml-modules/gd4o/default.nix b/pkgs/development/ocaml-modules/gd4o/default.nix index 19a1b42f06bd..cd2069648566 100644 --- a/pkgs/development/ocaml-modules/gd4o/default.nix +++ b/pkgs/development/ocaml-modules/gd4o/default.nix @@ -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 diff --git a/pkgs/development/ocaml-modules/lutils/default.nix b/pkgs/development/ocaml-modules/lutils/default.nix index c462eb9fe15d..38bd10077ce0 100644 --- a/pkgs/development/ocaml-modules/lutils/default.nix +++ b/pkgs/development/ocaml-modules/lutils/default.nix @@ -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"; }; diff --git a/pkgs/development/python-modules/anybadge/default.nix b/pkgs/development/python-modules/anybadge/default.nix index fd17aa0c11e7..0418de37a251 100644 --- a/pkgs/development/python-modules/anybadge/default.nix +++ b/pkgs/development/python-modules/anybadge/default.nix @@ -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 ]; }; diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index adef9006fb7e..9baacd74d9b4 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 0e4b9b60bc71..14fe85c6af51 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -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 ]; }; diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 0352a4e7d174..e2c64333df02 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix index accc4472b43c..50bcdc78e14f 100644 --- a/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 4b375abe89eb..0e18c64f44af 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index de650d07ac1a..e32bcf970264 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 32c3b74bec35..2c5d0a9a5474 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 11939a5195a3..6c022b84ab75 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index bf86294a4944..f2d8b6ec50c1 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 70e73d20aa1f..553b7a7dd143 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 17e1006b3d54..43b5b09810e1 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 30a44f5adfc5..28bf273bd561 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 093d728d33f1..b8019c03cc5f 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index 12ef2cc19a6b..3e8625ca6d41 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -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 ]; }; diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 6181aa106a41..a5b2a8fffc28 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 37f46414b91d..8ac600083f59 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -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/"; diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index c59f28d6939d..01be9fb86511 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -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 ]; }; diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index 3a58e64beaa8..24ed5999a78e 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -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 diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix index 9e6182a13f21..28b95d863f68 100644 --- a/pkgs/development/python-modules/openai-whisper/default.nix +++ b/pkgs/development/python-modules/openai-whisper/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 8aa091a25c71..a5529af2ab15 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/promise/default.nix b/pkgs/development/python-modules/promise/default.nix index a4797ff6d6cc..a9c4c416b7fc 100644 --- a/pkgs/development/python-modules/promise/default.nix +++ b/pkgs/development/python-modules/promise/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index c9dc3bf8e112..ad1c7c1cec50 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -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 diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix index d5d03eb3ab44..02139d368247 100644 --- a/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index af1e0c171357..333f88e3f563 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -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; diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 2d9efdf39e2d..b232a0bd8f41 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 0337029e248e..f1a079d5896e 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -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 diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index eaceb6eb31fe..e75e99ceb340 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -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 = '' diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index 9d074ca74c87..9819c3df60e8 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -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 ]; }; diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix index 12bf293a77d2..208e8b13a427 100644 --- a/pkgs/development/python-modules/sfrbox-api/default.nix +++ b/pkgs/development/python-modules/sfrbox-api/default.nix @@ -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 = '' diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index 1e20409b0ec9..a0d07fa51542 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -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 ]; }; diff --git a/pkgs/development/python-modules/types-pyyaml/default.nix b/pkgs/development/python-modules/types-pyyaml/default.nix index 7198e4e923bd..f0b4056e2b58 100644 --- a/pkgs/development/python-modules/types-pyyaml/default.nix +++ b/pkgs/development/python-modules/types-pyyaml/default.nix @@ -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 diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix index 78368377fac4..7ec9251eb0ee 100644 --- a/pkgs/development/python-modules/whois/default.nix +++ b/pkgs/development/python-modules/whois/default.nix @@ -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 = [ diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index e02ce86d8efb..14474f995509 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -31,47 +31,33 @@ let # FIXME: Compare revision with - # https://github.com/radareorg/radare2/blob/master/libr/arch/p/arm/v35arm64/Makefile#L26-L27 + # https://github.com/radareorg/radare2/blob/master/libr/arch/p/arm/v35/Makefile#L26-L27 arm64 = fetchFromGitHub { owner = "radareorg"; repo = "vector35-arch-arm64"; - rev = "c9e7242972837ac11fc94db05fabcb801a8269c9"; - hash = "sha256-HFQj23GlLAyyzMGnPq40XaPv5qPDHdDlQOo0Hprc9Cs="; + rev = "55d73c6bbb94448a5c615933179e73ac618cf876"; + hash = "sha256-pZxxp5xDg8mgkGEx7LaBSoKxNPyggFYA4um9YaO20LU="; }; armv7 = fetchFromGitHub { owner = "radareorg"; repo = "vector35-arch-armv7"; - rev = "dde39f69ffea19fc37e681874b12cb4707bc4f30"; - - hash = "sha256-bnWQc0dScM9rhIdzf+iVXvMqYWq/bguEAUQPaZRgdlU="; + rev = "f270a6cc99644cb8e76055b6fa632b25abd26024"; + hash = "sha256-YhfgJ7M8ys53jh1clOzj0I2yfJshXQm5zP0L9kMYsmk="; }; in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.8.0"; + version = "5.8.2"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - hash = "sha256-9bDwtMNru7tG0L735y+Vrcg7Htk/TV9SVZn7WP4Ap4c="; + hash = "sha256-jwr3QPgJ6vKSk8yGxndQ69AickP8PorNDuGyJzHMpV4="; }; - patches = [ - (fetchpatch { - name = "CVE-2022-4843.patch"; - url = "https://github.com/radareorg/radare2/commit/842f809d4ec6a12af2906f948657281c9ebc8a24.patch"; - sha256 = "sha256-asEXW9Ox48w9WQhOA9tleXIvynIjsWb6ItKmFTojgbQ="; - }) - (fetchpatch { - name = "CVE-2023-0302.patch"; - url = "https://github.com/radareorg/radare2/commit/961f0e723903011d4f54c2396e44efa91fcc74ce.patch"; - hash = "sha256-QinRQDIY4p3P+M3Hh9w3Dv3N/2XTaf3N0nUluHPpAvg="; - }) - ]; - preBuild = '' - pushd ../libr/arch/p/arm/v35arm64 + pushd ../libr/arch/p/arm/v35 cp -r ${arm64} arch-arm64 chmod -R +w arch-arm64 diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix index 9b6d00c0efbc..f8e1a36a993e 100644 --- a/pkgs/development/tools/ashpd-demo/default.nix +++ b/pkgs/development/tools/ashpd-demo/default.nix @@ -64,6 +64,10 @@ stdenv.mkDerivation rec { libshumate ]; + # FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream + # https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55 + NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ]; + passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/development/tools/detekt/default.nix b/pkgs/development/tools/detekt/default.nix new file mode 100644 index 000000000000..0c67c5dd66a9 --- /dev/null +++ b/pkgs/development/tools/detekt/default.nix @@ -0,0 +1,38 @@ +{ detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }: +stdenv.mkDerivation rec { + pname = "detekt"; + version = "1.22.0"; + + jarfilename = "${pname}-${version}-executable.jar"; + + src = fetchurl { + url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar"; + sha256 = "sha256-NCOMBcAtk7cOlP3H8Bz/hfR/305j/DfaoFrwc504b/4="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -D "$src" "$out/share/java/${jarfilename}" + + makeWrapper ${jre_headless}/bin/java $out/bin/detekt \ + --add-flags "-jar $out/share/java/${jarfilename}" + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { package = detekt; }; + + meta = with lib; { + description = "Static code analysis for Kotlin"; + homepage = "https://detekt.dev/"; + license = licenses.asl20; + platforms = jre_headless.meta.platforms; + maintainers = with maintainers; [ mdr ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + }; +} diff --git a/pkgs/development/tools/goda/default.nix b/pkgs/development/tools/goda/default.nix index e2bddfb5dd89..0564cfa31577 100644 --- a/pkgs/development/tools/goda/default.nix +++ b/pkgs/development/tools/goda/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goda"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "loov"; repo = "goda"; rev = "v${version}"; - sha256 = "sha256-5MkErXgRJtaXbThJYjGWyvt+RAbtULTe0VoXKU3HQug="; + sha256 = "sha256-yKhgk/DRcifh+exxTZFti1Aac/sgpvUsNKdioLAzmX0="; }; vendorSha256 = "sha256-BYYuB4ZlCWD8NILkf4qrgM4q72ZTy7Ze3ICUXdoI5Ms="; diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix index c4c0b7cbb06f..9fa71187aa31 100644 --- a/pkgs/development/tools/gotags/default.nix +++ b/pkgs/development/tools/gotags/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "gotags"; version = "1.4.1"; @@ -8,10 +8,20 @@ buildGoPackage rec { owner = "jstemmer"; repo = pname; rev = "4c0c4330071a994fbdfdff68f412d768fbcca313"; - sha256 = "sha256-cHTgt+zW6S6NDWBE6NxSXNPdn84CLD8WmqBe+uXN8sA="; + hash = "sha256-cHTgt+zW6S6NDWBE6NxSXNPdn84CLD8WmqBe+uXN8sA="; }; - goPackagePath = "github.com/jstemmer/gotags"; + vendorHash = null; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/jstemmer/gotags/commit/9146999bce9a88e15b5f123d1aa1613926dd9a9c.patch"; + hash = "sha256-6v/Ws15y50S6iCI1c0kEw5WHSg+1WqVT4mwdQKoi5G8="; + }) + ]; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "ctags-compatible tag generator for Go"; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 8bcc8a73fb92..fd97cc2634fd 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -10,22 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.11.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; - rev = version; - hash = "sha256-TYw2YrilrEUCvyT9VvzrQnHcSnhPrNiAMRjLEk/QjgU="; + rev = "refs/tags/${version}"; + hash = "sha256-5JI3QaUuWvwI3pClZXMPU8v1lcPZ5YioMPGKl/lIjQ0="; }; - cargoHash = "sha256-pgktCRxYlxo/kMdBm3/dzdU3rOXSNFY9IIE8j8Dgro0="; + cargoHash = "sha256-91C/5m2avsW7GKQDg/Ez9fzzFhe8ih1De1RbV/MBJbM="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - nativeCheckInputs = [ coreutils bash ]; - preCheck = '' # USER must not be empty export USER=just-user @@ -64,6 +62,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/casey/just/blob/${version}/CHANGELOG.md"; description = "A handy way to save and run project-specific commands"; license = licenses.cc0; - maintainers = with maintainers; [ xrelkd jk ]; + maintainers = with maintainers; [ xrelkd jk adamcstephens ]; }; } diff --git a/pkgs/development/tools/manifest-tool/default.nix b/pkgs/development/tools/manifest-tool/default.nix new file mode 100644 index 000000000000..6282619535b9 --- /dev/null +++ b/pkgs/development/tools/manifest-tool/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +, stdenv +, testers +, manifest-tool +}: + +buildGoModule rec { + pname = "manifest-tool"; + version = "2.0.6"; + gitCommit = "2ed9312726765567a84f2acc44a0c8a6e50f4b7a"; + modRoot = "v2"; + + src = fetchFromGitHub { + owner = "estesp"; + repo = "manifest-tool"; + rev = "v${version}"; + sha256 = "sha256-oopk++IdNF6msxOszT0fKxQABgWKbaQZ2aNH9chqWU0="; + leaveDotGit = true; + postFetch = '' + git -C $out rev-parse HEAD > $out/.git-revision + rm -rf $out/.git + ''; + }; + + vendorHash = null; + + nativeBuildInputs = [ git ]; + + preConfigure = '' + ldflags="-X main.gitCommit=$(cat .git-revision)" + ''; + + CGO_ENABLED = if stdenv.hostPlatform.isStatic then "0" else "1"; + GO_EXTLINK_ENABLED = if stdenv.hostPlatform.isStatic then "0" else "1"; + ldflags = lib.optionals stdenv.hostPlatform.isStatic [ "-w" "-extldflags" "-static" ]; + tags = lib.optionals stdenv.hostPlatform.isStatic [ "netgo" ]; + + passthru.tests.version = testers.testVersion { + package = manifest-tool; + }; + + meta = with lib; { + description = "Command line tool to create and query container image manifest list/indexes"; + homepage = "https://github.com/estesp/manifest-tool"; + license = licenses.asl20; + maintainers = with maintainers; [ tricktron ]; + }; +} diff --git a/pkgs/development/tools/protoscope/default.nix b/pkgs/development/tools/protoscope/default.nix index 12c120196f23..70eeab5f1575 100644 --- a/pkgs/development/tools/protoscope/default.nix +++ b/pkgs/development/tools/protoscope/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoscope"; - version = "unstable-2022-10-04"; + version = "unstable-2022-11-09"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protoscope"; - rev = "8b1d63939ee1a5d922b38f3976e1e58cae525163"; - sha256 = "sha256-/vt02rvKVsryJZ+Bw4QLaGzDErGI04/4NUbSBkbbN3Y="; + rev = "8e7a6aafa2c9958527b1e0747e66e1bfff045819"; + hash = "sha256-+VIy+CD6bKJzwtpHXRr9MqmsPE2MJ1dRdtvSMUkCh5I="; }; - vendorSha256 = "sha256-mK8eGo6oembs4nofvROn4g0+oO5E5/zQrmPKMe3xXik="; + vendorHash = "sha256-mK8eGo6oembs4nofvROn4g0+oO5E5/zQrmPKMe3xXik="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index a63af2476557..61bc71374870 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.5.26"; + version = "0.5.27"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ZVR3bycEWpOV4T/85OsERNjKooz2rwBF5kMSEfHnmEI="; + sha256 = "sha256-oiCZiwJr1BqMCWCNUOTQT3XPX0QZRr0wLewf8OU6lHA="; }; - cargoSha256 = "sha256-4TChr6dKxUerpuaX63WShrWyXTLH4m85P6E30a5rmH8="; + cargoSha256 = "sha256-g5O51V4BPNqzsQo1prLIpamqwcOy+SJat2Rb5UDHRLc="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 30fda10323eb..71a340564343 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.15.2"; + version = "0.16.2"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+YRyShALdDQDfh5XDY36R29SzbBjlT8mCIucwJ++KrQ="; + sha256 = "sha256-2t3LWb2oeCYDAePXX1YuIN0o4LLEL58Hxt/1sNeuD3M="; }; - cargoSha256 = "sha256-wwsFqoQXasCKfnCBF4qGFIoD7Kj53K9IKQ1auuqTPAM="; + cargoSha256 = "sha256-K+eLQ7zGEGkh4vMABWucY/Ho2id/afwl4FSo5+Ca1Ec="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/panamax/default.nix b/pkgs/development/tools/rust/panamax/default.nix index 0d040afd421d..6dd1d5e32bd8 100644 --- a/pkgs/development/tools/rust/panamax/default.nix +++ b/pkgs/development/tools/rust/panamax/default.nix @@ -1,19 +1,34 @@ -{ lib, rustPlatform, fetchCrate, pkg-config, openssl, stdenv, Security }: +{ lib +, rustPlatform +, fetchCrate +, pkg-config +, libgit2 +, openssl +, zlib +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "panamax"; - version = "1.0.3"; + version = "1.0.6"; src = fetchCrate { inherit pname version; - sha256 = "sha256-w4waFdzd/Ps0whOp39QLBE/YF2eyc4t2Ili7FskUt1M="; + sha256 = "sha256-/JW2QB5PtwKo0TLU/QmkgsE6/ne+51EVmWyGn7Lljdw="; }; - cargoSha256 = "sha256-52snmkTFHI26xJo9qJkmqh1M5lLzhDxw8WT6uFd57aw="; + cargoSha256 = "sha256-aKdDismdPcExqznS6S2LvAij6gv9/Hw2FBvkhr9rJGo="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ + libgit2 + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; meta = with lib; { description = "Mirror rustup and crates.io repositories for offline Rust and cargo usage"; diff --git a/pkgs/development/tools/txtpbfmt/default.nix b/pkgs/development/tools/txtpbfmt/default.nix index 3f1c9eab0475..a4e26cfb4cb6 100644 --- a/pkgs/development/tools/txtpbfmt/default.nix +++ b/pkgs/development/tools/txtpbfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "txtpbfmt"; - version = "unstable-2022-06-08"; + version = "unstable-2023-01-18"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "txtpbfmt"; - rev = "fc78c767cd6a4e6e3953f5d72f1e0e4c5811990b"; - sha256 = "sha256-5Pj2REFrzWCzrqdplNlyfX+sJqPjXEld6MFNy0S3MFM="; + rev = "fcc1fa29197ce17bc56812f84f5ff311f767fcd1"; + hash = "sha256-U+Kk2tQw+rJX7Xa8b5Hd7x0xY/6PN6TTYsLJkpB1Osg="; }; - vendorSha256 = "sha256-shjcQ3DJQYeAW0bX3OuF/esgIvrQ4yuLEa677iFV82g="; + vendorHash = "sha256-shjcQ3DJQYeAW0bX3OuF/esgIvrQ4yuLEa677iFV82g="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/web/nodejs/v19.nix b/pkgs/development/web/nodejs/v19.nix index 454d647dad2c..b9cd476a1941 100644 --- a/pkgs/development/web/nodejs/v19.nix +++ b/pkgs/development/web/nodejs/v19.nix @@ -9,8 +9,8 @@ let in buildNodejs { inherit enableNpm; - version = "19.4.0"; - sha256 = "0qdj67dgxbjpllm2z9vm46c50s3dqk8a34hbp81vsa7mf3b42182"; + version = "19.5.0"; + sha256 = "sha256-KBMXvce6iVITi/jw9fB2SV95+G6FGmWb4fmD3sM8pXc="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/pkgs/games/classicube/default.nix b/pkgs/games/classicube/default.nix index 06c914e56f1b..ec2490196abb 100644 --- a/pkgs/games/classicube/default.nix +++ b/pkgs/games/classicube/default.nix @@ -5,7 +5,8 @@ , makeWrapper , makeDesktopItem , copyDesktopItems -, SDL2 +, libX11 +, libXi , libGL , curl , openal @@ -14,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ClassiCube"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "UnknownShadow200"; repo = "ClassiCube"; rev = version; - sha256 = "sha256-m7pg9OL2RuCVKgFD3hMtIeY0XdJ1YviXBFVJH8/T5gI="; + sha256 = "sha256-anBi9hPwX1AAIc8dXsKyX4u7UbkKqC1P+7f7wdKWAig="; }; nativeBuildInputs = [ dos2unix makeWrapper copyDesktopItems ]; @@ -46,12 +47,8 @@ stdenv.mkDerivation rec { patches = [ # Fix hardcoded font paths ./font-location.patch - # ClassiCube doesn't compile with its X11 backend - # because of issues with libXi. - ./use-sdl.patch # For some reason, the Makefile doesn't link # with libcurl and openal when ClassiCube requires them. - # Also links with SDL2 instead of libX11 and libXi. ./fix-linking.patch ]; @@ -71,7 +68,7 @@ stdenv.mkDerivation rec { --replace 'JOBS=1' "JOBS=$NIX_BUILD_CORES" ''; - buildInputs = [ SDL2 libGL curl openal liberation_ttf ]; + buildInputs = [ libX11 libXi libGL curl openal liberation_ttf ]; preBuild = "cd src"; diff --git a/pkgs/games/classicube/fix-linking.patch b/pkgs/games/classicube/fix-linking.patch index 987c882367ee..197a3ab694e0 100644 --- a/pkgs/games/classicube/fix-linking.patch +++ b/pkgs/games/classicube/fix-linking.patch @@ -7,7 +7,7 @@ index 83188ce..3439cdb 100644 ifeq ($(PLAT),linux) -LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl -+LIBS=-lSDL2 -lpthread -lGL -lm -ldl -lcurl -lopenal ++LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl -lcurl -lopenal endif ifeq ($(PLAT),sunos) diff --git a/pkgs/games/classicube/use-sdl.patch b/pkgs/games/classicube/use-sdl.patch deleted file mode 100644 index 3456ef8b6469..000000000000 --- a/pkgs/games/classicube/use-sdl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Core.h b/src/Core.h -index e94a39e..96527d0 100644 ---- a/src/Core.h -+++ b/src/Core.h -@@ -170,7 +170,7 @@ Thus it is **NOT SAFE** to allocate a string on the stack. */ - #define CC_BUILD_LINUX - #define CC_BUILD_POSIX - #define CC_BUILD_GL --#define CC_BUILD_X11 -+#define CC_BUILD_SDL - #define CC_BUILD_CURL - #define CC_BUILD_OPENAL - #if defined CC_BUILD_RPI diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index 6c607b39d141..30fc870b25db 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation { pname = "domination"; - version = "1.2.5"; + version = "1.2.7"; # The .zip releases do not contain the build.xml file src = fetchsvn { @@ -34,8 +34,8 @@ in stdenv.mkDerivation { # There are no tags in the repository. # Look for commits like "new version x.y.z info on website" # or "website update for x.y.z". - rev = "2212"; - sha256 = "sha256-XuPMxGDap8x7I+U7+1C+DlkQkoV/u2FCwYyTZFWmYHM="; + rev = "2261"; + sha256 = "sha256-xvlPC7M6DaF3g2O3vQDmcdp7914qOaiikY02RTgAVkM="; }; nativeBuildInputs = [ diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 89f980f8d5bc..a4433821d20d 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -56,7 +56,11 @@ let settings_ = lib.recursiveUpdate { init = { - PRINT_MODE = if enableTextMode then "TEXT" else if enableTWBT then "TWBT" else null; + PRINT_MODE = + if enableTextMode then "TEXT" + else if enableTWBT then "TWBT" + else if stdenv.hostPlatform.isDarwin then "STANDARD" # https://www.bay12games.com/dwarves/mantisbt/view.php?id=11680 + else null; INTRO = enableIntro; TRUETYPE = enableTruetype; FPS = enableFPS; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 849f1861403c..a2cace8bc1e4 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,61 +2,61 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.303-hardened1.patch", - "sha256": "1ihq6kf19fribpyiisv5wdax0467pylmlmsqn88vf50ps3akc4ix", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.303-hardened1/linux-hardened-4.14.303-hardened1.patch" + "name": "linux-hardened-4.14.304-hardened1.patch", + "sha256": "099fqlfl9p57pfh5jr7cv30476q2cbhrqs6w63cy3mkwj7l4jwln", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.304-hardened1/linux-hardened-4.14.304-hardened1.patch" }, - "sha256": "17pxl4fgzpz48y7nx1z8891mll64givxgch3z5an6dkr13c2xy2b", - "version": "4.14.303" + "sha256": "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4", + "version": "4.14.304" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.270-hardened1.patch", - "sha256": "1xii5xchbxnswy7qhhvvivx6c6a5n7iw920yrvm2chrnp5s9mikh", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.270-hardened1/linux-hardened-4.19.270-hardened1.patch" + "name": "linux-hardened-4.19.271-hardened1.patch", + "sha256": "0xvd9n2fqmr863a4vljki2saa85dccj7mflcfwaslj9g2ygbrf93", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.271-hardened1/linux-hardened-4.19.271-hardened1.patch" }, - "sha256": "14nj1skd73rn59v2ah80vgpc8fh37jvpc75wafpa4glfphx88i11", - "version": "4.19.270" + "sha256": "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3", + "version": "4.19.271" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.164-hardened1.patch", - "sha256": "1z2qd460wnna658zi8mbz2rqjwbvkxrk03ncicqszfjbinigxp6x", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.164-hardened1/linux-hardened-5.10.164-hardened1.patch" + "name": "linux-hardened-5.10.165-hardened1.patch", + "sha256": "0gnvnywagqqdsdrbd9fbl671pzfv49mf2xqan9bk3q41mgcyyfgg", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.165-hardened1/linux-hardened-5.10.165-hardened1.patch" }, - "sha256": "0y42xgpmg2mhx81d3bswhk0n3f8vdvmf4k0g8ii6cb01gflalzhc", - "version": "5.10.164" + "sha256": "03dg8yx0gdzm8zbwd1f9jn4c5jhr8qilhjzxgwm0mv8riz2fy7cp", + "version": "5.10.165" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.89-hardened1.patch", - "sha256": "0gwgdgmc9c7cpgp5vcyxwqxc5y2br3ghi6x3r11frs1kcwvqjix9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.89-hardened1/linux-hardened-5.15.89-hardened1.patch" + "name": "linux-hardened-5.15.90-hardened1.patch", + "sha256": "1zj80v6xpgz00z1lpw5j9qdm0gp44pk7vkflrngbk8m3cwmpw5ha", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.90-hardened1/linux-hardened-5.15.90-hardened1.patch" }, - "sha256": "1s1gflnzvfza5m94c9f3l42kskjadayij4q5gk9vcjq19s3incg7", - "version": "5.15.89" + "sha256": "0hiv74mxkp3v04lphnyw16akgavaz527bzhnfnpm6rv848047zg6", + "version": "5.15.90" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.229-hardened1.patch", - "sha256": "0cww74kkh2n7apzqbdz72d04x39wkasxj5mi7giivpp0s2f0c24a", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.229-hardened1/linux-hardened-5.4.229-hardened1.patch" + "name": "linux-hardened-5.4.230-hardened1.patch", + "sha256": "0xk80i6wddd909wzhcp7b64sbsjjqpwyjr8gknpc83zcdzv3y892", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.230-hardened1/linux-hardened-5.4.230-hardened1.patch" }, - "sha256": "1bx77x4x10v38ygfiz0dcw938ybczq7f3srg11ifzvwm243r5if5", - "version": "5.4.229" + "sha256": "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7", + "version": "5.4.230" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.7-hardened1.patch", - "sha256": "1hp3mbl8vfd2cwpxbhmqqy77nzyk265k1rcf1rz048ivnsppw4cx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.7-hardened1/linux-hardened-6.1.7-hardened1.patch" + "name": "linux-hardened-6.1.8-hardened1.patch", + "sha256": "1ry0cb1dsq84n6cxn8ndx47qz1g69kqlfkb16rrlgk49w81i8y8z", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.8-hardened1/linux-hardened-6.1.8-hardened1.patch" }, - "sha256": "03v0pvg831qzbpc09ip1h0p4zz6js9das7vzh8xhsf77sax4ic2a", - "version": "6.1.7" + "sha256": "0vc1ggjy4wvna7g6xgbjzhk93whssj9ixcal0hkhldxsp0xba2xn", + "version": "6.1.8" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index c76fc306bb48..3e5cc009576e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.303"; + version = "4.14.304"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "17pxl4fgzpz48y7nx1z8891mll64givxgch3z5an6dkr13c2xy2b"; + sha256 = "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 999cf84a5d2d..506d57d79713 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.270"; + version = "4.19.271"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14nj1skd73rn59v2ah80vgpc8fh37jvpc75wafpa4glfphx88i11"; + sha256 = "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 86698c5f3a3b..7f984e43d7b7 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.164"; + version = "5.10.165"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0y42xgpmg2mhx81d3bswhk0n3f8vdvmf4k0g8ii6cb01gflalzhc"; + sha256 = "03dg8yx0gdzm8zbwd1f9jn4c5jhr8qilhjzxgwm0mv8riz2fy7cp"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 35a9097c14c3..75f035ec2119 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.89"; + version = "5.15.90"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1s1gflnzvfza5m94c9f3l42kskjadayij4q5gk9vcjq19s3incg7"; + sha256 = "0hiv74mxkp3v04lphnyw16akgavaz527bzhnfnpm6rv848047zg6"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index a9b04d5bc07e..aef87aaa4211 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.229"; + version = "5.4.230"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1bx77x4x10v38ygfiz0dcw938ybczq7f3srg11ifzvwm243r5if5"; + sha256 = "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index dd42454b3ac6..f1fc40ee7644 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.7"; + version = "6.1.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "03v0pvg831qzbpc09ip1h0p4zz6js9das7vzh8xhsf77sax4ic2a"; + sha256 = "0vc1ggjy4wvna7g6xgbjzhk93whssj9ixcal0hkhldxsp0xba2xn"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/rasdaemon/default.nix b/pkgs/os-specific/linux/rasdaemon/default.nix index cccd91fff8e1..35201d49b7f0 100644 --- a/pkgs/os-specific/linux/rasdaemon/default.nix +++ b/pkgs/os-specific/linux/rasdaemon/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rasdaemon"; - version = "0.6.8"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mchehab"; repo = "rasdaemon"; rev = "v${version}"; - sha256 = "sha256-gcwoc9lIJyqUiCSAHf1U8geLG58CxzjMFYFl8moaA2Q="; + sha256 = "sha256-oLwR+bNgKceVgLTOLYiKHNUkRmLouaQshdp/8UJnfqg="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix index efa21cfb26b5..8955bcfa5126 100644 --- a/pkgs/os-specific/linux/waydroid/default.nix +++ b/pkgs/os-specific/linux/waydroid/default.nix @@ -4,12 +4,15 @@ , dnsmasq , gawk , getent +, gobject-introspection +, gtk3 , kmod , lxc , iproute2 , nftables , util-linux , which +, wrapGAppsHook , xclip }: @@ -25,6 +28,15 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-0GBob9BUwiE5cFGdK8AdwsTjTOdc+AIWqUGN/gFfOqI="; }; + buildInputs = [ + gtk3 + ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + propagatedBuildInputs = with python3Packages; [ gbinder-python pyclip @@ -35,9 +47,14 @@ python3Packages.buildPythonApplication rec { dontUsePipInstall = true; dontUseSetuptoolsCheck = true; dontWrapPythonPrograms = true; + dontWrapGApps = true; installPhase = '' make install PREFIX=$out USE_SYSTEMD=0 USE_NFTABLES=1 + ''; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \ --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 nftables ]} diff --git a/pkgs/servers/dns/trust-dns/default.nix b/pkgs/servers/dns/trust-dns/default.nix new file mode 100644 index 000000000000..de21bdf252c1 --- /dev/null +++ b/pkgs/servers/dns/trust-dns/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, openssl +, pkg-config +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "trust-dns"; + version = "0.22.0"; + + src = fetchFromGitHub { + owner = "bluejekyll"; + repo = "trust-dns"; + rev = "v${version}"; + sha256 = "sha256-b9tK1JbTwB3ZuRPh0wb3cOFj9dMW7URXIaFzUq0Yipw="; + }; + cargoHash = "sha256-mpobdeTRWJzIEmhwtcM6UE66qRD5ot/0yLeQM6Tec+0="; + + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; + + # tests expect internet connectivity to query real nameservers like 8.8.8.8 + doCheck = false; + + meta = with lib; { + description = "A Rust based DNS client, server, and resolver"; + homepage = "https://trust-dns.org/"; + maintainers = with maintainers; [ colinsane ]; + platforms = platforms.linux; + license = with licenses; [ asl20 mit ]; + }; +} diff --git a/pkgs/servers/eris-go/default.nix b/pkgs/servers/eris-go/default.nix index 554aecfacbf8..3dbc3994e6d6 100644 --- a/pkgs/servers/eris-go/default.nix +++ b/pkgs/servers/eris-go/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "eris-go"; - version = "20230114"; + version = "20230123"; src = fetchFromGitea { domain = "codeberg.org"; owner = "eris"; repo = pname; rev = version; - hash = "sha256-cJvSIeS9fKUJP5p7ZTH7Wi+UcBXeCS32Twhv6jBT+9Q="; + hash = "sha256-jdeh5lhbu2hxVNdnU0GiMsdXRi8004Xgu2/tgFhqPao="; }; - vendorHash = "sha256-DDV7LUnGnf24qQ2I9I4MDUx87s1+yDhisVz/Jw4XU6k="; + vendorHash = "sha256-mLyPaX5rDw0rR4PXtzpLMOrsYwTH3Y+COcrvwH7/qdo="; postInstall = "ln -s $out/bin/eris-get $out/bin/eris-put"; # eris-get is a multicall binary diff --git a/pkgs/servers/web-apps/peering-manager/default.nix b/pkgs/servers/web-apps/peering-manager/default.nix index dd60980e3290..8b6e77ec0f1f 100644 --- a/pkgs/servers/web-apps/peering-manager/default.nix +++ b/pkgs/servers/web-apps/peering-manager/default.nix @@ -32,19 +32,15 @@ let in py.pkgs.buildPythonApplication rec { pname = "peering-manager"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-vrRMdqEpsps4ZKgunMhznJr/TQ9+WVMNYFu76ZU7iMI="; + sha256 = "sha256-mXva4c5Rtjq/jFJl3yGGlVrggzGJ3awN0+xoDnDWBSA="; }; - patches = [ - ./redis-unix-sock.patch - ]; - format = "other"; propagatedBuildInputs = with py.pkgs; [ diff --git a/pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch b/pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch deleted file mode 100644 index 5db0d0dd0125..000000000000 --- a/pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit 1e64a7f6ca456249305f6a3c90f9acf84af194db -Author: Yureka -Date: Tue Nov 29 14:03:08 2022 +0100 - - support unix sockets for redis connections - -diff --git a/peering_manager/settings.py b/peering_manager/settings.py -index 739d6ff..b5edf4d 100644 ---- a/peering_manager/settings.py -+++ b/peering_manager/settings.py -@@ -270,6 +270,7 @@ TASKS_REDIS_PASSWORD = TASKS_REDIS.get("PASSWORD", "") - TASKS_REDIS_DATABASE = TASKS_REDIS.get("DATABASE", 0) - TASKS_REDIS_DEFAULT_TIMEOUT = TASKS_REDIS.get("DEFAULT_TIMEOUT", 300) - TASKS_REDIS_SSL = TASKS_REDIS.get("SSL", False) -+TASKS_REDIS_UNIX_SOCKET_PATH = TASKS_REDIS.get("UNIX_SOCKET_PATH", "") - if "DEFAULT_TIMEOUT" in TASKS_REDIS: - warnings.warn( - "DEFAULT_TIMEOUT is no longer supported under REDIS configuration. Set RQ_DEFAULT_TIMEOUT instead." -@@ -294,6 +295,7 @@ CACHING_REDIS_PASSWORD = CACHING_REDIS.get("PASSWORD", "") - CACHING_REDIS_DATABASE = CACHING_REDIS.get("DATABASE", 0) - CACHING_REDIS_DEFAULT_TIMEOUT = CACHING_REDIS.get("DEFAULT_TIMEOUT", 300) - CACHING_REDIS_SSL = CACHING_REDIS.get("SSL", False) -+CACHING_REDIS_UNIX_SOCKET_PATH = CACHING_REDIS.get("UNIX_SOCKET_PATH", "") - - if CACHING_REDIS_USING_SENTINEL: - CACHEOPS_SENTINEL = { -@@ -301,6 +303,8 @@ if CACHING_REDIS_USING_SENTINEL: - "service_name": CACHING_REDIS_SENTINEL_SERVICE, - "db": CACHING_REDIS_DATABASE, - } -+elif CACHING_REDIS_UNIX_SOCKET_PATH != "": -+ CACHEOPS_REDIS = f"unix://{CACHING_REDIS_UNIX_SOCKET_PATH}?db={CACHING_REDIS_DATABASE}" - else: - REDIS_CACHE_CON_STRING = "rediss://" if CACHING_REDIS_SSL else "redis://" - if CACHING_REDIS_PASSWORD: -@@ -334,6 +338,11 @@ if TASKS_REDIS_USING_SENTINEL: - "SOCKET_TIMEOUT": None, - "CONNECTION_KWARGS": {"socket_connect_timeout": TASKS_REDIS_DEFAULT_TIMEOUT}, - } -+elif TASKS_REDIS_UNIX_SOCKET_PATH != "": -+ RQ_PARAMS = { -+ "UNIX_SOCKET_PATH": TASKS_REDIS_UNIX_SOCKET_PATH, -+ "DB": TASKS_REDIS_DATABASE, -+ } - else: - RQ_PARAMS = { - "HOST": TASKS_REDIS_HOST, diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 61d2e1ee1d8a..b1add5d14252 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -25,14 +25,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.9.15"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.9.17"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-yOqxz6ZsBV7iNKjG3NlV8SUHaezlchiUx8RRShRU6xo="; + hash = "sha256-5d/XEkM01SJj9M3e+5qbJrwWX+CU8fb097D45+Hp/Qc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index 1ed5939746d4..32bae24a6c45 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "advancecomp"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "amadvance"; repo = "advancecomp"; rev = "v${version}"; - hash = "sha256-nl1t1XbyCDYH7jKdIRSIXfXuRCj5N+5noC86VpbpWu4="; + hash = "sha256-dlVTMd8sm84M8JZsCfVR/s4jXMQWmrVj7xwUVDsehQY="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index c0cd784aed47..02fa3de810b2 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -5,33 +5,28 @@ buildGoModule rec { pname = "gcsfuse"; - version = "0.41.10"; + version = "0.41.12"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; - rev = "refs/tags/v${version}"; - hash = "sha256-rtBqXC1CTkbKDP6pzkRQ7GnM5f4xt6eUMW3n9wZu0hc="; + rev = "v${version}"; + hash = "sha256-s28vtcNodc5IL8SnZLTgSQBTPUf0FiIAv3TxZXMDuYE="; }; - vendorSha256 = null; + vendorHash = null; - subPackages = [ - "." - "tools/mount_gcsfuse" - ]; + subPackages = [ "." "tools/mount_gcsfuse" ]; - ldflags = [ - "-s" - "-w" - "-X main.gcsfuseVersion=${version}" - ]; + ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ]; preCheck = - let skippedTests = [ - "Test_Main" - "TestFlags" - ]; in + let + skippedTests = [ + "Test_Main" + "TestFlags" + ]; + in '' # Disable flaky tests buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") @@ -42,7 +37,7 @@ buildGoModule rec { ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse ''; - meta = with lib;{ + meta = with lib; { description = "A user-space file system for interacting with Google Cloud Storage"; homepage = "https://cloud.google.com/storage/docs/gcs-fuse"; changelog = "https://github.com/GoogleCloudPlatform/gcsfuse/releases/tag/v${version}"; diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index a937ea51784a..0e6d0b0adb4e 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -2,7 +2,6 @@ , mkDerivation , variant ? "standalone" , fetchFromGitHub -, fetchpatch , cmake , pkg-config , ninja @@ -59,13 +58,13 @@ assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps mkDerivation rec { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.1.6"; + version = "3.2.0"; src = fetchFromGitHub { owner = "c-koi"; repo = "gmic-qt"; rev = "v.${version}"; - sha256 = "sha256-/5wDHvJSMgEheg8YV4W40wUiHz25emIoFnGdfO8i92g="; + sha256 = "sha256-I5XC7zbDyBPFj4zul9rshoyeVV0hRQQ3aZQzEvYrgdc="; }; nativeBuildInputs = [ @@ -95,15 +94,6 @@ mkDerivation rec { "-DENABLE_SYSTEM_GMIC:BOOL=ON" ]; - patches = [ - # NOTE: this should be removed when a new version is released. - (fetchpatch { - name = "fix_filter_translation_scripts.patch"; - url = "https://github.com/c-koi/gmic-qt/commit/ccb9f29eda239d0c80663593cd90a6548c935b39.patch"; - sha256 = "sha256-OzuJ6yGuDJweQ+1uin/pmJqZV79bN9E1Zuo+0iciwzg="; - }) - ]; - postPatch = '' patchShebangs \ translations/filters/csv2ts.sh \ diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 8f66d054cde6..6e811e1aa3df 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -25,15 +25,15 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "3.1.6"; + version = "3.2.0"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchFromGitHub { owner = "dtschump"; repo = "gmic"; - rev = "326ea9b7dc320b3624fe660d7b7d81669ca12e6d"; - sha256 = "RRCzYMN/IXViiUNnacJV3DNpku3hIHQkHbIrtixExT0="; + rev = "v.${version}"; + hash = "sha256-lrIlzxXWqv046G5uRkBQnjvysaIcv+iDKxjuUEJWqcs="; }; # TODO: build this from source @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { gmic_stdlib = fetchurl { name = "gmic_stdlib.h"; url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h"; - sha256 = "adObp8s+2TWaS+X/bQSphWRK6o85h+DGwlIDol6XN/4="; + hash = "sha256-kWHzA1Dk7F4IROq/gk+RJllry3BABMbssJxhkQ6Cp2M="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index f8ab129f789b..18d7bf02ed83 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -9,21 +9,13 @@ in stdenv.mkDerivation rec { pname = "android-tools"; - version = "33.0.3p1"; + version = "33.0.3p2"; src = fetchurl { url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"; - hash = "sha256-viBHzyVgUWdK9a60u/7SdpiVEvgNEZHihkyRkGH5Ydg="; + hash = "sha256-a/a1LXOJ55/JK2PMIGRR7kL8T32naddpIhk+mNdfVgQ="; }; - patches = [ - (fetchpatch { - name = "add-macos-platform.patch"; - url = "https://github.com/nmeum/android-tools/commit/a1ab35b31525966e0f0770047cd82accb36d025b.patch"; - hash = "sha256-6O3ekDf0qPdzcfINFF8Ae4XOYgnQWTBhvu9SCFSHkXY="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config perl go ]; buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ]; propagatedBuildInputs = [ pythonEnv ]; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index bffb09c098da..85808e43c49c 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -4,14 +4,15 @@ , fetchFromGitHub , systemd , xrandr -, installShellFiles }: +, installShellFiles +, desktop-file-utils }: python3.pkgs.buildPythonApplication rec { pname = "autorandr"; - version = "1.13.1"; + version = "1.13.2"; format = "other"; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles desktop-file-utils ]; propagatedBuildInputs = [ python3Packages.packaging ]; buildPhase = '' @@ -59,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { owner = "phillipberndt"; repo = "autorandr"; rev = "refs/tags/${version}"; - sha256 = "sha256-702x4O0rHW/VZIfu1+5G1gBSDQYVoAx167igz/M3Ea4="; + sha256 = "sha256-Yn950V7DgLhwYSoGyUvjTH0Vwg/FodxhKsBP5iLTgqA="; }; meta = with lib; { diff --git a/pkgs/tools/misc/compdb/default.nix b/pkgs/tools/misc/compdb/default.nix new file mode 100644 index 000000000000..c6d6d75283d9 --- /dev/null +++ b/pkgs/tools/misc/compdb/default.nix @@ -0,0 +1,23 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "compdb"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "Sarcasm"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-nFAgTrup6V5oE+LP4UWDOCgTVCv2v9HbQbkGW+oDnTg="; + }; + + meta = with lib; { + description = "Command line tool to manipulate compilation databases"; + license = licenses.mit; + homepage = "https://github.com/Sarcasm/compdb"; + maintainers = [ maintainers.detegr ]; + }; +} diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix index b7318c119dac..50f51cfd7119 100644 --- a/pkgs/tools/misc/flexoptix-app/default.nix +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,11 +1,11 @@ { lib, appimageTools, fetchurl, nodePackages }: let pname = "flexoptix-app"; - version = "5.13.1"; + version = "5.13.3"; src = fetchurl { name = "${pname}-${version}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - hash = "sha256-+rHktjZd6P4JGYRhEXdZYVI64XMYc7cBGojAQNd8Mq8="; + hash = "sha256-kDw9+Llqvq4NgN89Cw/HwEqYlv42wLbho1eHjI6wVSQ="; }; udevRules = fetchurl { diff --git a/pkgs/tools/misc/rmate-sh/default.nix b/pkgs/tools/misc/rmate-sh/default.nix new file mode 100644 index 000000000000..7fb51344edd1 --- /dev/null +++ b/pkgs/tools/misc/rmate-sh/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, patsh +, hostname +}: + +stdenv.mkDerivation rec { + pname = "rmate"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "aurora"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-fmK6h9bqZ0zO3HWfZvPdYuZ6i/0HZ1CA3FUnkS+E9ns="; + }; + + nativeBuildInputs = [ patsh ]; + + buildPhase = '' + runHook preBuild + + substituteInPlace rmate \ + --replace \ + 'echo "hostname"' \ + 'echo "${hostname}/bin/hostname"' + patsh -f rmate -s ${builtins.storeDir} + + runHook preBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 rmate $out/bin/rmate + + runHook postInstall + ''; + + meta = with lib; { + description = "Remote TextMate 2 implemented as shell script"; + longDescription = '' + TextMate 2 has a nice feature where it is possible to edit + files on a remote server using a helper script called 'rmate', + which feeds the file back to the editor over a reverse tunnel. + This is a rmate implementation in shell! + ''; + homepage = "https://github.com/aurora/rmate"; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/tools/misc/trashy/default.nix b/pkgs/tools/misc/trashy/default.nix index 7d3b3952a7ca..fb42a886fee5 100644 --- a/pkgs/tools/misc/trashy/default.nix +++ b/pkgs/tools/misc/trashy/default.nix @@ -2,16 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "trashy"; - version = "1.0.3"; + version = "2.0.0"; src = fetchFromGitHub { owner = "oberblastmeister"; repo = "trashy"; rev = "v${version}"; - sha256 = "sha256-b50Q7knJzXKDfM1kw6wLvXunhgOXVs+zYvZx/NYqMdk="; + sha256 = "sha256-xYSk0M8oNwbwZbKWDXMQlnt7vKi0p3+2Tr4eXCvtHEM="; }; - cargoSha256 = "sha256-2hNNLXuAHd1bquhHimniqryTVMfBmPAOossggICScqQ="; + cargoSha256 = "sha256-ZWqWtWzb+CLH1ravBb/oV+aPxplEyiC1wEFhvchcLqg="; + + # this patch must be removed after oberblastmeister/trashy#70 is solved or new + # version is released. + cargoPatches = [ ./lock-version.patch ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/trashy/lock-version.patch b/pkgs/tools/misc/trashy/lock-version.patch new file mode 100644 index 000000000000..3e95a3fbfdda --- /dev/null +++ b/pkgs/tools/misc/trashy/lock-version.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 7af0268..dc197a0 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -889,7 +889,7 @@ dependencies = [ + + [[package]] + name = "trashy" +-version = "1.0.3" ++version = "2.0.0" + dependencies = [ + "aho-corasick", + "ansi_term", diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 900d54dc745c..22ed2dcb80e7 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "eternal-terminal"; - version = "6.2.1"; + version = "6.2.4"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; - rev = "et-v${version}"; - hash = "sha256-YQ8Qx6RTmDoNWY8AQlnBJJendQl+tF1QA+Z6h/ar9qs="; + rev = "refs/tags/et-v${version}"; + hash = "sha256-9W9Pz0VrFU+HNpf98I3CLrn8+kpjjNLOUK8gGcDJcI8="; }; nativeBuildInputs = [ @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Remote shell that automatically reconnects without interrupting the session"; homepage = "https://eternalterminal.dev/"; + changelog = "https://github.com/MisterTea/EternalTerminal/releases/tag/et-v${version}"; license = licenses.asl20; maintainers = with maintainers; [ dezgeg ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 7928905762e5..1453fea66f53 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.6.6"; + version = "2.7.2"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-0MgMkMBK55WYtYuXSdU3h/APe1FRdefYID8nluamWU0="; + sha256 = "sha256-Y7xuwDAtDrvh+nacGWBmQN6DSsjLB0R7gHmctWPcDz8="; }; buildInputs = [ openssl zlib libxcrypt ] diff --git a/pkgs/tools/package-management/apx/default.nix b/pkgs/tools/package-management/apx/default.nix new file mode 100644 index 000000000000..77fed6e67e7d --- /dev/null +++ b/pkgs/tools/package-management/apx/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, installShellFiles +, docker +, distrobox +}: + +buildGoModule rec { + pname = "apx"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "Vanilla-OS"; + repo = pname; + rev = version; + sha256 = "sha256-BswX4Jo/RReM/tXo29V9rIvKjN8ylECPe0oo0FCQcGY="; + }; + + vendorSha256 = null; + + ldflags = [ "-s" "-w" ]; + + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; + + postInstall = '' + mkdir -p $out/etc/apx + + cat > "$out/etc/apx/config.json" < cycle buildInputs = with perlPackages; [ ]; # plugins will need some @@ -53,10 +58,10 @@ perlPackages.buildPerlPackage rec { ''; meta = with lib; { + changelog = "https://www.awstats.org/docs/awstats_changelog.txt"; description = "Real-time logfile analyzer to get advanced statistics"; homepage = "https://awstats.org"; license = licenses.gpl3Plus; platforms = platforms.unix; }; } - diff --git a/pkgs/tools/text/comrak/default.nix b/pkgs/tools/text/comrak/default.nix index f4ad0f485e40..3f751dc4d7e6 100644 --- a/pkgs/tools/text/comrak/default.nix +++ b/pkgs/tools/text/comrak/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "comrak"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "kivikakk"; repo = pname; rev = version; - sha256 = "sha256-F6MZxbB3FYEJ8tzJ0tp9/s0aLaH35QUnOJS6mCVfzUQ="; + sha256 = "sha256-ZKIqjeRsNTQYaa5itBSnqQ1w54Yq/iY2EQfDN713KGM="; }; - cargoSha256 = "sha256-+QPzwfoxt6+gpb4bDMd++1dBKoXOTON0z2EDdgmyy60="; + cargoSha256 = "sha256-Xafdt4AGympN6CLctOWfbCNfhwp4XN6XmSYESgjhRPk="; meta = with lib; { description = "A CommonMark-compatible GitHub Flavored Markdown parser and formatter"; diff --git a/pkgs/tools/text/hck/default.nix b/pkgs/tools/text/hck/default.nix index a888e7655241..c94580588056 100644 --- a/pkgs/tools/text/hck/default.nix +++ b/pkgs/tools/text/hck/default.nix @@ -3,26 +3,27 @@ , fetchFromGitHub , cmake , stdenv -, CoreFoundation -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "hck"; - version = "0.7.5"; + version = "0.8.2"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - sha256 = "sha256-29uxcbqAnWCdxKqVdrMVtorXvSLUC+jlt4YwE19Gh+A="; + sha256 = "sha256-66wunZuRAJ6QVWgBUy2+HGaow33F5+16LitGSQC4kCE="; }; - cargoSha256 = "sha256-VHuzv6Zq83byXDEEyYDtlaPC4DZ3GNJaJfO0ACrrqO8="; + cargoSha256 = "sha256-4CAj94wm9qxr9wejD2ffKSdRV1UeofMhxNxLi++At+I="; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; # link System as a dylib instead of a framework on macos postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index f282c28f8fe1..1e79570622c0 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -1,27 +1,34 @@ -{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "sift"; version = "0.9.0"; - rev = "v${version}"; - goPackagePath = "github.com/svent/sift"; + src = fetchFromGitHub { + owner = "svent"; + repo = "sift"; + rev = "v${version}"; + hash = "sha256-IZ4Hwg5NzdSXtrIDNxtkzquuiHQOmLV1HSx8gpwE/i0="; + }; + + vendorHash = "sha256-y883la4R4jhsS99/ohgBC9SHggybAq9hreda6quG3IY="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/svent/sift/commit/b56fb3d0fd914c8a6c08b148e15dd8a07c7d8a5a.patch"; + hash = "sha256-mFCEpkgQ8XDPRQ3yKDZ5qY9tKGSuHs+RnhMeAlx33Ng="; + }) + ]; nativeBuildInputs = [ installShellFiles ]; - src = fetchFromGitHub { - inherit rev; - owner = "svent"; - repo = "sift"; - sha256 = "0bgy0jf84z1c3msvb60ffj4axayfchdkf0xjnsbx9kad1v10g7i1"; - }; + ldflags = [ "-s" "-w" ]; postInstall = '' - installShellCompletion --cmd sift --bash go/src/github.com/svent/sift/sift-completion.bash + installShellCompletion --cmd sift --bash sift-completion.bash ''; - goDeps = ./deps.nix; - meta = with lib; { description = "A fast and powerful alternative to grep"; homepage = "https://sift-tool.org"; diff --git a/pkgs/tools/text/sift/deps.nix b/pkgs/tools/text/sift/deps.nix deleted file mode 100644 index 038555fa3cab..000000000000 --- a/pkgs/tools/text/sift/deps.nix +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } - { - goPackagePath = "github.com/svent/go-flags"; - fetch = { - type = "git"; - url = "https://github.com/svent/go-flags"; - rev = "4bcbad344f0318adaf7aabc16929701459009aa3"; - sha256 = "1gb416fgxl9gq4q6wsv3i2grq1mzbi7lvfvmfdqbxqbv9vizzh34"; - }; - } - { - goPackagePath = "github.com/svent/go-nbreader"; - fetch = { - type = "git"; - url = "https://github.com/svent/go-nbreader"; - rev = "7cef48da76dca6a496faa7fe63e39ed665cbd219"; - sha256 = "0hw11jj5r3f6qwydg41nc3c6aadlbkhc1qpxra2609lis0qa9h4r"; - }; - } -] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78d351f346e2..87fc70d7834a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -421,6 +421,8 @@ with pkgs; commix = callPackage ../tools/security/commix { }; + compdb = callPackage ../tools/misc/compdb { }; + conserver = callPackage ../tools/misc/conserver { }; containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; @@ -2209,8 +2211,13 @@ with pkgs; dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; dolphin-emu-beta = qt6Packages.callPackage ../applications/emulators/dolphin-emu/master.nix { - inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox; + inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox; inherit (darwin) moltenvk; + stdenv = + if stdenv.isDarwin && stdenv.isAarch64 then llvmPackages_14.stdenv + # https://github.com/NixOS/nixpkgs/issues/201254 + else if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv + else stdenv; }; dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { @@ -5345,6 +5352,8 @@ with pkgs; rmapi = callPackage ../applications/misc/remarkable/rmapi { }; + rmate-sh = callPackage ../tools/misc/rmate-sh { }; + rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { }; rm-improved = callPackage ../applications/misc/rm-improved { }; @@ -8900,6 +8909,8 @@ with pkgs; mani = callPackage ../development/tools/mani { }; + manifest-tool = callPackage ../development/tools/manifest-tool { }; + mask = callPackage ../development/tools/mask { }; mathpix-snipping-tool = callPackage ../tools/misc/mathpix-snipping-tool { }; @@ -14551,13 +14562,28 @@ with pkgs; gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; - gccgo = wrapCC ((if stdenv.hostPlatform.isMusl then gcc_latest else gcc).cc.override { + gccgo = wrapCC (gcc.cc.override { name = "gccgo"; langCC = true; #required for go. langC = true; langGo = true; langJit = true; profiledCompiler = false; + } // { + # not supported on darwin: https://github.com/golang/go/issues/463 + meta.broken = stdenv.hostPlatform.isDarwin; + }); + + gccgo12 = wrapCC (gcc12.cc.override { + name = "gccgo"; + langCC = true; #required for go. + langC = true; + langGo = true; + langJit = true; + profiledCompiler = false; + } // { + # not supported on darwin: https://github.com/golang/go/issues/463 + meta.broken = stdenv.hostPlatform.isDarwin; }); ghdl = ghdl-mcode; @@ -15721,9 +15747,7 @@ with pkgs; maturin = callPackage ../development/tools/rust/maturin { inherit (darwin.apple_sdk.frameworks) Security; }; - panamax = callPackage ../development/tools/rust/panamax { - inherit (darwin.apple_sdk.frameworks) Security; - }; + panamax = callPackage ../development/tools/rust/panamax { }; ograc = callPackage ../development/tools/rust/ograc { }; @@ -17408,6 +17432,8 @@ with pkgs; datree = callPackage ../development/tools/datree { }; + detekt = callPackage ../development/tools/detekt { }; + dcadec = callPackage ../development/tools/dcadec { }; dejagnu = callPackage ../development/tools/misc/dejagnu { }; @@ -26460,6 +26486,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + trust-dns = callPackage ../servers/dns/trust-dns { }; + tunctl = callPackage ../os-specific/linux/tunctl { }; twa = callPackage ../tools/networking/twa { }; @@ -37139,6 +37167,8 @@ with pkgs; apt = callPackage ../tools/package-management/apt { }; + apx = callPackage ../tools/package-management/apx { }; + dpkg = callPackage ../tools/package-management/dpkg { }; dumb = callPackage ../misc/dumb { }; @@ -37245,9 +37275,7 @@ with pkgs; gummy = callPackage ../tools/misc/gummy { }; - hck = callPackage ../tools/text/hck { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - }; + hck = callPackage ../tools/text/hck { }; helm = callPackage ../applications/audio/helm { };