diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 73ea0a9b9198..c8bd237dbb00 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -13,7 +13,9 @@ - Create the first release note entry in this section! + Cinnamon has been updated to 5.6, see + the + pull request for what is changed. @@ -80,7 +82,7 @@
Other Notable Changes - + The module for the application firewall @@ -89,6 +91,19 @@ services.opensnitch.rules + + + A new virtualisation.rosetta module was + added to allow running x86_64 binaries + through + Rosetta + inside virtualised NixOS guests on Apple silicon. This feature + works by default with the + UTM + virtualisation + package. + +
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 7f42554f3226..c438fdc1aaaf 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -8,7 +8,7 @@ In addition to numerous new and upgraded packages, this release has the followin -- Create the first release note entry in this section! +- Cinnamon has been updated to 5.6, see [the pull request](https://github.com/NixOS/nixpkgs/pull/201328#issue-1449910204) for what is changed. ## New Services {#sec-release-23.05-new-services} @@ -34,3 +34,5 @@ In addition to numerous new and upgraded packages, this release has the followin - The module for the application firewall `opensnitch` got the ability to configure rules. Available as [services.opensnitch.rules](#opt-services.opensnitch.rules) + +- A new `virtualisation.rosetta` module was added to allow running `x86_64` binaries through [Rosetta](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) inside virtualised NixOS guests on Apple silicon. This feature works by default with the [UTM](https://docs.getutm.app/) virtualisation [package](https://search.nixos.org/packages?channel=unstable&show=utm&from=0&size=1&sort=relevance&type=packages&query=utm). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bc5f6f1d76cd..215e001c2ec1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1329,6 +1329,7 @@ ./virtualisation/parallels-guest.nix ./virtualisation/podman/default.nix ./virtualisation/qemu-guest-agent.nix + ./virtualisation/rosetta.nix ./virtualisation/spice-usb-redirection.nix ./virtualisation/virtualbox-guest.nix ./virtualisation/virtualbox-host.nix diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 2c59ee410d5f..d5325bc43940 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -171,11 +171,10 @@ in # theme sound-theme-freedesktop nixos-artwork.wallpapers.simple-dark-gray - mint-artwork + mint-artwork # cursors mint-themes mint-x-icons mint-y-icons - vanilla-dmz ] config.environment.cinnamon.excludePackages); xdg.mime.enable = true; diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 764bb5e3b40e..e3eb519b7ddd 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -129,8 +129,15 @@ in { description = "LXD Container Management Daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target" "lxcfs.service" ]; - requires = [ "network-online.target" "lxd.socket" "lxcfs.service" ]; + after = [ + "network-online.target" + (mkIf config.virtualisation.lxc.lxcfs.enable "lxcfs.service") + ]; + requires = [ + "network-online.target" + "lxd.socket" + (mkIf config.virtualisation.lxc.lxcfs.enable "lxcfs.service") + ]; documentation = [ "man:lxd(1)" ]; path = optional cfg.zfsSupport config.boot.zfs.package; diff --git a/nixos/modules/virtualisation/rosetta.nix b/nixos/modules/virtualisation/rosetta.nix new file mode 100644 index 000000000000..109b114d649c --- /dev/null +++ b/nixos/modules/virtualisation/rosetta.nix @@ -0,0 +1,73 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.virtualisation.rosetta; + inherit (lib) types; +in +{ + options = { + virtualisation.rosetta.enable = lib.mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to enable [Rosetta](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) support. + + This feature requires the system to be a virtualised guest on an Apple silicon host. + + The default settings are suitable for the [UTM](https://docs.getutm.app/) virtualisation [package](https://search.nixos.org/packages?channel=unstable&show=utm&from=0&size=1&sort=relevance&type=packages&query=utm). + Make sure to select 'Apple Virtualization' as the virtualisation engine and then tick the 'Enable Rosetta' option. + ''; + }; + + virtualisation.rosetta.mountPoint = lib.mkOption { + type = types.str; + default = "/run/rosetta"; + internal = true; + description = lib.mdDoc '' + The mount point for the Rosetta runtime inside the guest system. + + The proprietary runtime is exposed through a VirtioFS directory share and then mounted at this directory. + ''; + }; + + virtualisation.rosetta.mountTag = lib.mkOption { + type = types.str; + default = "rosetta"; + description = lib.mdDoc '' + The VirtioFS mount tag for the Rosetta runtime, exposed by the host's virtualisation software. + + If supported, your virtualisation software should provide instructions on how register the Rosetta runtime inside Linux guests. + These instructions should mention the name of the mount tag used for the VirtioFS directory share that contains the Rosetta runtime. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = pkgs.stdenv.hostPlatform.isAarch64; + message = "Rosetta is only supported on aarch64 systems"; + } + ]; + + fileSystems."${cfg.mountPoint}" = { + device = cfg.mountTag; + fsType = "virtiofs"; + }; + + boot.binfmt.registrations.rosetta = { + interpreter = "${cfg.mountPoint}/rosetta"; + + # The required flags for binfmt are documented by Apple: + # https://developer.apple.com/documentation/virtualization/running_intel_binaries_in_linux_vms_with_rosetta + magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00''; + mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + fixBinary = true; + matchCredentials = true; + preserveArgvZero = false; + + # Remove the shell wrapper and call the runtime directly + wrapInterpreterInShell = false; + }; + }; +} diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 81a0cd8b02e1..eaf3f9013817 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "timeshift"; - version = "22.06.5"; + version = "22.11.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - sha256 = "IHX/F3tnl3ckX20mnPHmuK/W4pRTFHzBUfaJg2sMpqc="; + sha256 = "JYYiqJzLszaCJSl7fDb9Oz8tdIYAnqEbJoRg4zw3wbg="; }; patches = [ diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index a1b0f2890e9d..a2ce1b90d2fd 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.6.12"; + version = "1.7.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-izjKrzHbyRsUhlUAf0PELVGBt5JmzvBzgBytB9z80cI="; + sha256 = "sha256-6E8TJ1NgWlLTegDQ4UcCQpAAQibbefg5x7qhSrSKAgc="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index a06494477a01..3cda0eac7130 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -31,23 +31,23 @@ }) (fetchNuGet { pname = "BTCPayServer.Lightning.All"; - version = "1.4.5"; - sha256 = "1x4500b71cmv8qba2phk1j0624w8gln5c1jzyw3x782ddvlbznna"; + version = "1.4.9"; + sha256 = "0r9ssz00d0zbbszs1ypc9jvbwg5myh9jmw46wvzk0jhp5xfz5mip"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; - version = "1.3.12"; - sha256 = "0bf9k5wx9h53fwis6887gy43683xgljwk26kr44r6gzqbzwzac1m"; + version = "1.3.14"; + sha256 = "1frhj5jmncsdcb1x5jy733l40bqifdwirmq6mjdn3596fmgjvh9b"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; - version = "1.3.14"; - sha256 = "0320bm9fz6mym3b450avwx0ng8y334w4rm2gcpicnwglp53cagx7"; + version = "1.3.16"; + sha256 = "0nh1fcjpkl6l2par60p0w7nwc45za28iagmdsq6czz68kpvfx83c"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; - version = "1.3.13"; - sha256 = "1yy78w4zcl17z99l0n5p86ay9cvsbhwxm42f1f2ll9k2p495bmr3"; + version = "1.3.15"; + sha256 = "1axmdn6qdzxljdvidw8s68sfgy5ykmxv0nkzcdsgdmhisahaz2pa"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; @@ -56,38 +56,23 @@ }) (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; - version = "1.3.12"; - sha256 = "0jqaimrcdgd7iwyy8fkqysrxfbz3gzvv4pi30fc0nz1x1b11w48j"; + version = "1.3.14"; + sha256 = "1ld5diahj75jbnqmvvsc0h65sbd4i73k7sik325yw4gvz4jmw2ih"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; - version = "1.3.14"; - sha256 = "1zsjg0zgp51vgkhq7vv05pxz5jrpahkjl042ilywb8jqlz3my9jw"; + version = "1.3.16"; + sha256 = "0nq36jg0qfj93djk5b9i42v8gm2zqkf8a2ddb69z52gsg8ixvcm6"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; - version = "1.4.4"; - sha256 = "0qm7xgd19s629swnm6b83qv5b9p57b7bq9bi5l340yim6w8yb4mb"; + version = "1.4.7"; + sha256 = "144wlnlvkmn1hrl7kwsqfvlla3lknd599rmp6zf1nv0n4jsj15l4"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; - version = "1.0.7"; - sha256 = "10npvkaa6hr0a3lb4lnfakfnbzr87058irsa4jrbj238hc5m8zwg"; - }) - (fetchNuGet { - pname = "BuildBundlerMinifier"; - version = "3.2.449"; - sha256 = "1dcjlfl5w2vfppx2hq3jj6xy24id2x3hcajwylhphlz9jw2bnhsv"; - }) - (fetchNuGet { - pname = "BundlerMinifier.Core"; - version = "3.2.449"; - sha256 = "1bqc8k346b9yl7a5ywbl5g1m5982qyg7s2kihak100fzlb7g7rxs"; - }) - (fetchNuGet { - pname = "BundlerMinifier.TagHelpers"; - version = "3.2.435"; - sha256 = "0ksmby0lzgsxkv0xfzr840262kcqra9vds91mcx0rf20blksfvsk"; + version = "1.0.10"; + sha256 = "12c5gmd62vik0ar786jlhzf0gid4smi5ysl12mxpx1i0dndgapbh"; }) (fetchNuGet { pname = "CsvHelper"; @@ -186,8 +171,8 @@ }) (fetchNuGet { pname = "LNURL"; - version = "0.0.24"; - sha256 = "1hqa95gbcis03c0m5kwl7zzn26kwv1my94yq96766qp0rnl6c4lw"; + version = "0.0.26"; + sha256 = "0gb6n5zvf3mnmychbv3hmzbfllxamq26y1c18ql6y02wy2asrwff"; }) (fetchNuGet { pname = "MailKit"; @@ -449,11 +434,6 @@ version = "6.0.1"; sha256 = "0ra0ldbg09r40jzvfqhpb3h42h80nafvka9hg51dja32k3mxn5gk"; }) - (fetchNuGet { - pname = "Microsoft.Extensions.Configuration.Abstractions"; - version = "1.1.2"; - sha256 = "0z83kxfzsgqlshg4x1mhdnhlrprrwsgnnibvwk257drzy9079994"; - }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; @@ -629,11 +609,6 @@ version = "1.0.0"; sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Abstractions"; - version = "1.1.2"; - sha256 = "0j9b4z3pf8a5xphx3ksn6jm01rf4z001vfll5kcbxw995xcidjw1"; - }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; @@ -659,11 +634,6 @@ version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) - (fetchNuGet { - pname = "Microsoft.Extensions.Logging.Filter"; - version = "1.1.2"; - sha256 = "1pip87q89376xxpi3r5pf9vxhqxx21qrp179fbldbkr2m1577k9m"; - }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; @@ -714,11 +684,6 @@ version = "1.1.0"; sha256 = "0r4j8v2vvp3kalvb11ny9cvpls3nrvqj0c81rxbkh99ynd2dbscp"; }) - (fetchNuGet { - pname = "Microsoft.Extensions.Primitives"; - version = "1.1.1"; - sha256 = "0rcwxz1r89y96s8k3bmg0v6zdqanqfp09khy5l99wnl777y15g7x"; - }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; @@ -769,11 +734,6 @@ version = "17.3.2"; sha256 = "0pm06nxqi8aw04lciqy7iz8ln1qm5mx06cpwgqa2dfwvnjp7zxnm"; }) - (fetchNuGet { - pname = "Microsoft.NetCore.Analyzers"; - version = "3.3.2"; - sha256 = "1h1bjiiw64qncs61p2idwxswv4kzq06bbl2rlghiagv6sbjk4pnq"; - }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; @@ -836,19 +796,14 @@ }) (fetchNuGet { pname = "NBitcoin.Altcoins"; - version = "3.0.8"; - sha256 = "1qck2nfj8494pxwzhccslq4cbypsgnwcv3nvz24czsd87wn8n618"; + version = "3.0.17"; + sha256 = "1rqcfpcs3c7zqlw3fnvnyw3d3mmplg5nsaikm50lnzpl8z3cq936"; }) (fetchNuGet { pname = "NBitcoin"; version = "5.0.40"; sha256 = "1rqzn84yaww4afagwg8jg1l5qdkvqyjdfcyd5widddqwxabbsjvh"; }) - (fetchNuGet { - pname = "NBitcoin"; - version = "6.0.18"; - sha256 = "1dr669h68cx6yfzr3n97yzzwbgnsv5g2008diyxngdjm55nh3q9s"; - }) (fetchNuGet { pname = "NBitcoin"; version = "6.0.8"; @@ -861,8 +816,8 @@ }) (fetchNuGet { pname = "NBitcoin"; - version = "7.0.11"; - sha256 = "1v5fiyi2jci162jjga9cgmh2p6ig6yxj4zr151x0fa8rwaz5f1md"; + version = "7.0.14"; + sha256 = "18nxx13fz3i7kmigijnynvrbx2i5cb3v4m89nvnxl38vcw7w5jys"; }) (fetchNuGet { pname = "NBitpayClient"; @@ -871,8 +826,8 @@ }) (fetchNuGet { pname = "NBXplorer.Client"; - version = "4.2.0"; - sha256 = "1adbn5cbr42cjfvijaf1lffhcrcn0ws1arfi7mrg3kjshbzfgims"; + version = "4.2.1"; + sha256 = "0sizhzz6ry40fphd3lqqj8r9ik103jzrq1ql57rl1zfh1490zq5y"; }) (fetchNuGet { pname = "NETStandard.Library"; @@ -894,11 +849,6 @@ version = "3.0.14"; sha256 = "1njk1arrf8pbx0i0p3yww459i70p0fcx02vs0jnbb6znvcy4mvh6"; }) - (fetchNuGet { - pname = "Newtonsoft.Json"; - version = "11.0.2"; - sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; - }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.3"; @@ -959,11 +909,6 @@ version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { - pname = "NUglify"; - version = "1.5.14"; - sha256 = "00sy6m88z9q08ad7v55vczibxa74xwb2izrg9zinxdbihprgw92w"; - }) (fetchNuGet { pname = "PeterO.Cbor"; version = "4.1.3"; @@ -1554,11 +1499,6 @@ version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "4.3.0"; - sha256 = "149xcsa1pphlrc2zfmca9n822g4mxk7s2a44phvf34r0fajm3hk8"; - }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; @@ -1874,11 +1814,6 @@ version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { - pname = "Text.Analyzers"; - version = "3.3.3"; - sha256 = "1fkx07xi049mlzskrw9422zpikdppsgf7vi2lq97qs5rvly3rfvp"; - }) (fetchNuGet { pname = "TwentyTwenty.Storage.Amazon"; version = "2.12.1"; diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index a9e77ae6fb28..f4f082047396 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.41"; + version = "2.3.49"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-xifL6XafK8FCtOoXt5H8ymCWETZlfzTKk51/saBGxHE="; + sha256 = "sha256-ErAdFY65EYY988+xqSd6v57NbFeOE3Yt5mvn6C0TuRE="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index b32c7d1a0cf8..a646fd1e8339 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -199,6 +199,11 @@ version = "7.0.14"; sha256 = "18nxx13fz3i7kmigijnynvrbx2i5cb3v4m89nvnxl38vcw7w5jys"; }) + (fetchNuGet { + pname = "NBitcoin"; + version = "7.0.18"; + sha256 = "02kkgymdb80cidibrs6qpy1zjwcfbkwv9zqz9s0swf5zp7qvcakn"; + }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index 16331ba79e07..0796dbe72185 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.2.7"; + version = "3.2.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-aO5ilmlkSAxlkWYdSLmrcm7pC8GbITpCitd4TXp5tfY="; + sha256 = "sha256-ax769qjV0oZ6tnEE5FsXNbHETI6KNgvh0WviBsPs9j8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix index f861c04a7287..2a6e349f2f23 100644 --- a/pkgs/applications/kde/filelight.nix +++ b/pkgs/applications/kde/filelight.nix @@ -1,7 +1,17 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - kio, kparts, kxmlgui, qtbase, qtscript, solid, qtquickcontrols2, kdeclarative +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kio +, kparts +, kxmlgui +, qtbase +, qtscript +, solid +, qtquickcontrols2 +, kdeclarative +, kirigami2 +, kquickcharts }: mkDerivation { @@ -15,7 +25,15 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ - kio kparts kxmlgui qtscript solid qtquickcontrols2 kdeclarative + kio + kparts + kxmlgui + qtscript + solid + qtquickcontrols2 + kdeclarative + kirigami2 + kquickcharts ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index 85b409fe5ef3..be28d1185d24 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.24"; + version = "1.2.25"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "sha256-s//GkCKvppqJ+7x8pNwVEaBsUOCKCGt+wLj9P+3N9hc="; + sha256 = "sha256-yBUvePVbNDLYL1d6cNrLBn6+/p1agVzSx29JB3EZ5Fk="; }; dontBuild = true; diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/applications/misc/zine/default.nix index f8b1d37399b8..83b9a614d647 100644 --- a/pkgs/applications/misc/zine/default.nix +++ b/pkgs/applications/misc/zine/default.nix @@ -2,22 +2,22 @@ , rustPlatform , fetchCrate , pkg-config -, stdenv , openssl +, stdenv , CoreServices , Security }: rustPlatform.buildRustPackage rec { pname = "zine"; - version = "0.7.0"; + version = "0.8.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-teLx21vA4b+ft4zZqou4EiTHhh9Foq2Vukmk4z0pWUM="; + sha256 = "sha256-diG5YgaJt3XHd0yzMofaCamKLm9QACtY2DjtMi7ckSA="; }; - cargoSha256 = "sha256-OaA090pvJ6rc29wcsUTiuV4/VY/oDDEOGo94Ol31OzI="; + cargoSha256 = "sha256-lGNM1cY1rDlAfrQvfXwy+YGVq8oqTGPVVE2oCq+8Z8o="; nativeBuildInputs = [ pkg-config @@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A simple and opinionated tool to build your own magazine"; homepage = "https://github.com/zineland/zine"; + changelog = "https://github.com/zineland/zine/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya figsoda ]; }; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 16461e4d0c4f..90193971cd75 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.5.5"; + version = "3.5.6"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-jyMjcFQXv9wGcvBU+Ki970HAgSQD57Zx3G9gf/mj25A="; + hash = "sha256-MO/BwlgSAt9rZC+kELdjJm6F15MJJPpvn412CndvqXk="; }; postPatch = '' diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 30ff02c1f2ca..12b181d2edd4 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -207,6 +207,8 @@ stdenv.mkDerivation rec { "-Druntime_cxxmodules=OFF" ]; + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + postInstall = '' for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do wrapProgram "$out/bin/$prog" \ @@ -262,9 +264,5 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.veprbl ]; license = licenses.lgpl21; - - # See https://github.com/NixOS/nixpkgs/pull/192581#issuecomment-1256860426 - # for some context on issues on aarch64. - broken = stdenv.isAarch64 && stdenv.isLinux; }; } diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index 3d5f8d4957ab..8bba5c685a4a 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "hypnotix"; - version = "2.9"; + version = "3.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-jjCyO6lyhqH4xeNp5uy/KqNr5Mvv+45pJGHFOXNi0rk="; + hash = "sha256-ZSHChUkd1yXVGNUotzyZ9eB7s3apwvRmEJcO5J0vsZQ="; }; patches = [ @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { src = ./libmpv-path.patch; libmpv = "${lib.getLib mpv}/lib/libmpv${stdenv.hostPlatform.extensions.sharedLibrary}"; }) + + # Fix launching with mpv 0.35.0 (ubuntu 22.04 doesn't have libmpv.so.2) + # https://github.com/linuxmint/hypnotix/issues/254 + ./fix-deprecated-mpv-detach-destroy.patch ]; postPatch = '' diff --git a/pkgs/applications/video/hypnotix/fix-deprecated-mpv-detach-destroy.patch b/pkgs/applications/video/hypnotix/fix-deprecated-mpv-detach-destroy.patch new file mode 100644 index 000000000000..06c971b51520 --- /dev/null +++ b/pkgs/applications/video/hypnotix/fix-deprecated-mpv-detach-destroy.patch @@ -0,0 +1,22 @@ +diff --git a/usr/lib/hypnotix/mpv.py b/usr/lib/hypnotix/mpv.py +index f42a3be..db94bf6 100644 +--- a/usr/lib/hypnotix/mpv.py ++++ b/usr/lib/hypnotix/mpv.py +@@ -528,7 +528,7 @@ _mpv_create = backend.mpv_create + _handle_func('mpv_create_client', [c_char_p], MpvHandle, notnull_errcheck) + _handle_func('mpv_client_name', [], c_char_p, errcheck=None) + _handle_func('mpv_initialize', [], c_int, ec_errcheck) +-_handle_func('mpv_detach_destroy', [], None, errcheck=None) ++_handle_func('mpv_destroy', [], None, errcheck=None) + _handle_func('mpv_terminate_destroy', [], None, errcheck=None) + _handle_func('mpv_load_config_file', [c_char_p], c_int, ec_errcheck) + _handle_func('mpv_get_time_us', [], c_ulonglong, errcheck=None) +@@ -881,7 +881,7 @@ class MPV(object): + self._message_handlers[target](*args) + + if eid == MpvEventID.SHUTDOWN: +- _mpv_detach_destroy(self._event_handle) ++ _mpv_destroy(self._event_handle) + return + + except Exception as e: diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 15dd7a9cec1c..f05fbd54485f 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -54,13 +54,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.4.12"; + version = "5.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-uyQZXri3V3dKnowB97QlPWboZz1neblyvCuSacsPROg="; + hash = "sha256-JvdbapOJq2w0tObnGd8t+SLruWN0sblKhSf2dlHR9Go="; }; patches = [ @@ -136,7 +136,9 @@ stdenv.mkDerivation rec { pkg-config ]; - # use locales from cinnamon-translations (not using --localedir because datadir is used) + # Use locales from cinnamon-translations. + # FIXME: Upstream does not respect localedir option from Meson currently. + # https://github.com/linuxmint/cinnamon/pull/11244#issuecomment-1305855783 postInstall = '' ln -s ${cinnamon-translations}/share/locale $out/share/locale ''; @@ -149,26 +151,16 @@ stdenv.mkDerivation rec { sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py - sed "s|/usr/bin/upload-system-info|${xapp}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py sed "s|\"upload-system-info\"|\"${xapp}/bin/upload-system-info\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py - sed "s|/usr/bin/cinnamon-control-center|${cinnamon-control-center}/bin/cinnamon-control-center|g" -i ./files/usr/bin/cinnamon-settings - sed "s|/usr/bin/cinnamon-screensaver-command|/run/current-system/sw/bin/cinnamon-screensaver-command|g" \ -i ./files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js -i ./files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js - # this one really IS optional - sed "s|/usr/bin/gnome-control-center|/run/current-system/sw/bin/gnome-control-center|g" -i ./files/usr/bin/cinnamon-settings - sed "s|\"/usr/lib\"|\"${cinnamon-control-center}/lib\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/capi.py - # another bunch of optional stuff - sed "s|/usr/bin|/run/current-system/sw/bin|g" -i ./files/usr/bin/cinnamon-launcher - sed 's|"lspci"|"${pciutils}/bin/lspci"|g' -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-cinnamon -i ./files/usr/bin/cinnamon-session-cinnamon2d - sed "s|/usr/bin|$out/bin|g" -i ./files/usr/share/xsessions/cinnamon.desktop ./files/usr/share/xsessions/cinnamon2d.desktop ./files/usr/share/applications/cinnamon2d.desktop sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index c0a34fc093dc..ceee75dd6979 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -9,7 +9,6 @@ , libnotify , libxml2 , gnome-online-accounts -, cinnamon-settings-daemon , colord , polkit , libxkbfile @@ -36,13 +35,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "5.4.7"; + version = "5.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-38n1QCygkBq+wOLwui1oF6MtDWxAFWxp5U1omSVtbro="; + hash = "sha256-WK35uDckIYU4HwuYtLj+CFVJD8O78LTQcnOvjp/et2s="; }; buildInputs = [ @@ -56,7 +55,6 @@ stdenv.mkDerivation rec { libgnomekbd libxklavier colord - cinnamon-settings-daemon libgudev libwacom gnome-online-accounts @@ -75,10 +73,6 @@ stdenv.mkDerivation rec { ./panels/datetime/tz.h:34:# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */ postPatch = '' - find . -type f -exec sed -i \ - -e s,/usr/share/locale,/run/current-system/sw/share/locale,g \ - {} + - sed 's|TZ_DIR "/usr/share/zoneinfo/"|TZ_DIR "${tzdata}/share/zoneinfo/"|g' -i ./panels/datetime/test-timezone.c sed 's|TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"|TZ_DATA_FILE "${tzdata}/share/zoneinfo/zone.tab"|g' -i ./panels/datetime/tz.h sed 's|"/usr/share/i18n/locales/"|"${glibc}/share/i18n/locales/"|g' -i panels/datetime/test-endianess.c @@ -86,27 +80,11 @@ stdenv.mkDerivation rec { patchShebangs meson_install_schemas.py ''; - # it needs to have access to that file, otherwise we can't run tests after build - - preBuild = '' - mkdir -p $out/share/cinnamon-control-center/ - ln -s $PWD/panels/datetime $out/share/cinnamon-control-center/ - ''; - mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" ]; - preInstall = '' - rm -r $out - ''; - - # the only test is wacom-calibrator and it seems to need an xserver and prob more services aswell - doCheck = false; - nativeBuildInputs = [ pkg-config meson diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 0b9e10e74027..0a724023418b 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "5.4.2"; + version = "5.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-U05JiW6PaRAEEQ/uq3wmZSQGohMz4M86Ji9pBl2Azg8="; + hash = "sha256-ajtKvy9CMr+Vsmdn49ZWYtbniZV1dqWJGTou3QY4oPc="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index c3a60d684781..599e580a5bab 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-menus"; - version = "5.4.0"; + version = "5.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Q4bgaX8nGSWHKHR3+hFTlHtNhSmZW8ZEHi8DaXKQ+fM="; + hash = "sha256-6IOlXQhAy6YrSqybfGFUyn3Q2COvzwpj67y/k/YLNhU="; }; buildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 9575255d5791..f0214f4a48b5 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "5.4.4"; + version = "5.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-D+SpAO4i4KGFWJI94LalTMB3j1YPvV63cKb34FDDprk="; + hash = "sha256-dnfUvRlmsdUXfjAxPv+i/uJ8kr0LQ/i7ClUMtjjIWMo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 261433e65872..90f760051bd5 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "5.4.0"; + version = "5.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-m16nf3eC15ZT8eDvRTylBfxsnShkU1Sm8J9qcRGeGQo="; + hash = "sha256-lyASp0jFwaPLPQ3Jnow6eTpUBybwhSEmQUK/20fsh7I="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index ed947ee2b508..47a1e092d15c 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "5.4.5"; + version = "5.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-qjI1z1MuaI5JFqjHap/+aYDQ0YuP9VNnnY6vy/AaKqs="; + hash = "sha256-VUGOBvMInruX1JVk9ECP8++FUrBQwDJhkZT/1pPg2wU="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index 195d0268f3b1..9dd2f9c94ee1 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "5.4.2"; + version = "5.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-vt60qarNfTX9R5kGOeUBCskKK2zLdEE+ACT0EGvUeao="; + hash = "sha256-ztHHqX0OuwSFGlxCoJhZXnUsMM0WrkwiQINgDVlb0XA="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 63be8c0d569b..167924fe6d15 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "cjs"; - version = "5.4.1"; + version = "5.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cjs"; rev = version; - hash = "sha256-8LIVM9+Wt9V7iKUwqTBUTf8LiQ16NE3CYtCJknjl56o="; + hash = "sha256-f9esbQi5WWSMAGlEs9HJFToOvmOrbP2lDW1gGh/48gw="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index 833a28967b4d..68f627feecbd 100644 --- a/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,11 +7,14 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.6.0"; + version = "1.6.8"; src = fetchurl { - url = "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"; - hash = "sha256-un5T56zzN2vRVp42RHczDEKwrweSeygASkFJU5LXCDo="; + urls = [ + "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + "https://web.archive.org/web/20221129013553/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + ]; + hash = "sha256-HPnb5Mb6tvzREZbW9SyDNQ6ST6RPmOUVdA9MW8oyRAM="; }; nativeBuildInputs = [ @@ -25,9 +28,7 @@ stdenv.mkDerivation rec { find . -type f -exec sed -i \ -e s,/usr/share/backgrounds/linuxmint/default_background.jpg,${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png,g \ -e s,/usr/share,$out/share,g \ - -e s,DMZ-White,Vanilla-DMZ,g \ - -e s,DMZ-Black,Vanilla-DMZ-AA,g \ - -e s,linuxmint-logo-5,cinnamon-symbolic,g \ + -e s,linuxmint-logo-ring-symbolic,cinnamon-symbolic,g \ {} + # fixup broken symlink diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index 809ffac849b8..895cbdcf287c 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -1,21 +1,20 @@ { fetchFromGitHub , lib -, stdenv +, stdenvNoCC , python3 , sassc , sass }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.0.5"; + version = "2.0.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - # they don't exactly do tags, it's just a named commit - rev = "3a202e401abca98623cd1dbc412221682081244c"; - hash = "sha256-OgyLNc6gwMn7dG5/T67Toiqsij1rJYV6k6Un2cgr2oQ="; + rev = version; + hash = "sha256-3DwD1JVzl7446Fn+XMxwh2WA72ks4esnrLpyYBF9xWc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix index 2a57e0571ed2..ada385afcea2 100644 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , lib -, stdenv +, stdenvNoCC , gnome , gnome-icon-theme , hicolor-icon-theme @@ -9,15 +9,14 @@ , ubuntu-themes }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "mint-x-icons"; version = "1.6.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - # they don't exactly do tags, it's just a named commit - rev = "4ab3c314db1b3751d87d5769629b28ac0ca3c671"; + rev = version; hash = "sha256-cPRae3EjzVtAL1Ei2LB4UNUU/m87mFT94xY/NnNR6JM="; }; diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index 212de9646223..b9d18280783e 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -1,22 +1,21 @@ { fetchFromGitHub , lib -, stdenv +, stdenvNoCC , gnome , gnome-icon-theme , hicolor-icon-theme , gtk3 }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "mint-y-icons"; - version = "1.6.1"; + version = "1.6.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - # they don't exactly do tags, it's just a named commit - rev = "57d16eb85f2af40be17e2232d279bb65b689f5b7"; - hash = "sha256-voFYz0MiuqyNSngi4QZUJKDIjggQWOAV5B30zMP8iTk="; + rev = version; + hash = "sha256-XnQcVlN4xtZQDjijNV09m2m0ODYfFbrQaNd8ZQVToIw="; }; propagatedBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index a2e7811b3d85..241136f6e72a 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { pname = "muffin"; - version = "5.4.7"; + version = "5.6.0"; outputs = [ "out" "dev" "man" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Zx6au1FXLgK8PRmkh8jaGJ3Zh0YYFj2zmbxhgXAFgDg="; + hash = "sha256-vUkxR3HfzubaOoXxo6xHDLLy+zVBYE9i5s+yp1rbJaw="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 0490b2b47c7a..afc42c35c6e2 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.4.3"; + version = "5.6.0"; # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327) @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-f3rO0lpOcwpSpIpKrslf6/6nqFbbGTwnKbHpWO+Uf+Q="; + sha256 = "sha256-+JrfFqKZhzYOyp7z2x22bw2f8Gip7Qh8d30tC7LWHEU="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index ebd116882a8c..5ddfdd7570ff 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "pix"; - version = "2.8.7"; + version = "2.8.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-aID0jxOMFegkcAflTY0VevZyN1HFivkTFi3has8MOY0="; + sha256 = "sha256-dvxbnf6tvBAwYM0EKpd/mPfW2PXeV1H2khYl8LIJqa0="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix index 5408c9c50cfd..3ed8a0c4f9e2 100644 --- a/pkgs/desktops/cinnamon/xapp/default.nix +++ b/pkgs/desktops/cinnamon/xapp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "xapp"; - version = "2.2.15"; + version = "2.4.1"; outputs = [ "out" "dev" ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-X/exXQY/v+TU8HnnquleP21tCYR9h7t43AIw4tTKVOY="; + hash = "sha256-c86n3aYSS3Klm2HtN8dIN5UvL6Jxz9y1fMF1QAefCIg="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index ebb57ae9a757..d5755a4116ab 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "3.4.5"; + version = "3.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-lRtBxqD45/3Wjp0Sq8A0L3Zmg33Pq6iIsA8jeywnDBc="; + sha256 = "sha256-CXhktA0BvJ0mczhH6kTOMzLeDG9rThy3g3VOcOWlBDw="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index 2c55f6140244..73ba5d99d397 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.2.10"; + version = "3.2.11"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-c3K9yjeaAlyXqgxzHgnLXgqwaB5Fdw+mS9jricy8QA8="; + sha256 = "sha256-EyrK4mnAHt/Lypuz7XX7+GFGfkfC5VDIit2WYZawI04="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 98dce9af834e..6d50d6f378e1 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "C_COMPILER=$(CC)" "LINKER_OPTIONS=-headerpad_max_install_names" + "POSTINSTALL_PROGRAM=install_name_tool" ]); nativeBuildInputs = [ diff --git a/pkgs/development/compilers/julia/1.8.nix b/pkgs/development/compilers/julia/1.8.nix index f8b0daa1ace7..1c614103bdec 100644 --- a/pkgs/development/compilers/julia/1.8.nix +++ b/pkgs/development/compilers/julia/1.8.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , which , python3 , gfortran @@ -40,6 +41,15 @@ stdenv.mkDerivation rec { path = name: "https://raw.githubusercontent.com/archlinux/svntogit-community/6fd126d089d44fdc875c363488a7c7435a223cec/trunk/${name}"; in [ + # Pull upstream fix to fix tests mpfr-4.1.1 + # https://github.com/JuliaLang/julia/pull/47659 + (fetchpatch { + name = "mfr-4.1.1.patch"; + url = "https://github.com/JuliaLang/julia/commit/59965205ccbdffb4e25e1b60f651ca9df79230a4.patch"; + hash = "sha256-QJ5wxZMhz+or8BqcYv/5fNSTxDAvdSizTYqt7630kcw="; + includes = [ "stdlib/MPFR_jll/test/runtests.jl" ]; + }) + (fetchurl { url = path "julia-hardcoded-libs.patch"; sha256 = "sha256-kppSpVA7bRohd0wXDs4Jgct9ocHnpbeiiSz7ElFom1U="; diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix index f6e9b3daca2d..ad371f1b6acb 100644 --- a/pkgs/development/coq-modules/HoTT/default.nix +++ b/pkgs/development/coq-modules/HoTT/default.nix @@ -2,42 +2,19 @@ with lib; mkCoqDerivation { pname = "HoTT"; + repo = "Coq-HoTT"; owner = "HoTT"; inherit version; - defaultVersion = if coq.coq-version == "8.6" then "20170921" else null; - release."20170921".rev = "e3557740a699167e6adb1a65855509d55a392fa1"; - release."20170921".sha256 = "0zwfp8g62b50vmmbb2kmskj3v6w7qx1pbf43yw0hr7asdz2zbx5v"; - - nativeBuildInputs = [ autoconf automake ]; - - preConfigure = '' - patchShebangs ./autogen.sh - ./autogen.sh - - mkdir -p "$out/bin" - ''; - - configureFlags = [ - "--bindir=$(out)/bin" - ]; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.14" "8.16"; out = coq.coq-version; } + ] null; + releaseRev = v: "V${v}"; + release."8.16".sha256 = "sha256-xcEbz4ZQ+U7mb0SEJopaczfoRc2GSgF2BGzUSWI0/HY="; + release."8.15".sha256 = "sha256-JfeiRZVnrjn3SQ87y6dj9DWNwCzrkK3HBogeZARUn9g="; + release."8.14".sha256 = "sha256-7kXk2pmYsTNodHA+Qts3BoMsewvzmCbYvxw9Sgwyvq0="; patchPhase = '' patchShebangs etc - patchShebangs hoqc hoqchk hoqdep hoqide hoqtop - ''; - - postBuild = '' - patchShebangs hoq-config - ''; - - # Currently, all the scripts like hoqc and hoqtop assume that the *.vo files are - # either (1) in the same directory as the scripts, or (2) in /usr/share/hott. - # We fulfill (1), which means that these files are only accessible via hoqtop, - # hoqc, etc and not via coqtop, coqc, etc. - postInstall = '' - mv $out/share/hott/* "$out/bin" - rmdir $out/share/hott - rmdir $out/share ''; meta = { diff --git a/pkgs/development/interpreters/yex-lang/default.nix b/pkgs/development/interpreters/yex-lang/default.nix index cc4e7f31f318..d01aa730a44d 100644 --- a/pkgs/development/interpreters/yex-lang/default.nix +++ b/pkgs/development/interpreters/yex-lang/default.nix @@ -24,6 +24,5 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ AndersonTorres ]; mainProgram = "yex"; platforms = platforms.unix; - broken = stdenv.isAarch64 && stdenv.isLinux; }; } diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 1c132b8742c5..323a9a2f8b46 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.11.07.00"; + version = "2022.11.28.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-RzVJuhyLZe5KGnNYUxkiAeYdQf4Amm8cAlV/12kmTj4="; + sha256 = "sha256-TI3uMlkssKtTvxqj9Et12aAjbHoV9FVBvrZr7oCFlIo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index ccc96a1aed3d..58fc0c07cd5b 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -29,7 +29,7 @@ # For enableQt, enableXM, enableOpenGLX11, enableRaytracerX11. , libGLU, libGL -, xlibsWrapper +, libXext , libXmu # For enablePython @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { ]; dontWrapQtApps = true; # no binaries - buildInputs = [ libGLU xlibsWrapper libXmu ] + buildInputs = [ libGLU libXext libXmu ] ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ] ++ lib.optionals enablePython [ boost_python python3 ]; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 08e4e81a1a44..63802ab5a554 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "12.0.0"; + version = "12.1.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fcmxN5lnhvunxgQmz5AFNBJQAmC0sR/ChOa2rlp52Kk="; + hash = "sha256-IhOufPNWxL9VHxzaW7OAQ1ncstxgw1Rfc4AbWFAnPJ8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 6bb3ef429d94..b42bb5e4e406 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.114"; + version = "2.1.117"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EfeoSik6vYQS4MAulfM2xfRUGYG308QzWAj4buCXX4U="; + hash = "sha256-Q1dz/xEQuJOrelDAB3YhISK6HPsqBQXGAx7Qgpqq+6w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index 333f544c151e..9613ccbeb06d 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -1,6 +1,9 @@ { lib , fetchFromGitHub , buildPythonPackage +, python +, meson +, ninja , psutil , pygobject3 , gtk3 @@ -11,15 +14,22 @@ buildPythonPackage rec { pname = "xapp"; - version = "2.2.2"; + version = "2.4.0"; + + format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = "python-xapp"; rev = version; - hash = "sha256-ntjJ/O6HiRZMsqsuQY4HLM4fBE0aWpn/L4n5YCRlhhg="; + hash = "sha256-qEK71cGNGmaThxlFVsfnLUTD83RTr8GP+501c4UbHCk="; }; + nativeBuildInputs = [ + meson + ninja + ]; + propagatedBuildInputs = [ psutil pygobject3 @@ -33,6 +43,13 @@ buildPythonPackage rec { substituteInPlace "xapp/os.py" --replace "/usr/bin/pkexec" "${polkit}/bin/pkexec" ''; + postInstall = '' + # This is typically set by pipInstallHook/eggInstallHook, + # so we have to do so manually when using meson. + # https://github.com/NixOS/nixpkgs/issues/175227 + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + ''; + doCheck = false; pythonImportsCheck = [ "xapp" ]; diff --git a/pkgs/development/tools/database/sqlcl/default.nix b/pkgs/development/tools/database/sqlcl/default.nix new file mode 100644 index 000000000000..733282cd4067 --- /dev/null +++ b/pkgs/development/tools/database/sqlcl/default.nix @@ -0,0 +1,70 @@ +{ lib, stdenv, makeWrapper, requireFile, unzip, jdk }: + +let + version = "22.3.1"; + fileVersion = "1032109-01"; +in + stdenv.mkDerivation { + + inherit version; + pname = "sqlcl"; + + src = requireFile rec { + url = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/download/"; + name = "V${fileVersion}.zip"; + message = '' + This Nix expression requires that ${name} already be part of the store. To + obtain it you need to + + - navigate to ${url} + - make sure that it says "Version ${version}" above the list of downloads + - if it does not, click on the "Previous Version" link below the + download and repeat until the version is correct. This is necessary + because as the time of this writing there exists no permanent link + for the current version yet. + Also consider updating this package yourself (you probably just need + to change the `version` variable and update the sha256 to the one of + the new file) or opening an issue at the nixpkgs repo. + - click "Download" + - sign in or create an oracle account if neccessary + - on the next page, click the "${name}" link + + and then add the file to the Nix store using either: + + nix-store --add-fixed sha256 ${name} + + or + + nix-prefetch-url --type sha256 file:///path/to/${name} + ''; + sha256 = "0yqj8m2zwl8m7zxrzjnbl2rqnl2imn5h1bfpnmklp03nkakbzjbn"; + }; + + nativeBuildInputs = [ makeWrapper unzip ]; + + unpackCmd = "unzip $curSrc"; + + installPhase = '' + mkdir -p $out/libexec + mv * $out/libexec/ + + makeWrapper $out/libexec/bin/sql $out/bin/sqlcl \ + --set JAVA_HOME ${jdk.home} \ + --chdir "$out/libexec/bin" + ''; + + meta = with lib; { + description = "Oracle's Oracle DB CLI client"; + longDescription = '' + Oracle SQL Developer Command Line (SQLcl) is a free command line + interface for Oracle Database. It allows you to interactively or batch + execute SQL and PL/SQL. SQLcl provides in-line editing, statement + completion, and command recall for a feature-rich experience, all while + also supporting your previously written SQL*Plus scripts. + ''; + homepage = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ misterio77 ]; + }; +} diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index 703a4f09314f..2ce74e23bba5 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.16.5"; + version = "0.17.7"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "sha256-b5d4tjXOrVRhkSTaUYkPmeG1kOcqeIF2pBFZgLYbUR8="; + sha256 = "sha256-ejDHQoL7YCcBQdS4zcavrHdyFoTIV0/FZPkaT15aFgo="; }; - cargoSha256 = "sha256-QxLIUIigBDfpiuAN4UwXbDdrx4ImxMK5tsoP6OBBY58="; + cargoSha256 = "sha256-Z5v/Jke50T8BI7nO0FVZHFFbOyN4PhQnrugrz4mZmdw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/clematis/default.nix b/pkgs/tools/misc/clematis/default.nix new file mode 100644 index 000000000000..c1997876aee9 --- /dev/null +++ b/pkgs/tools/misc/clematis/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "clematis"; + version = "2022-04-16"; + + src = fetchFromGitHub { + owner = "TorchedSammy"; + repo = "clematis"; + rev = "cbe74da084b9d3f6893f53721c27cd0f3a45fe93"; + sha256 = "sha256-TjoXHbY0vUQ2rhwdCJ/s/taRd9/MG0P9HaEw2BOIy/s="; + }; + + vendorSha256 = "sha256-YKu+7LFUoQwCH//URIswiaqa0rmnWZJvuSn/68G3TUA="; + + meta = with lib; { + description = "Discord rich presence for MPRIS music players."; + homepage = "https://github.com/TorchedSammy/Clematis"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ misterio77 ]; + }; +} diff --git a/pkgs/tools/security/jwx/default.nix b/pkgs/tools/security/jwx/default.nix index d124c504039a..46a011c4cdb6 100644 --- a/pkgs/tools/security/jwx/default.nix +++ b/pkgs/tools/security/jwx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jwx"; - version = "2.0.7"; + version = "2.0.8"; src = fetchFromGitHub { owner = "lestrrat-go"; repo = pname; rev = "v${version}"; - hash = "sha256-rnzRl7pvX/qBteEbgXrFCzAvtP9Izy6YAZJhy/4nXl4="; + hash = "sha256-eoXSSXh9NxWLgogrE2hDjsPxqeUmH54TnYXwhm7kpz4="; }; - vendorSha256 = "sha256-96Vxl84+xjRGxudBOaMX8LpRxfYqC2c+hVsipT0NLwE="; + vendorSha256 = "sha256-fbNnSjUOHnm/zxEGdhHQEKHgYp+nW1rgvMGJBm4b9IM="; sourceRoot = "source/cmd/jwx"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1baff06abe52..2c1609c21963 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1317,6 +1317,8 @@ with pkgs; cidrgrep = callPackage ../tools/text/cidrgrep { }; + clematis = callPackage ../tools/misc/clematis { }; + cope = callPackage ../tools/misc/cope { }; ejson2env = callPackage ../tools/admin/ejson2env { }; @@ -16865,6 +16867,8 @@ with pkgs; libsigrokdecode = callPackage ../development/tools/libsigrokdecode { }; + sqlcl = callPackage ../development/tools/database/sqlcl { }; + sigrok-firmware-fx2lafw = callPackage ../development/tools/sigrok-firmware-fx2lafw { }; cli11 = callPackage ../development/tools/misc/cli11 { }; @@ -36289,6 +36293,8 @@ with pkgs; root = callPackage ../applications/science/misc/root { python = python3; inherit (darwin.apple_sdk.frameworks) Cocoa CoreSymbolication OpenGL; + # https://github.com/NixOS/nixpkgs/issues/201254 + stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; }; root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 454b83aa1a94..b6f43f2ff4de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12050,6 +12050,7 @@ self: super: with self; { }; xapp = callPackage ../development/python-modules/xapp { + inherit (pkgs.buildPackages) meson; inherit (pkgs) gtk3 gobject-introspection polkit; inherit (pkgs.cinnamon) xapp; };