Skip to content

papers: 47.3 -> 48.2 #406739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MangoIV wants to merge 1 commit into from
Closed

papers: 47.3 -> 48.2 #406739

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions pkgs/by-name/pa/papers/package.nix
View file
Open in desktop

@jtojnar jtojnar May 13, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you want to get this into NixOS 25.05, you should target staging-next branch.

@MangoIV MangoIV May 13, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can I somehow change the base branch for this PR or do I have to change base, close the PR and open it again?

@jtojnar jtojnar May 13, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can do it in the edit button at the top of the PR.

But since this branch already contains commits that are not in staging-next branch, you will need to drop them (e.g. git rebase --interactive $(git merge-base HEAD staging-next)) and then force push.

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
appstream,
desktop-file-utils,
gtk4,
gtksourceview5,
glib,
pango,
gdk-pixbuf,
Expand All @@ -27,6 +28,8 @@
dbus,
gi-docgen,
libgxps,
libsysprof-capture,
libspelling,
withLibsecret ? true,
supportNautilus ? (!stdenv.hostPlatform.isDarwin),
libadwaita,
Expand All @@ -37,7 +40,7 @@

stdenv.mkDerivation (finalAttrs: {
pname = "papers";
version = "47.3";
version = "48.2";

outputs = [
"out"
Expand All @@ -47,19 +50,16 @@ stdenv.mkDerivation (finalAttrs: {

src = fetchurl {
url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz";
hash = "sha256-PlhTk+gef6D5r55U38hvYSa1w9hS6pDf3DumsHlSxKo=";
hash = "sha256-HpvFlhNCS/ZVIjxr3Khzri8d2ifPAtc0K/9bVZBRYG0=";
};

cargoRoot = "shell-rs";

cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs)
src
pname
version
cargoRoot
;
hash = "sha256-66pOdZxgzbvXkvF07rNvWtcF/dJ2+RuS24IeI/VWykE=";
hash = "sha256-1HFecOTn84m9lT166HlmYjqP+KN/ZOTWW4ztigrpqNQ=";
};

nativeBuildInputs = [
Expand All @@ -85,12 +85,15 @@ stdenv.mkDerivation (finalAttrs: {
gdk-pixbuf
glib
gtk4
gtksourceview5
Comment thread
MangoIV marked this conversation as resolved.
gsettings-desktop-schemas
libadwaita
libarchive
libgxps
Comment thread
MangoIV marked this conversation as resolved.
librsvg
libspectre
Comment thread
MangoIV marked this conversation as resolved.
libsysprof-capture
libspelling
pango
poppler
]
Expand All @@ -102,10 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
];

mesonFlags =
[
"-Dps=enabled"
]
++ lib.optionals (!withLibsecret) [
lib.optionals (!withLibsecret) [
"-Dkeyring=disabled"
]
++ lib.optionals (!supportNautilus) [
Expand Down