Skip to content

staging-next 2022-07-21#182386

Merged
vcunat merged 822 commits intomasterfrom
staging-next
Jul 27, 2022
Merged

staging-next 2022-07-21#182386
vcunat merged 822 commits intomasterfrom
staging-next

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Jul 21, 2022

mweinelt added 30 commits July 21, 2022 22:35
@jtojnar
Copy link
Member

jtojnar commented Jul 25, 2022

The e-d-s failure looks like something caused by the recent g-i fiddling, cc @Artturin

inherit version;
sha256 = "sha256-ConK3ABipeU2ZN3gQ/bAlxcrjBxfAJRJAJUoL/mZWl8=";
};
});
Copy link
Member

Choose a reason for hiding this comment

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

We don't override packages inside python-modules, because it is easily results in conflicts when multiple packages depend on different versions while only one can claim the name inside the python environment.

If you want to fix matrix-synapse OTOH, an override there would be acceptable.

Copy link
Contributor

Choose a reason for hiding this comment

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

This is only used in tests (and in checkInputs), so I think it's fine here?

Copy link
Member

Choose a reason for hiding this comment

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

Ah well, if it's not propagated that should be fine.

Copy link
Contributor

Choose a reason for hiding this comment

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

It is not, and it doesn't look like anything in nixpkgs uses both pysaml2 and pymongo at the same time.

Copy link
Member

Choose a reason for hiding this comment

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

it doesn't look like anything in nixpkgs uses both pysaml2 and pymongo at the same time.

but something could use it in the future. Don't we have a hook now that detects it? But I don't think it is perfect.

As long as this never gets propagated it should be fine ™️

Copy link
Contributor

Choose a reason for hiding this comment

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

Something can even get away with using both, as long as it doesn't specifically use pymongo and the mongo storage for pysaml2, but if you're doing that, you'll explode anyway.

@Artturin
Copy link
Member

Artturin commented Jul 25, 2022

  • evolution-data-server; maintainers: @NixOS/gnome (hmm, seems not synced with our lib.teams.gnome, but perhaps Jan will be OK anyway)
    hydra.nixos.org/build/185044078 (later build hasn't finished yet on Hydra but still fails locally)

on it... look's like libical isn't building its gir and vapi files

on master

$ tree ./result1-dev/share
./result1-dev/share
├── gir-1.0
│   ├── ICal-3.0.gir
│   └── ICalGLib-3.0.gir
└── vala
    └── vapi
        └── libical-glib.vapi

EDIT its because libical needs to be explicitly told to build them

Artturin and others added 3 commits July 25, 2022 20:08
@github-actions github-actions bot added the 6.topic: vim Advanced text editor label Jul 25, 2022
Artturin and others added 5 commits July 25, 2022 22:50
Let's stop using src.override.  I see no advantage,
and the switch of original src from `sha256 =` to `hash =`
was causing really confusing errors.
@vcunat vcunat mentioned this pull request Jul 26, 2022
13 tasks
@vcunat vcunat merged commit 29316ab into master Jul 27, 2022
@vcunat
Copy link
Member Author

vcunat commented Jul 27, 2022

The impact of the python package updates is not small, but I don't think that delaying merge would help significantly. (discussed with others on https://matrix.to/#/#staging:nixos.org )

@cole-h cole-h removed the ofborg-internal-error Ofborg encountered an error label Jul 29, 2022
@fricklerhandwerk fricklerhandwerk removed their request for review August 5, 2022 09:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: kernel The Linux kernel 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: stdenv Standard environment 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: vim Advanced text editor 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Comments