Jonathan Ringer
f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/graphics/emulsion/default.nix
pkgs/development/tools/misc/texlab/default.nix
pkgs/development/tools/rust/bindgen/default.nix
pkgs/development/tools/rust/cargo-udeps/default.nix
pkgs/misc/emulators/ruffle/default.nix
pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
R. RyanTM
056af90d7e
homebank: 5.5.1 -> 5.5.2
2021-05-17 11:15:17 -07:00
github-actions[bot]
3ff6965554
Merge master into staging-next
2021-05-17 06:22:23 +00:00
Jonathan Ringer
d8e62d8e41
Merge remote-tracking branch 'origin/master' into staging-next
...
Fix cargo-flash build
2021-05-16 18:27:14 -07:00
Sandro
700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
...
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
Imran Hossain
81ffbb808a
zotero: 5.0.96 -> 5.0.96.2
2021-05-16 16:32:07 -04:00
Robert Schütz
882b692c4f
python3Packages.arrow_1: merge into python3Packages.arrow
...
They are the same version.
2021-05-13 09:21:56 -07:00
github-actions[bot]
b057978bb2
Merge staging-next into staging
2021-05-12 18:32:29 +00:00
Alvar Penning
0310818382
watson: 2.0.0 -> 2.0.1
2021-05-11 20:54:50 +02:00
github-actions[bot]
7ce907b413
Merge staging-next into staging
2021-05-10 12:24:36 +00:00
Jan Tojnar
594a885912
Merge branch 'staging-next' into staging
2021-05-10 09:45:47 +02:00
Dmitry Kalinkin
a5fd5c36ce
beamerpresenter: fix darwin build
2021-05-10 02:56:24 -04:00
pacien
76833b1206
beamerpresenter: 0.1.3 -> 0.2.0
2021-05-10 02:56:24 -04:00
Guillaume Girol
675c571703
Merge pull request #122382 from symphorien/paperworkpixbuf
...
paperwork: fix startup by adding GDK_PIXBUF_MODULE_FILE to wrapper
2021-05-10 06:08:53 +00:00
davidak
8dc6fccf32
timeline: init at 2.4.0
2021-05-09 11:28:21 -07:00
Guillaume Girol
ae4e6c8b7e
paperwork: fix startup by adding GDK_PIXBUF_MODULE_FILE to wrapper
2021-05-09 12:00:00 +00:00
Jan Tojnar
dd78ce1c53
Merge branch 'staging-next' into staging
2021-05-08 20:59:05 +02:00
Robert Hensing
8e3c5eb501
treewide: xvfb_run -> xvfb-run
2021-05-08 15:48:41 +02:00
Vladimír Čunát
080cd658ca
Merge #121780 : treewide meta.maintainers tweaks
2021-05-08 10:47:08 +02:00
Damien Cassou
abf9453516
ledger-autosync: 1.0.2 -> 1.0.2-unstable-2021-04-01
2021-05-08 00:49:29 -07:00
Jan Tojnar
468cb5980b
gnome: rename from gnome3
...
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
Daniël de Kok
85f96822a0
treewide: fix cargoSha256/cargoHash
...
Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in
which cargo vendor erroneously changed permissions of vendored
crates. This was fixed in Rust
1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all
cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are
potentially broken.
This change updates cargoSha256/cargoHash tree-wide.
Fixes #121994 .
2021-05-08 00:36:37 -07:00
ajs124
cbfd088d28
Merge pull request #121916 from TredwellGit/libreoffice-fresh
...
libreoffice-fresh: 7.1.2.2 -> 7.1.3.2
2021-05-07 16:55:39 +02:00
Vladimír Čunát
9f054b5e1a
treewide: remove worldofpeace from meta.maintainers
...
(It was requested by them.)
I left one case due to fetching from their personal repo:
pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
2021-05-07 15:36:40 +02:00
TredwellGit
a9f8aec7d0
libreoffice-fresh: 7.1.2.2 -> 7.1.3.2
2021-05-06 12:38:56 +00:00
Jan Tojnar
8647ddb0d3
gnucash: 4.4 → 4.5
...
Needed a patch to fix build with GLib 2.68 and it did not apply to 4.4 so I also bumped the version 🤷♀️
Changes look fine: https://github.com/Gnucash/gnucash/releases/tag/4.5
2021-05-05 22:43:09 +02:00
Jan Tojnar
c9ec705dac
elementary-planner: fix build
2021-05-05 22:43:07 +02:00
Jan Tojnar
7d535edec5
gnome3: support new versioning scheme in the update script
...
https://discourse.gnome.org/t/new-gnome-versioning-scheme/4235
2021-05-05 22:20:20 +02:00
Pawel Kruszewski
013e245188
timeular: 3.4.1 -> 3.9.1
2021-04-30 15:46:36 +02:00
Sandro Jäckel
ae02415ee8
treewide: remove gnidorah
...
due to github account removal/deletion and not other mean of contact.
2021-04-30 01:48:19 +02:00
FliegendeWurst
ec4efadb83
trilium: 0.46.9 -> 0.47.2
2021-04-27 20:04:18 +02:00
Kerstin Humm
cbf777525f
scribusUnstable: 1.5.6.1 -> 1.5.7
2021-04-26 03:00:18 +02:00
Alyssa Ross
4f4d95bbc2
Merge remote-tracking branch 'nixpkgs/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/pyvex/default.nix
pkgs/top-level/python-packages.nix
2021-04-23 13:49:12 +00:00
Michael Raskin
d2d3068328
Merge pull request #120222 from pennae/libreoffice-dbus
...
libreoffice: kill private dbus instance on exit
2021-04-23 08:50:35 +00:00
FliegendeWurst
961f7cad2d
trilium: 0.46.7 -> 0.46.9
2021-04-23 09:28:22 +02:00
pennae
df6c714d82
libreoffice: kill private dbus instance on exit
...
if the libreoffice wrapper doesn't find a dbus instance in the
environment it starts one, but then neglects to clean it up. over time
this can litter the system with orphaned dbus instances. kill the daemon
as well instead of just removing the socket directory.
2021-04-22 23:03:02 +02:00
github-actions[bot]
960439e003
Merge master into staging-next
2021-04-20 12:06:46 +00:00
Maximilian Bosch
7a908a0550
Merge pull request #119908 from DeeUnderscore/todoman-setuptools-scm
...
todoman: add setuptools-scm dependency
2021-04-20 11:09:03 +02:00
github-actions[bot]
e605a07cc0
Merge master into staging-next
2021-04-20 06:06:25 +00:00
Michael Hoang
79a88108f6
elementary-planner: 2.5.7 -> 2.6.9
2021-04-19 20:24:26 -04:00
D Anzorge
57d549edde
todoman: add setuptools-scm dependency
2021-04-20 00:17:29 +02:00
github-actions[bot]
a28d31ed86
Merge master into staging-next
2021-04-19 00:15:22 +00:00
Moritz Scheuren
1e0bf533d0
portfolio: 0.51.2 -> 0.52.0
2021-04-18 23:07:42 +02:00
github-actions[bot]
8156636ab9
Merge master into staging-next
2021-04-17 18:10:38 +00:00
Pavol Rusnak
28de4ac62a
treewide: make AppRun substitutions constistent
2021-04-17 12:48:13 +02:00
Martin Weinelt
7cf67850c0
Merge branch 'master' into staging-next
2021-04-15 01:01:26 +02:00
Artur Taranchiev
b2681434a1
todofi.sh: init at 1.0.0 ( #119334 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-15 00:34:50 +02:00
github-actions[bot]
eb8e023674
Merge master into staging-next
2021-04-14 18:11:01 +00:00
Max Hausch
92ec5c8583
super-productivity: 1.10.45 -> 6.5.2
...
Version 1.10.45 segfaults, this commit fixes the package
2021-04-14 14:53:48 +02:00
Luke Granger-Brown
08b22e605b
Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging
2021-04-12 18:49:01 +00:00
