Jonathan Ringer
c1f8a15dac
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
nixos/doc/manual/release-notes/rl-2105.xml
pkgs/tools/security/sequoia/default.nix
2021-05-19 10:39:54 -07:00
Jörg Thalheim
9a417aebd6
Merge pull request #123506 from stephank/fix-spacenav-cube-example-darwin
...
spacenav-cube-example: fix darwin build
2021-05-19 06:54:49 +01:00
Jörg Thalheim
3ef6d5d77c
Merge pull request #123620 from michojel/megasync-no-ffmpeg
...
megasync: temporarily remove ffmpeg dependency
2021-05-19 06:50:47 +01:00
Michal Minář
b275ddd6a1
megasync: temporarily remove ffmpeg dependency
...
Fails to build against ffmpeg 4.4
Signed-off-by: Michal Minář <mic.liamg@gmail.com>
2021-05-19 05:45:18 +02:00
github-actions[bot]
7000ae2b9a
Merge master into staging-next
2021-05-19 00:55:36 +00:00
Robert Scott
82ffc8e661
Merge pull request #123560 from stephank/fix-sunwait-darwin
...
sunwait: fix darwin build
2021-05-18 23:26:36 +01:00
Stéphan Kochen
92d0a489e0
spnavcfg: fix darwin build
2021-05-18 20:44:24 +02:00
Jonathan Ringer
ca46ad3762
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/tools/package-management/cargo-release/default.nix
2021-05-18 11:03:38 -07:00
Stéphan Kochen
755fa6d3b3
sunwait: fix darwin build
2021-05-18 20:03:31 +02:00
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
Anderson Torres
de83b9baff
Merge pull request #122712 from AndersonTorres/adoption
...
Adoption of some packages from worldofpeace
2021-05-18 12:52:13 -03:00
AndersonTorres
8352b700e9
notejot: 1.6.3 -> 3.0.4
2021-05-18 11:12:32 -03:00
Stéphan Kochen
83c02160e5
spacenav-cube-example: fix darwin build
2021-05-18 13:56:08 +02:00
Sandro
aee5df81aa
Merge pull request #123429 from tfmoraes/zettlr_1.8.9
...
Zettlr: 1.8.7 -> 1.8.9
2021-05-18 13:05:04 +02:00
Stéphan Kochen
e010c91104
openbox-menu: fix darwin build
2021-05-18 11:02:13 +02:00
Thiago Franco de Moraes
97afad785c
Zettlr: 1.8.7 -> 1.8.9
2021-05-17 22:27:54 -03:00
Jonathan Ringer
9fd18aaad2
makeself: fix tests
2021-05-17 14:48:58 -07:00
R. RyanTM
a483bae7cd
curaengine: 4.9.0 -> 4.9.1
2021-05-17 13:26:25 -07:00
Bill Sun
7eadb03c59
chrysalis: 0.7.9 -> 0.8.4 ( #121753 )
2021-05-17 19:12:24 +02:00
Sandro
65cdc07c6a
Merge pull request #122895 from dotlambda/sc-im-0.8.2
...
sc-im: 0.8.1 -> 0.8.2
2021-05-17 19:04:32 +02:00
Sandro
aa06ddb730
Merge pull request #123319 from r-ryantm/auto-update/dbeaver
...
dbeaver: 21.0.4 -> 21.0.5
2021-05-17 18:31:55 +02:00
Jonathan Ringer
c227fb4b17
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/tools/rust/cargo-cache/default.nix
pkgs/development/tools/rust/cargo-embed/default.nix
pkgs/development/tools/rust/cargo-flash/default.nix
pkgs/servers/nosql/influxdb2/default.nix
2021-05-17 07:01:38 -07:00
Kanashimia
9c6daedb29
keepassxc: add readline support, minor refactor
2021-05-17 17:00:44 +08:00
J. Neto
74e27e2236
slade-git: 3.1.2 -> 3.2.0
2021-05-16 23:46:53 -07:00
github-actions[bot]
3ff6965554
Merge master into staging-next
2021-05-17 06:22:23 +00:00
R. RyanTM
f4bfc1173e
dbeaver: 21.0.4 -> 21.0.5
2021-05-17 04:19:09 +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
Sandro
9bc04854e1
Merge pull request #123213 from mdevlamynck/update-plasma-applet-volumewin7mixer
...
plasma-applet-volumewin7mixer: v25 -> v26
2021-05-17 02:36:37 +02:00
Sandro
4e60302dbe
Merge pull request #123128 from sayanarijit/master
...
xplr: 0.8.4 -> 0.9.1
2021-05-17 02:28:16 +02:00
Sandro
72df572fa3
Merge pull request #122819 from primeos/maintainers-remove-pesterhazy
...
maintainers: remove pesterhazy
2021-05-17 02:22:35 +02:00
Sandro
8605692f10
Merge pull request #122882 from r-ryantm/auto-update/gallery_dl
...
gallery-dl: 1.17.3 -> 1.17.4
2021-05-17 01:47:57 +02:00
Robert Schütz
ce0cabb49d
numberstation: init at 0.4.0 ( #122190 )
2021-05-17 00:16:15 +02:00
github-actions[bot]
6cdac75d25
Merge staging-next into staging
2021-05-16 18:32:44 +00:00
github-actions[bot]
8c6d819143
Merge master into staging-next
2021-05-16 18:32:41 +00:00
Anderson Torres
cf45c45605
Merge pull request #121588 from eduardosm/sip-rename
...
pythonPackages.sip: rename to sip_4, pythonPackages.sip_5: rename to sip
2021-05-16 13:31:55 -03:00
Jan Tojnar
684991c696
Merge branch 'master' into staging-next
...
- Thunderbird 68 has been dropped on master.
- gccCrossLibcStdenv has been factored out on staging-next in all-packages.nix, while the file has been re-formatted on master.
2021-05-16 15:34:51 +02:00
Anderson Torres
c58b97674b
Merge pull request #123184 from lovesegfault/corectrl-1.1.3
...
corectrl: 1.1.2 -> 1.1.3
2021-05-16 09:50:20 -03:00
Matthias Devlamynck
4c0441c0b1
plasma-applet-volumewin7mixer: v25 -> v26
2021-05-16 11:48:34 +02:00
github-actions[bot]
5c18268a6b
Merge staging-next into staging
2021-05-16 06:22:08 +00:00
github-actions[bot]
d6fe7f78a8
Merge master into staging-next
2021-05-16 06:22:05 +00:00
Peter Hoeg
6e7fac368f
solaar: 1.0.2 -> 1.0.5
2021-05-16 11:04:34 +08:00
Bernardo Meurer
61d8677ddf
corectrl: 1.1.2 -> 1.1.3
2021-05-15 18:48:29 -07:00
github-actions[bot]
9911b1c75b
Merge staging-next into staging
2021-05-16 01:01:01 +00:00
github-actions[bot]
b484cef365
Merge master into staging-next
2021-05-16 01:00:58 +00:00
Stéphan Kochen
5548ff174c
getxbook: fix clang build
2021-05-15 13:11:42 -07:00
github-actions[bot]
c10600230e
Merge staging-next into staging
2021-05-15 18:30:31 +00:00
github-actions[bot]
f1b78f8618
Merge master into staging-next
2021-05-15 18:30:28 +00:00
midchildan
d38f9c8dee
zathura: disable checkPhase on Darwin
2021-05-16 02:10:11 +09:00
Arijit Basu
541a034ecf
xplr: 0.8.4 -> 0.9.1
2021-05-15 21:20:53 +05:30