diff --git a/.github/STALE-BOT.md b/.github/STALE-BOT.md
index 0c5a21cc3524..dff787300d40 100644
--- a/.github/STALE-BOT.md
+++ b/.github/STALE-BOT.md
@@ -1,6 +1,7 @@
# Stale bot information
- Thanks for your contribution!
+- Our stale bot will never close an issue or PR.
- To remove the stale label, just leave a new comment.
- _How to find the right people to ping?_ → [`git blame`](https://git-scm.com/docs/git-blame) to the rescue! (or GitHub's history and blame buttons.)
- You can always ask for help on [our Discourse Forum](https://discourse.nixos.org/), [our Matrix room](https://matrix.to/#/#nix:nixos.org), or on the [#nixos IRC channel](https://web.libera.chat/#nixos).
diff --git a/.github/stale.yml b/.github/stale.yml
index b5e6ec93baf9..d6134c7ce112 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -5,6 +5,5 @@ exemptLabels:
- "1.severity: security"
- "2.status: never-stale"
staleLabel: "2.status: stale"
-markComment: |
- I marked this as stale due to inactivity. → [More info](https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md)
+markComment: false
closeComment: false
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 00cbe4f012cb..e5bd879e2c42 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -11,7 +11,6 @@ rec {
isi686 = { cpu = cpuTypes.i686; };
isx86_32 = { cpu = { family = "x86"; bits = 32; }; };
isx86_64 = { cpu = { family = "x86"; bits = 64; }; };
- isPowerPC = { cpu = cpuTypes.powerpc; };
isPower = { cpu = { family = "power"; }; };
isPower64 = { cpu = { family = "power"; bits = 64; }; };
isx86 = { cpu = { family = "x86"; }; };
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a5913541c407..6647f94f8f83 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5504,6 +5504,12 @@
githubId = 37965;
name = "Léo Stefanesco";
};
+ infinidoge = {
+ name = "Infinidoge";
+ email = "infinidoge@inx.moe";
+ github = "Infinidoge";
+ githubId = 22727114;
+ };
infinisil = {
email = "contact@infinisil.com";
matrix = "@infinisil:matrix.org";
@@ -14010,6 +14016,12 @@
githubId = 7040031;
name = "Yannik Sander";
};
+ yureien = {
+ email = "contact@sohamsen.me";
+ github = "Yureien";
+ githubId = 17357089;
+ name = "Soham Sen";
+ };
yuriaisaka = {
email = "yuri.aisaka+nix@gmail.com";
github = "yuriaisaka";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 79db7528e9f5..5f4e9940d2f7 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -2670,6 +2670,14 @@ cp /var/lib/redis/dump.rdb "/var/lib/redis-mastodon/dump.rdb"
like firefox.
+
+
+ The default scribus version is now 1.5,
+ while version 1.4 is still available as
+ scribus_1_4
+ (#172700).
+
+
The Nextcloud module now supports to create a Mysql database
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
index 79268b398e60..8bbb8665219a 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@@ -43,15 +43,16 @@
- Please remove this line when you add the first item since
- docbook requires the section to be non-empty
+ appvm,
+ Nix based app VMs. Available as
+ virtualisation.appvm.
Backward Incompatibilities
-
+
The isCompatible predicate checking CPU
@@ -69,6 +70,21 @@
compatible.
+
+
+ The isPowerPC predicate, found on
+ platform attrsets
+ (hostPlatform,
+ buildPlatform,
+ targetPlatform, etc) has been removed in
+ order to reduce confusion. The predicate was was defined such
+ that it matches only the 32-bit big-endian members of the
+ POWER/PowerPC family, despite having a name which would imply
+ a broader set of systems. If you were using this predicate,
+ you can replace foo.isPowerPC with
+ (with foo; isPower && is32bit && isBigEndian).
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index a558695b248d..1583140a6162 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -928,6 +928,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `nss` package was split into `nss_esr` and `nss_latest`, with `nss` being an alias for `nss_esr`. This was done to ease maintenance of `nss` and dependent high-profile packages like `firefox`.
+- The default `scribus` version is now 1.5, while version 1.4 is still available as `scribus_1_4` ([#172700](https://github.com/NixOS/nixpkgs/pull/172700)).
+
- The Nextcloud module now supports to create a Mysql database automatically
with `services.nextcloud.database.createLocally` enabled.
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md
index 7d2eacce57fe..5dc8e958c896 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -23,7 +23,7 @@ In addition to numerous new and upgraded packages, this release has the followin
## New Services {#sec-release-22.11-new-services}
-- Please remove this line when you add the first item since docbook requires the section to be non-empty
+- [appvm](https://github.com/jollheef/appvm), Nix based app VMs. Available as [virtualisation.appvm](options.html#opt-virtualisation.appvm.enable).
@@ -37,6 +37,9 @@ In addition to numerous new and upgraded packages, this release has the followin
`lib.systems.parse.isCompatible` still exists, but has changed semantically:
Architectures with differing endianness modes are *no longer considered compatible*.
+- The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`.
+
+
## Other Notable Changes {#sec-release-22.11-notable-changes}
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 1eaa940afb1f..d1ccc6c2072f 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -479,7 +479,7 @@ in
+ lib.optionalString (isx86_32 || isx86_64) "-Xbcj x86"
# Untested but should also reduce size for these platforms
+ lib.optionalString (isAarch32 || isAarch64) "-Xbcj arm"
- + lib.optionalString (isPowerPC) "-Xbcj powerpc"
+ + lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc"
+ lib.optionalString (isSparc) "-Xbcj sparc";
description = ''
Compression settings to use for the squashfs nix store.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7ca90fc3ec34..f7357036d69d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -137,6 +137,7 @@
./programs/captive-browser.nix
./programs/ccache.nix
./programs/cdemu.nix
+ ./programs/cfs-zen-tweaks.nix
./programs/chromium.nix
./programs/clickshare.nix
./programs/cnping.nix
@@ -1235,6 +1236,7 @@
./tasks/powertop.nix
./testing/service-runner.nix
./virtualisation/anbox.nix
+ ./virtualisation/appvm.nix
./virtualisation/build-vm.nix
./virtualisation/container-config.nix
./virtualisation/containerd.nix
diff --git a/nixos/modules/programs/cfs-zen-tweaks.nix b/nixos/modules/programs/cfs-zen-tweaks.nix
new file mode 100644
index 000000000000..f168662bbefe
--- /dev/null
+++ b/nixos/modules/programs/cfs-zen-tweaks.nix
@@ -0,0 +1,28 @@
+# CFS Zen Tweaks
+
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+
+ cfg = config.programs.cfs-zen-tweaks;
+
+in
+
+{
+
+ meta = {
+ maintainers = with maintainers; [ mkg20001 ];
+ };
+
+ options = {
+ programs.cfs-zen-tweaks.enable = mkEnableOption "CFS Zen Tweaks";
+ };
+
+ config = mkIf cfg.enable {
+ systemd.packages = [ pkgs.cfs-zen-tweaks ];
+
+ systemd.services.set-cfs-tweak.wantedBy = [ "multi-user.target" "suspend.target" "hibernate.target" "hybrid-sleep.target" "suspend-then-hibernate.target" ];
+ };
+}
diff --git a/nixos/modules/virtualisation/appvm.nix b/nixos/modules/virtualisation/appvm.nix
new file mode 100644
index 000000000000..24315a85d0ed
--- /dev/null
+++ b/nixos/modules/virtualisation/appvm.nix
@@ -0,0 +1,49 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.virtualisation.appvm;
+
+in {
+
+ options = {
+ virtualisation.appvm = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ This enables AppVMs and related virtualisation settings.
+ '';
+ };
+ user = mkOption {
+ type = types.str;
+ description = ''
+ AppVM user login. Currenly only AppVMs are supported for a single user only.
+ '';
+ };
+ };
+
+ };
+
+ config = mkIf cfg.enable {
+ virtualisation.libvirtd = {
+ enable = true;
+ qemu.verbatimConfig = ''
+ namespaces = []
+ user = "${cfg.user}"
+ group = "users"
+ remember_owner = 0
+ '';
+ };
+
+ users.users."${cfg.user}" = {
+ packages = [ pkgs.appvm ];
+ extraGroups = [ "libvirtd" ];
+ };
+
+ };
+
+}
+
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index a7f58e0d68bb..aa6c862641a4 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -23,12 +23,11 @@
, libpulseaudio
, gvfs
, libcdio
-, libechonest
, libspotify
, pcre
, projectm
, protobuf
-, qca2
+, qca-qt5
, pkg-config
, sparsehash
, config
@@ -87,13 +86,12 @@ let
gst_all_1.gst-plugins-bad
gst_all_1.gstreamer
gvfs
- libechonest
liblastfm
libpulseaudio
pcre
projectm
protobuf
- qca2
+ qca-qt5
qjson
qtbase
qtx11extras
diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix
index d983b9910e3b..4acb4c448f52 100644
--- a/pkgs/applications/blockchains/btcpayserver/default.nix
+++ b/pkgs/applications/blockchains/btcpayserver/default.nix
@@ -3,13 +3,13 @@
buildDotnetModule rec {
pname = "btcpayserver";
- version = "1.5.1";
+ version = "1.5.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-DcxRrVUen+JxMpiLDPfknpwCe962ifaekBeBnxJ0y88=";
+ sha256 = "sha256-jPR996MEBCTT3k12qOdW1AO8LxA/pvQnw0qiW6//lcs=";
};
projectFile = "BTCPayServer/BTCPayServer.csproj";
diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix
index ceefa656de30..0a070407a600 100644
--- a/pkgs/applications/blockchains/btcpayserver/deps.nix
+++ b/pkgs/applications/blockchains/btcpayserver/deps.nix
@@ -31,43 +31,43 @@
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.All";
- version = "1.3.6";
- sha256 = "0jdpqy6kxg0lyh4n88wsvrcqc0kk7s7zn5lw7ivwys716m69qrdl";
+ version = "1.3.8";
+ sha256 = "0xjhxxp8gc06ivbxjbmcacq4pq1c3l3b03pwd785kblxbh7d8zxj";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.Charge";
- version = "1.3.2";
- sha256 = "0v5rss6dg7297kq1frhn2pj9gd0rd8g1p5d316x5wkd4w7pmrm2w";
+ version = "1.3.4";
+ sha256 = "1ic2kz9mpgcjkmj6a0kscn3iqqp905a4768bn2fx454swpn2w6f9";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.CLightning";
- version = "1.3.2";
- sha256 = "0qs5p6pm54il23j8yysw0pzvrki37y6z8cd2gdknpz2f3wg7slm9";
- })
- (fetchNuGet {
- pname = "BTCPayServer.Lightning.Common";
- version = "1.2.7";
- sha256 = "1hz4bn3aw537r253ipdpa6sydwhb6dh3r82xp1jizn9a6mnw54x6";
+ version = "1.3.5";
+ sha256 = "0k9v28h0kvcbwxrjmalk14sna505li125i9aigcj6lddsg1d3xr7";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.Common";
version = "1.3.2";
sha256 = "119zplkc7iy9wc95iz1qnyi42fr99ar4hp8a11p708a22w941yi0";
})
+ (fetchNuGet {
+ pname = "BTCPayServer.Lightning.Common";
+ version = "1.3.4";
+ sha256 = "1bic7hxw731c0mkjgak0pwlrc7a4yqsr1xi7r3x04cz98nvdlqfc";
+ })
(fetchNuGet {
pname = "BTCPayServer.Lightning.Eclair";
- version = "1.3.2";
- sha256 = "08gw1gqng1khxzvvhlwsg6lw1w56ylilg738wi6cbcwy7vl7f6bb";
+ version = "1.3.4";
+ sha256 = "0im3nzr7ki0nlr5miy7i7b9869vi7frq5g1idwfshqincpgps05g";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.LNBank";
- version = "1.3.4";
- sha256 = "1vyz63pi5j31y8pz0b4hp9c4j249rszzfcymk3z3b2clwq32s4i4";
+ version = "1.3.6";
+ sha256 = "08myhnk41l1zc3ih1h8l6583g4spgfgl1i65sjp02ab9v4i9lalw";
})
(fetchNuGet {
pname = "BTCPayServer.Lightning.LND";
- version = "1.3.3";
- sha256 = "137azpxxmp2q69bp07ky1jsgnfy9lf0dg5ba8l654flvvrgxaq6y";
+ version = "1.3.5";
+ sha256 = "1k5i4x382hx3zwczpjvzpxv4nmmlnnlaxcy018bz7b4hvd0l49wq";
})
(fetchNuGet {
pname = "BuildBundlerMinifier";
@@ -181,8 +181,8 @@
})
(fetchNuGet {
pname = "LNURL";
- version = "0.0.15";
- sha256 = "1fy6ywzqs5y9c6d156v08dg8c6689d5xb4y1ar7gqgz6f3cl842n";
+ version = "0.0.18";
+ sha256 = "1dy0if091s8j0klv58v8xy0lnwyw0mxl89m09wkfcs0d4kzmjsrj";
})
(fetchNuGet {
pname = "MailKit";
@@ -209,6 +209,11 @@
version = "5.2.7";
sha256 = "1j0wbdmycj5xbk06p32f7xrddc40sbj3yca4d7ywg611yk26mvi1";
})
+ (fetchNuGet {
+ pname = "Microsoft.AspNet.WebApi.Client";
+ version = "5.2.8";
+ sha256 = "1dbwdbxr6npyc82zwl0g9bhifkpcqfzyhx1ihd8rzcmzprw70yfj";
+ })
(fetchNuGet {
pname = "Microsoft.AspNetCore.Connections.Abstractions";
version = "3.1.10";
@@ -349,11 +354,6 @@
version = "4.0.1";
sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj";
})
- (fetchNuGet {
- pname = "Microsoft.CSharp";
- version = "4.3.0";
- sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb";
- })
(fetchNuGet {
pname = "Microsoft.CSharp";
version = "4.5.0";
@@ -834,11 +834,6 @@
version = "6.0.18";
sha256 = "1dr669h68cx6yfzr3n97yzzwbgnsv5g2008diyxngdjm55nh3q9s";
})
- (fetchNuGet {
- pname = "NBitcoin";
- version = "6.0.3";
- sha256 = "1kfq1q86844ssp8myy5vmvg33h3x0p9gqrlc99fl9gm1vzjc723f";
- })
(fetchNuGet {
pname = "NBitcoin";
version = "6.0.8";
@@ -879,11 +874,6 @@
version = "3.0.14";
sha256 = "1njk1arrf8pbx0i0p3yww459i70p0fcx02vs0jnbb6znvcy4mvh6";
})
- (fetchNuGet {
- pname = "Newtonsoft.Json";
- version = "10.0.3";
- sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq";
- })
(fetchNuGet {
pname = "Newtonsoft.Json";
version = "11.0.2";
@@ -1081,18 +1071,18 @@
})
(fetchNuGet {
pname = "Selenium.Support";
- version = "3.141.0";
- sha256 = "1gqwzbfq7i9jz830b0jibsis0qfxs8sl10n1nja02c6s637cwzib";
+ version = "4.1.1";
+ sha256 = "1bcvvcybbw22yv9bz10jdms5za2ajczil9kzwjh9zs6yy41gqnwl";
})
(fetchNuGet {
pname = "Selenium.WebDriver.ChromeDriver";
- version = "100.0.4896.6000";
- sha256 = "1pfdvxjy4xiw1j7787lf07w9nr0dmj589vf6p4aqmk2cfz8j35c6";
+ version = "101.0.4951.4100";
+ sha256 = "0iqkcmfgzvir4h24qz3namgv7pc14hancb26gqa9j3izb1813ndf";
})
(fetchNuGet {
pname = "Selenium.WebDriver";
- version = "3.141.0";
- sha256 = "09g0zhz6n7yhxmxlrpzjdykfavr3m4z1gb4cmq304dw0gr8s89mq";
+ version = "4.1.1";
+ sha256 = "0gavlsanyiff9rxn34cinv0q2m3a8wh66ynlm9mxwkmmybzbbqz4";
})
(fetchNuGet {
pname = "Serilog.AspNetCore";
@@ -1209,16 +1199,6 @@
version = "6.0.0";
sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c";
})
- (fetchNuGet {
- pname = "System.Collections.NonGeneric";
- version = "4.3.0";
- sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k";
- })
- (fetchNuGet {
- pname = "System.Collections.Specialized";
- version = "4.3.0";
- sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20";
- })
(fetchNuGet {
pname = "System.Collections";
version = "4.0.11";
@@ -1229,21 +1209,6 @@
version = "4.3.0";
sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9";
})
- (fetchNuGet {
- pname = "System.ComponentModel.Primitives";
- version = "4.3.0";
- sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0";
- })
- (fetchNuGet {
- pname = "System.ComponentModel.TypeConverter";
- version = "4.3.0";
- sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x";
- })
- (fetchNuGet {
- pname = "System.ComponentModel";
- version = "4.3.0";
- sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb";
- })
(fetchNuGet {
pname = "System.Configuration.ConfigurationManager";
version = "4.5.0";
@@ -1304,11 +1269,6 @@
version = "4.0.11";
sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9";
})
- (fetchNuGet {
- pname = "System.Dynamic.Runtime";
- version = "4.3.0";
- sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk";
- })
(fetchNuGet {
pname = "System.Formats.Asn1";
version = "5.0.0";
@@ -1669,21 +1629,11 @@
version = "4.3.0";
sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z";
})
- (fetchNuGet {
- pname = "System.Runtime.Serialization.Formatters";
- version = "4.3.0";
- sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m";
- })
(fetchNuGet {
pname = "System.Runtime.Serialization.Primitives";
version = "4.1.1";
sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k";
})
- (fetchNuGet {
- pname = "System.Runtime.Serialization.Primitives";
- version = "4.3.0";
- sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf";
- })
(fetchNuGet {
pname = "System.Runtime";
version = "4.1.0";
@@ -1959,11 +1909,6 @@
version = "4.0.1";
sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1";
})
- (fetchNuGet {
- pname = "System.Xml.XmlDocument";
- version = "4.3.0";
- sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi";
- })
(fetchNuGet {
pname = "System.Xml.XPath.XmlDocument";
version = "4.0.1";
diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix
index b7a517c3dbef..4d684f6a9350 100644
--- a/pkgs/applications/blockchains/nbxplorer/default.nix
+++ b/pkgs/applications/blockchains/nbxplorer/default.nix
@@ -2,13 +2,13 @@
buildDotnetModule rec {
pname = "nbxplorer";
- version = "2.3.20";
+ version = "2.3.26";
src = fetchFromGitHub {
owner = "dgarage";
repo = "NBXplorer";
rev = "v${version}";
- sha256 = "sha256-cAko5s1bFSI7HOcXg/tZtdMMe0S9zkRBeZ6bispxgwc=";
+ sha256 = "sha256-PaunSwbIf9hGmZeS8ZI4M0C6T76bLCalnS4/x9TWrtY=";
};
projectFile = "NBXplorer/NBXplorer.csproj";
diff --git a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh
index 2d3f41f25866..2a862c31c881 100755
--- a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh
+++ b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p dotnet-sdk_3
+#!nix-shell -i bash -p dotnet-sdk_6
set -euo pipefail
# Writes deps for dotnet package in $pkgSrc to $depsFile.
diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh
index 1ca9ef3444b5..033a7bbf4b6f 100755
--- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh
+++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh
@@ -1,11 +1,13 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 git gnupg nixFlakes
+#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_6 git gnupg nixFlakes
set -euo pipefail
# This script uses the following env vars:
# getVersionFromTags
# refetch
+trap 'echo "Error at ${BASH_SOURCE[0]}:$LINENO"' ERR
+
pkgName=$1
depsFile=$2
customFlags=$3
diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix
index ce8d32f465e2..fc6ddd93567c 100644
--- a/pkgs/applications/editors/apostrophe/default.nix
+++ b/pkgs/applications/editors/apostrophe/default.nix
@@ -13,14 +13,14 @@ let
in stdenv.mkDerivation rec {
pname = "apostrophe";
- version = "2.6.2";
+ version = "2.6.3";
src = fetchFromGitLab {
owner = "World";
repo = pname;
domain = "gitlab.gnome.org";
rev = "v${version}";
- sha256 = "sha256-At3kaVJE07j/QWXerYnvxleE2Cbn0FjlBXH69tkuFys=";
+ sha256 = "sha256-RBrrG1TO810LidIelYGNaK7PjDq84D0cA8VcMojAW3M=";
};
nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils
diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix
index cc1d08cc3f9b..10fb4e0a97e6 100644
--- a/pkgs/applications/editors/setzer/default.nix
+++ b/pkgs/applications/editors/setzer/default.nix
@@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [
pygobject3
pyxdg
- pdfminer
+ pdfminer-six
pycairo
pexpect
];
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index ac8ae6885625..21c1187c4ad4 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1700,7 +1700,8 @@ let
};
};
- matklad.rust-analyzer = callPackage ./rust-analyzer { };
+ rust-lang.rust-analyzer = callPackage ./rust-analyzer { };
+ matklad.rust-analyzer = self.rust-lang.rust-analyzer; # Previous publisher
ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension {
meta = with lib; {
diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix
index b553640d144e..9a2f7e07102f 100644
--- a/pkgs/applications/emulators/retroarch/cores.nix
+++ b/pkgs/applications/emulators/retroarch/cores.nix
@@ -672,7 +672,7 @@ in
license = "MAME";
extraBuildInputs = [ libpng SDL ];
- SDL_CONFIG = "${SDL.dev}/bin/sdl-config";
+ SDL_CONFIG = "${lib.getDev SDL}/bin/sdl-config";
dontAddPrefix = true;
configurePlatforms = [ ];
makeFlags = lib.optional stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ];
diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix
index 9d64a31dded9..388d166c5814 100644
--- a/pkgs/applications/misc/cpu-x/default.nix
+++ b/pkgs/applications/misc/cpu-x/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "cpu-x";
- version = "4.3.0";
+ version = "4.3.1";
src = fetchFromGitHub {
owner = "X0rg";
repo = "CPU-X";
rev = "v${version}";
- sha256 = "sha256-pYinePs7WFVfRMNYTY+Is8B+cv5w6IF7Ce+9v/mLRYg=";
+ sha256 = "sha256-9oRNyspFmvIG63aJ8qyaVmi1GW1eW+Rg0+z8la3LuKA=";
};
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ];
diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix
index 99657d60bd70..e73c6e7b5dc3 100644
--- a/pkgs/applications/misc/visidata/default.nix
+++ b/pkgs/applications/misc/visidata/default.nix
@@ -14,7 +14,7 @@
, pyshp
, fonttools
, pyyaml
-, pdfminer
+, pdfminer-six
, vobject
, tabulate
, wcwidth
@@ -55,7 +55,7 @@ buildPythonApplication rec {
pyyaml
#namestand
#datapackage
- pdfminer
+ pdfminer-six
#tabula
vobject
tabulate
diff --git a/pkgs/applications/networking/breitbandmessung/default.nix b/pkgs/applications/networking/breitbandmessung/default.nix
index 31f33be38670..ff14695cce84 100644
--- a/pkgs/applications/networking/breitbandmessung/default.nix
+++ b/pkgs/applications/networking/breitbandmessung/default.nix
@@ -1,32 +1,12 @@
{ lib
, stdenv
-, alsa-lib
-, at-spi2-atk
-, at-spi2-core
-, atk
-, autoPatchelfHook
-, cairo
-, cups
-, dbus
-, dpkg
-, expat
, fetchurl
-, gdk-pixbuf
-, glib
-, gtk3
-, libdrm
-, libxkbcommon
+, dpkg
+, electron_16
, makeWrapper
-, mesa
, nixosTests
-, nspr
-, nss
-, pango
-, pciutils
-, systemd
+, nodePackages
, undmg
-, writeShellScriptBin
-, xorg
}:
let
@@ -34,19 +14,6 @@ let
version = "3.1.0";
- # At first start, the program checks for supported operating systems by calling `lsb_release -a`
- # and only runs when it finds Debian/Ubuntu. So we present us as Debian an make it happy.
- fake-lsb-release = writeShellScriptBin "lsb_release" ''
- echo "Distributor ID: Debian"
- echo "Description: Debian GNU/Linux 10 (buster)"
- echo "Release: 10"
- echo "Codename: buster"
- '';
-
- binPath = lib.makeBinPath [
- fake-lsb-release
- ];
-
systemArgs = rec {
x86_64-linux = rec {
src = fetchurl {
@@ -54,68 +21,41 @@ let
sha256 = "sha256-jSP+H9ej9Wd+swBZSy9uMi2ExSTZ191FGZhqaocTl7w=";
};
- dontUnpack = true;
-
nativeBuildInputs = [
- autoPatchelfHook
dpkg
makeWrapper
+ nodePackages.asar
];
- buildInputs = runtimeDependencies;
-
- runtimeDependencies = [
- alsa-lib
- at-spi2-atk
- at-spi2-core
- atk
- cairo
- cups
- dbus
- expat
- gdk-pixbuf
- glib
- gtk3
- libdrm
- libxkbcommon
- mesa
- nspr
- nss
- pango
- pciutils
- systemd
- xorg.libX11
- xorg.libXcomposite
- xorg.libXdamage
- xorg.libXext
- xorg.libXfixes
- xorg.libXrandr
- xorg.libxcb
- xorg.libxshmfence
- ];
+ unpackPhase = "dpkg-deb -x $src .";
installPhase = ''
- dpkg-deb -x $src $out
mkdir -p $out/bin
+ mv usr/share $out/share
+ mkdir -p $out/share/breitbandmessung/resources
- chmod -R g-w $out
+ asar e opt/Breitbandmessung/resources/app.asar $out/share/breitbandmessung/resources
- addAutoPatchelfSearchPath --no-recurse $out/opt/Breitbandmessung
- autoPatchelfFile $out/opt/Breitbandmessung/breitbandmessung
+ # At first start, the program checks for supported operating systems by using the `bizzby-lsb-release`
+ # module and only runs when it finds Debian/Ubuntu. So we present us as Debian and make it happy.
+ cat < $out/share/breitbandmessung/resources/node_modules/bizzby-lsb-release/lib/lsb-release.js
+ module.exports = function release() {
+ return {
+ distributorID: "Debian",
+ description: "Debian GNU/Linux 10 (buster)",
+ release: "10",
+ codename: "buster"
+ }
+ }
+ EOF
- makeWrapper $out/opt/Breitbandmessung/breitbandmessung $out/bin/breitbandmessung \
- --prefix PATH : ${binPath}
-
- mv $out/usr/share $out/share
- rmdir $out/usr
+ makeWrapper ${electron_16}/bin/electron $out/bin/breitbandmessung \
+ --add-flags $out/share/breitbandmessung/resources/build/electron.js
# Fix the desktop link
substituteInPlace $out/share/applications/breitbandmessung.desktop \
--replace /opt/Breitbandmessung $out/bin
'';
-
- dontAutoPatchelf = true;
- dontPatchELF = true;
};
x86_64-darwin = {
diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix
index 54b8a1d31569..a89d2bb36e87 100644
--- a/pkgs/applications/networking/browsers/asuka/default.nix
+++ b/pkgs/applications/networking/browsers/asuka/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "asuka";
- version = "0.8.3";
+ version = "0.8.5";
src = fetchFromSourcehut {
owner = "~julienxx";
repo = pname;
rev = version;
- sha256 = "sha256-l3SgIyApASllHVhAc2yoUYc2x7QtCdzBrMYaXCp65m8=";
+ sha256 = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M=";
};
- cargoSha256 = "sha256-twECZM1KcWeQptLhlKlIz16r3Q/xMb0e+lBG+EX79mU=";
+ cargoSha256 = "sha256-XrFpvH3qiMvpgbH7Q+KC1zFAqJT4rjxux6Q5KLY2ufI=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 993f95a6bfff..cfd6b122d6cc 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -166,7 +166,7 @@ let
./patches/m102-fix-dawn_version_generator-failure.patch
];
- postPatch = optionalString (chromiumVersionAtLeast "102") ''
+ postPatch = ''
# Workaround/fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1313361:
substituteInPlace BUILD.gn \
--replace '"//infra/orchestrator:orchestrator_all",' ""
@@ -174,7 +174,6 @@ let
substituteInPlace build/config/compiler/BUILD.gn \
--replace '"-Xclang",' "" \
--replace '"-no-opaque-pointers",' ""
- '' + ''
# remove unused third-party
for lib in ${toString gnSystemLibraries}; do
if [ -d "third_party/$lib" ]; then
@@ -194,7 +193,7 @@ let
--replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
fi
chmod -x third_party/webgpu-cts/src/tools/run_deno
- ${lib.optionalString (chromiumVersionAtLeast "102") "chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno"}
+ chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index ba54f13ef133..6cc8e60a39c1 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -32,9 +32,9 @@
}
},
"dev": {
- "version": "103.0.5060.13",
- "sha256": "1y7nadfmw4yxc2za7ln3h7xywlzdiscmsa8kjar17gmqz6ic69id",
- "sha256bin64": "0crs07sjqhgpr22vxa7c52ai8xvxp6c4cs82kaqzc5cgg97076gq",
+ "version": "103.0.5060.24",
+ "sha256": "1vdnq7vd0jdxkpc00xwvvk1mmyq2hcydms64l16nv3v8jgvizrha",
+ "sha256bin64": "0590ffrbpnd4v8z1wzn1baqvj59gx2yc3zp3qvhvmfrdmxz9i9b4",
"deps": {
"gn": {
"version": "2022-05-11",
@@ -45,19 +45,19 @@
}
},
"ungoogled-chromium": {
- "version": "101.0.4951.64",
- "sha256": "1xyqm32y9v1hn8ji6qfw6maynqgg3266j58dq4x4aqsm2gj9cn4w",
- "sha256bin64": "14ijrj7h2y72ppyysz6jv40c01lbnan7z69cl24asch2zjlgwv8v",
+ "version": "102.0.5005.61",
+ "sha256": "07vbi3gn9g4n04b2qi2hm34r122snrqaifa46yk3pyh1d79rfdqs",
+ "sha256bin64": "100n8k3d9k5bq58irc36ig6m5m0lxggffyk4crqqqcib2anqd0zv",
"deps": {
"gn": {
- "version": "2022-03-14",
+ "version": "2022-04-14",
"url": "https://gn.googlesource.com/gn",
- "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb",
- "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"
+ "rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167",
+ "sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h"
},
"ungoogled-patches": {
- "rev": "101.0.4951.64-1",
- "sha256": "0k7w6xvjf1yzyak9ywvcdw762d8zbx6d8haz35q87jz0mxfn2mr3"
+ "rev": "102.0.5005.61-1",
+ "sha256": "1hlyi6k894blkkqmqsizx72bag2vj6wlpza0fvi8db5wp6i5b58g"
}
}
}
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index 84f46f1b60d8..1daa5d351a8c 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -4,7 +4,7 @@
, # Incompatible licenses, LGPLv3 - GPLv2
enableGuile ? false, guile ? null
, enablePython ? false, python ? null
-, enablePerl ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null
+, enablePerl ? (!stdenv.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null
# re-add javascript support when upstream supports modern spidermonkey
}:
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 642fbc5ed7b2..32b785c5cfb2 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
- version = "3.3.13";
+ version = "3.3.14";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
- hash = "sha256-QfsHVP2FIp2kn6blKbeerNxUOWXbxpgRkSBGorViVYs=";
+ hash = "sha256-v52QVyd2Rl1nixKD1TY1YQaSPKRsbw4BCtfRly9aMrM=";
};
postPatch = ''
diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix
index 90a0cd6f53a3..51279394df5c 100644
--- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix
+++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "alfaview";
- version = "8.44.0";
+ version = "8.45.0";
src = fetchurl {
url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb";
- sha256 = "sha256-6BhhUfULtCUO5jZFF+HxGuFCg0XojQ0NJUXHxMtnwN4=";
+ sha256 = "sha256-qSLKPtBjhbPGX9axbQnyCb+Tcq47xDMvVGj18hEPw28=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index aad4b24d7404..24b65db364d0 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -43,21 +43,6 @@ python3.pkgs.buildPythonApplication rec {
gettext wrapGAppsHook
];
- # Workaround for https://dev.gajim.org/gajim/gajim/-/issues/10719.
- # We don't use plugin release URL because it's updated in place.
- plugins = fetchFromGitLab {
- domain = "dev.gajim.org";
- owner = "gajim";
- repo = "gajim-plugins";
- rev = "fea522e4360cec6ceacbf1df92644ab3343d4b99";
- sha256 = "sha256-CmwEiLsdldoOfgHfWL/5hf/dp0HEDNAIlc5N0Np20KE=";
- };
-
- postPatch = ''
- mkdir -p gajim/data/plugins
- cp -r $plugins/plugin_installer gajim/data/plugins
- '';
-
dontWrapGApps = true;
preFixup = ''
@@ -65,7 +50,7 @@ python3.pkgs.buildPythonApplication rec {
'';
propagatedBuildInputs = with python3.pkgs; [
- nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging
+ nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging gssapi
] ++ lib.optionals enableE2E [ pycrypto python-gnupg ]
++ lib.optional enableRST docutils
++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
@@ -88,7 +73,7 @@ python3.pkgs.buildPythonApplication rec {
description = "Jabber client written in PyGTK";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ raskin abbradar ];
- downloadPage = "http://gajim.org/downloads.php";
+ downloadPage = "http://gajim.org/download/";
platforms = lib.platforms.linux;
};
}
diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix
index b522b5190639..4bc80b84b847 100644
--- a/pkgs/applications/networking/mailreaders/mailspring/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix
@@ -21,11 +21,11 @@
stdenv.mkDerivation rec {
pname = "mailspring";
- version = "1.10.2";
+ version = "1.10.3";
src = fetchurl {
url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb";
- sha256 = "sha256-6KHhkmHWhj/AgECYqNuJ0iSPEYyuBDac/3fW6J0fgTg=";
+ sha256 = "sha256-+H2KeaRBApveUG6Vz+Z8LWpmNpZ4lwyeX1LK0AKx/bw=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/wgcf/default.nix b/pkgs/applications/networking/wgcf/default.nix
new file mode 100644
index 000000000000..3487ad6395cf
--- /dev/null
+++ b/pkgs/applications/networking/wgcf/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "wgcf";
+ version = "2.2.14";
+
+ src = fetchFromGitHub {
+ owner = "ViRb3";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-6V4fIoFB0fuCEu1Rj8QWGDNdgystrD/gefjbshvxVsw=";
+ };
+
+ subPackages = ".";
+
+ vendorSha256 = "sha256-NGlV/qcnUlNLvt3uVRdfx+lUDgqAEBEowW9WIHBY+AI=";
+
+ meta = with lib; {
+ description = "Cross-platform, unofficial CLI for Cloudflare Warp";
+ homepage = "https://github.com/ViRb3/wgcf";
+ license = licenses.mit;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ yureien ];
+ };
+}
diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix
index 358b66fb589a..2b07b9bd47b3 100644
--- a/pkgs/applications/office/paperless-ngx/default.nix
+++ b/pkgs/applications/office/paperless-ngx/default.nix
@@ -92,7 +92,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
numpy
ocrmypdf
pathvalidate
- pdfminer
+ pdfminer-six
pikepdf
pillow
pluggy
diff --git a/pkgs/applications/office/scribus/1_4.nix b/pkgs/applications/office/scribus/1_4.nix
new file mode 100644
index 000000000000..a6427d0f890b
--- /dev/null
+++ b/pkgs/applications/office/scribus/1_4.nix
@@ -0,0 +1,52 @@
+{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2
+, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg
+, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }:
+
+let
+ icon = fetchurl {
+ url = "https://gist.githubusercontent.com/ejpcmac/a74b762026c9bc4000be624c3d085517/raw/18edc497c5cb6fdeef1c8aede37a0ee68413f9d3/scribus-icon-centered.svg";
+ sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3";
+ };
+
+ pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
+in stdenv.mkDerivation rec {
+ pname = "scribus";
+ version = "1.4.8";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992";
+ };
+
+ nativeBuildInputs = [ pkg-config cmake ];
+ buildInputs = with xorg;
+ [ freetype lcms libtiff libxml2 libart_lgpl qt4
+ pythonEnv cups fontconfig
+ libjpeg zlib libpng podofo hunspell cairo
+ boost # for internal 2geom library
+ libXaw libXext libX11 libXtst libXi libXinerama
+ libpthreadstubs libXau libXdmcp
+ imagemagick # To build the icon
+ ];
+
+ postPatch = ''
+ substituteInPlace scribus/util_ghostscript.cpp \
+ --replace 'QString gsName("gs");' \
+ 'QString gsName("${ghostscript}/bin/gs");'
+ '';
+
+ postInstall = ''
+ for i in 16 24 48 64 96 128 256 512; do
+ mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
+ convert -background none -resize ''${i}x''${i} ${icon} $out/share/icons/hicolor/''${i}x''${i}/apps/scribus.png
+ done
+ '';
+
+ meta = {
+ maintainers = [ lib.maintainers.marcweber ];
+ platforms = lib.platforms.linux;
+ description = "Desktop Publishing (DTP) and Layout program for Linux";
+ homepage = "https://www.scribus.net";
+ license = lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index a6427d0f890b..d3f706bbf054 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/pkgs/applications/office/scribus/default.nix
@@ -1,52 +1,143 @@
-{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2
-, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg
-, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }:
+{ boost
+, cairo
+, cmake
+, cups
+, fetchurl
+, fetchpatch
+, fontconfig
+, freetype
+, harfbuzzFull
+, hunspell
+, lcms2
+, libjpeg
+, libtiff
+, libxml2
+, mkDerivation
+, pixman
+, pkg-config
+, podofo
+, poppler
+, poppler_data
+, python3
+, qtbase
+, qtimageformats
+, qttools
+, lib
+}:
let
- icon = fetchurl {
- url = "https://gist.githubusercontent.com/ejpcmac/a74b762026c9bc4000be624c3d085517/raw/18edc497c5cb6fdeef1c8aede37a0ee68413f9d3/scribus-icon-centered.svg";
- sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3";
- };
-
- pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
-in stdenv.mkDerivation rec {
+ pythonEnv = python3.withPackages (
+ ps: [
+ ps.pillow
+ ps.tkinter
+ ]
+ );
+in
+mkDerivation rec {
pname = "scribus";
- version = "1.4.8";
+
+ version = "1.5.7";
src = fetchurl {
- url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz";
- sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992";
+ url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz";
+ sha256 = "sha256-MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4=";
};
- nativeBuildInputs = [ pkg-config cmake ];
- buildInputs = with xorg;
- [ freetype lcms libtiff libxml2 libart_lgpl qt4
- pythonEnv cups fontconfig
- libjpeg zlib libpng podofo hunspell cairo
- boost # for internal 2geom library
- libXaw libXext libX11 libXtst libXi libXinerama
- libpthreadstubs libXau libXdmcp
- imagemagick # To build the icon
+ patches = [
+ # For harfbuzz >= 2.9.0
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch";
+ sha256 = "sha256-noRCaN63ZYFfXmAluEYXdFPNOk3s5W3KBAsLU1Syxv4=";
+ })
+ # For harfbuzz >= 3.0
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch";
+ sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y=";
+ })
+ # For Poppler 22.02
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch";
+ sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw=";
+ })
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch";
+ sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c=";
+ })
+ # For Poppler 22.03
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/553d1fd5f76ffb3743583b88c78a7232b076a965.patch";
+ sha256 = "56JrEG3eCzyALTH04yjzurKRj2PocpjO6b4PusMRxjY=";
+ })
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/1f82e38be0782b065910f5fb4cece23f690349ae.patch";
+ sha256 = "qektUfel5KeA327D3THyqi8dznP1SQQFToUC5Kd0+W4=";
+ })
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch";
+ sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds=";
+ })
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/e013e8126d2100e8e56dea5b836ad43275429389.patch";
+ sha256 = "+siPNtJq9Is9V2PgADeQJB+b4lkl5g8uk6zKBu10Jqw=";
+ })
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch";
+ sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ=";
+ })
+ # For Poppler 22.04
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch";
+ sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw=";
+ })
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
+
+ buildInputs = [
+ boost
+ cairo
+ cups
+ fontconfig
+ freetype
+ harfbuzzFull
+ hunspell
+ lcms2
+ libjpeg
+ libtiff
+ libxml2
+ pixman
+ podofo
+ poppler
+ poppler_data
+ pythonEnv
+ qtbase
+ qtimageformats
+ qttools
+ ];
+
+ cmakeFlags = [
+ # poppler uses std::optional
+ "-DWANT_CPP17=ON"
+ ];
+
+ meta = with lib; {
+ maintainers = with maintainers; [
+ erictapen
+ kiwi
];
-
- postPatch = ''
- substituteInPlace scribus/util_ghostscript.cpp \
- --replace 'QString gsName("gs");' \
- 'QString gsName("${ghostscript}/bin/gs");'
- '';
-
- postInstall = ''
- for i in 16 24 48 64 96 128 256 512; do
- mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
- convert -background none -resize ''${i}x''${i} ${icon} $out/share/icons/hicolor/''${i}x''${i}/apps/scribus.png
- done
- '';
-
- meta = {
- maintainers = [ lib.maintainers.marcweber ];
- platforms = lib.platforms.linux;
+ platforms = platforms.linux;
description = "Desktop Publishing (DTP) and Layout program for Linux";
homepage = "https://www.scribus.net";
- license = lib.licenses.gpl2;
+ # There are a lot of licenses...
+ # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19
+ license = with licenses; [
+ bsd3
+ gpl2Plus
+ mit
+ publicDomain
+ ];
};
}
diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix
deleted file mode 100644
index d3f706bbf054..000000000000
--- a/pkgs/applications/office/scribus/unstable.nix
+++ /dev/null
@@ -1,143 +0,0 @@
-{ boost
-, cairo
-, cmake
-, cups
-, fetchurl
-, fetchpatch
-, fontconfig
-, freetype
-, harfbuzzFull
-, hunspell
-, lcms2
-, libjpeg
-, libtiff
-, libxml2
-, mkDerivation
-, pixman
-, pkg-config
-, podofo
-, poppler
-, poppler_data
-, python3
-, qtbase
-, qtimageformats
-, qttools
-, lib
-}:
-
-let
- pythonEnv = python3.withPackages (
- ps: [
- ps.pillow
- ps.tkinter
- ]
- );
-in
-mkDerivation rec {
- pname = "scribus";
-
- version = "1.5.7";
-
- src = fetchurl {
- url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz";
- sha256 = "sha256-MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4=";
- };
-
- patches = [
- # For harfbuzz >= 2.9.0
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch";
- sha256 = "sha256-noRCaN63ZYFfXmAluEYXdFPNOk3s5W3KBAsLU1Syxv4=";
- })
- # For harfbuzz >= 3.0
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch";
- sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y=";
- })
- # For Poppler 22.02
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch";
- sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw=";
- })
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch";
- sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c=";
- })
- # For Poppler 22.03
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/553d1fd5f76ffb3743583b88c78a7232b076a965.patch";
- sha256 = "56JrEG3eCzyALTH04yjzurKRj2PocpjO6b4PusMRxjY=";
- })
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/1f82e38be0782b065910f5fb4cece23f690349ae.patch";
- sha256 = "qektUfel5KeA327D3THyqi8dznP1SQQFToUC5Kd0+W4=";
- })
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch";
- sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds=";
- })
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/e013e8126d2100e8e56dea5b836ad43275429389.patch";
- sha256 = "+siPNtJq9Is9V2PgADeQJB+b4lkl5g8uk6zKBu10Jqw=";
- })
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch";
- sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ=";
- })
- # For Poppler 22.04
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch";
- sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw=";
- })
- ];
-
- nativeBuildInputs = [
- cmake
- pkg-config
- ];
-
- buildInputs = [
- boost
- cairo
- cups
- fontconfig
- freetype
- harfbuzzFull
- hunspell
- lcms2
- libjpeg
- libtiff
- libxml2
- pixman
- podofo
- poppler
- poppler_data
- pythonEnv
- qtbase
- qtimageformats
- qttools
- ];
-
- cmakeFlags = [
- # poppler uses std::optional
- "-DWANT_CPP17=ON"
- ];
-
- meta = with lib; {
- maintainers = with maintainers; [
- erictapen
- kiwi
- ];
- platforms = platforms.linux;
- description = "Desktop Publishing (DTP) and Layout program for Linux";
- homepage = "https://www.scribus.net";
- # There are a lot of licenses...
- # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19
- license = with licenses; [
- bsd3
- gpl2Plus
- mit
- publicDomain
- ];
- };
-}
diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index 9571588040b3..fc4e822e208a 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qalculate-gtk";
- version = "4.1.1";
+ version = "4.2.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-gtk";
rev = "v${version}";
- sha256 = "sha256-itYNKcdWYMoqlvZ7CYJ6WMv7rS/y1SVdt3O7ahkjPOk=";
+ sha256 = "sha256-SphruQ/b8z5S/wKb9yhbEy9/pwiY+frZltdIYj0CJBM=";
};
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 44ae40411213..f399099d4dac 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -172,6 +172,6 @@ let
in
# A wrapper around sage that makes sure sage finds its docs (if they were build).
callPackage ./sage.nix {
- inherit sage-tests sage-with-env sagedoc jupyter-kernel-specs;
+ inherit sage-tests sage-with-env sagedoc jupyter-kernel-definition jupyter-kernel-specs;
inherit withDoc requireSageTests;
}
diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix
index 78fd8d598d0b..87f3e1137b19 100644
--- a/pkgs/applications/science/math/sage/sage.nix
+++ b/pkgs/applications/science/math/sage/sage.nix
@@ -2,6 +2,7 @@
, makeWrapper
, sage-tests
, sage-with-env
+, jupyter-kernel-definition
, jupyter-kernel-specs
, sagedoc
, withDoc
@@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
quicktest = sage-tests.override { longTests = false; timeLimit = 600; }; # as many tests as possible in ~10m
doc = sagedoc;
lib = sage-with-env.env.lib;
- kernelspec = jupyter-kernel-specs.definition.sagemath;
+ kernelspec = jupyter-kernel-definition;
};
meta = with lib; {
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
index b2f5346bbfce..26632abe4694 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ghq";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "x-motemen";
repo = "ghq";
rev = "v${version}";
- sha256 = "sha256-86ZFKkzDAhx3UYWxreQI2OJJmqGnqaH2TgwQunuYhv4=";
+ sha256 = "sha256-tGublfC6EeY3T/45lxmsm5zsmlgq/guS64OutAWy6AY=";
};
- vendorSha256 = "sha256-5Eth9v98z1gxf1Fz5Lbn2roX7dSBmA7GRzg8uvT0hTI=";
+ vendorSha256 = "sha256-ZUnnvZERWXnOs4hybw8JDlGdM7QFaMfs6o3SYy0UwTM=";
doCheck = false;
diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index 8871ac2306ef..936660cf7984 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "git-lfs";
- version = "3.1.4";
+ version = "3.2.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "git-lfs";
repo = "git-lfs";
- sha256 = "sha256-dGqb7gw7l2SPGwhHIFbEq6XqMB9QRw3+3Pfbk2S4kW4=";
+ sha256 = "sha256-3gVUPfZs5GViEA3D7Zm5NdxhuEz9DhwPLoQqHFdGCrI=";
};
goPackagePath = "github.com/git-lfs/git-lfs";
@@ -30,7 +30,7 @@ buildGoPackage rec {
'';
postInstall = ''
- installManPage go/src/${goPackagePath}/man/*.{1,5}
+ installManPage go/src/${goPackagePath}/man/man*/*
'';
meta = with lib; {
diff --git a/pkgs/applications/virtualization/appvm/0001-Remove-menu-bar.patch b/pkgs/applications/virtualization/appvm/0001-Remove-menu-bar.patch
new file mode 100644
index 000000000000..5a15686353a3
--- /dev/null
+++ b/pkgs/applications/virtualization/appvm/0001-Remove-menu-bar.patch
@@ -0,0 +1,12 @@
+diff --git a/src/resources/ui/virt-viewer.ui b/src/resources/ui/virt-viewer.ui
+index 430f879..68856fc 100644
+--- a/src/resources/ui/virt-viewer.ui
++++ b/src/resources/ui/virt-viewer.ui
+@@ -137,7 +137,6 @@
+
+
+