github-actions[bot]
9f6360b7fb
Merge staging-next into staging
2021-11-14 18:01:49 +00:00
sternenseemann
2f78a2d3a3
Merge remote-tracking branch 'origin/master' into staging-next
2021-11-14 16:26:44 +01:00
Domen Kožar
07715e7876
Merge pull request #145128 from prusnak/ghc-921-aarch64-darwin
...
haskell.compiler.ghc{901,921,HEAD}: fix aarch64-darwin build
2021-11-14 08:43:48 -06:00
Domen Kožar
0767be8a29
Merge pull request #145452 from jyooru/fix/apkeep
...
apkeep: fix darwin build
2021-11-14 08:38:19 -06:00
Alyssa Ross
4e1852096f
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
...
Conflicts:
pkgs/development/tools/parsing/flex/2.6.1.nix
2021-11-14 14:17:46 +00:00
github-actions[bot]
bc35dc4f3b
Merge master into staging-next
2021-11-14 12:01:23 +00:00
Vladimír Čunát
30e1b0bd69
Revert "metrics: drop requiredSystemFeatures; /cc #76776 "
...
This reverts commit c7aef6dedb
2021-11-14 11:35:51 +01:00
tomberek
2aeb84a3aa
Merge pull request #145580 from drewrisinger/dr-pr-qiskit-bump
...
python3Packages.qiskit: 0.26.2 -> 0.32.0
2021-11-14 02:30:03 -05:00
github-actions[bot]
0ca0546665
Merge master into staging-next
2021-11-14 06:01:05 +00:00
Cole Mickens
61403ff125
Merge pull request #145012 from dguenther/openvscode-server
...
openvscode-server: init at 1.62.0
2021-11-13 19:07:13 -08:00
Thiago Kenji Okada
3e4b2acec5
Merge pull request #145154 from yuuyins/libsbsms
...
libsbsms: init at 2.0.2 and 2.3.0
2021-11-13 21:17:55 -03:00
github-actions[bot]
9b5a105856
Merge master into staging-next
2021-11-14 00:01:47 +00:00
yuu
d73c2f3a0e
libsbsms: init at 2.0.2 and 2.3.0
...
Co-authored-by: Jonathan Ringer <jonringer117@gmail.com>
Co-authored-by: Thiago K. Okada <thiagokokada@gmail.com>
2021-11-13 20:51:03 -03:00
Sandro
337423b1a5
Merge pull request #145372 from doronbehar/pkg/jedi-lanugage-server
2021-11-13 21:06:12 +01:00
Sandro
a627a120b6
Merge pull request #145156 from yuuyins/wavefile
2021-11-13 19:55:18 +01:00
github-actions[bot]
914defdc38
Merge staging-next into staging
2021-11-13 18:01:47 +00:00
github-actions[bot]
4db5f307b0
Merge master into staging-next
2021-11-13 18:01:11 +00:00
Maciej Krüger
8b032ba1c2
Merge pull request #144616 from fgaz/fedigroups/init
2021-11-13 18:51:33 +01:00
Alyssa Ross
26b89bcd16
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
2021-11-13 15:30:01 +00:00
Sandro
6b46e6b0f0
Merge pull request #144635 from gardspirito/alfis-dialog
2021-11-13 13:27:02 +01:00
Vincent Laporte
551c849344
ocamlPackages.elpi: use recent version of ppxlib
2021-11-13 13:16:42 +01:00
sternenseemann
1a1e32f023
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts were caused by 2043dbb6fab2767b69dd
2021-11-13 12:35:55 +01:00
Mario Rodas
126db930e3
Merge pull request #145623 from marsam/alias-internetarchive
...
internetarchive: add alias to top-level
2021-11-13 06:28:45 -05:00
Jörg Thalheim
89b568491a
Merge pull request #145475 from jlesquembre/dstp
...
dstp: init at 0.3.0
2021-11-13 11:26:00 +00:00
Joel
c04d246eec
apkeep: fix darwin build
2021-11-13 20:30:18 +10:00
Jörg Thalheim
ef42f1da5a
Merge pull request #145643 from SuperSandro2000/pinentry
...
pinentry: remove libcap null override
2021-11-13 10:05:33 +00:00
Thomas Watson
ce70bbbbd8
protobuf: pin to 3.17 for Python 2
2021-11-13 03:16:49 -05:00
José Luis Lafuente
015cc5d959
dstp: init at 0.3.0
2021-11-13 08:50:20 +01:00
Max Niederman
d372457bf0
levant: init at 0.3.0
2021-11-12 19:14:07 -08:00
Graham Christensen
fd1f8e1498
Merge branch 'master' into mjolnir-init
2021-11-12 20:56:14 -05:00
Sandro
5db4c4e5d6
Merge pull request #142708 from WolfangAukang/gaphor
2021-11-13 02:44:27 +01:00
Sandro
312a3af375
Merge pull request #145257 from astro/openwebrx
2021-11-13 02:43:01 +01:00
github-actions[bot]
e972a20a60
Merge staging-next into staging
2021-11-13 00:02:24 +00:00
github-actions[bot]
c0c7fbda14
Merge master into staging-next
2021-11-13 00:01:45 +00:00
Artturi
69bdaa04d8
Merge pull request #145533 from Artturin/builddotnetpkgconfig
2021-11-13 01:27:33 +02:00
Thiago Kenji Okada
a48d660499
Merge pull request #145360 from eskytthe/topicctl
...
topicctl: init at 1.1.1
2021-11-12 20:19:03 -03:00
Sandro
ba58d00fed
Merge pull request #145602 from dotlambda/aiohttp-3.8.0
2021-11-12 23:58:37 +01:00
Sandro
4a4d57bd25
Merge pull request #144166 from LibreCybernetics/linux_5_15_aliases
2021-11-12 23:34:53 +01:00
Sandro
2369412879
Merge pull request #145681 from fabaff/mill-local
2021-11-12 23:26:30 +01:00
Pavol Rusnak
201661a628
bitcoin: fix build on Darwin
...
- use boost 1.7x - that's what upstream is doing anyway
- use autoSignDarwinBinariesHook on aarch64-darwin
2021-11-12 22:43:48 +01:00
Fabian Affolter
3f7abba2fa
python3Packages.mill-local: init at 0.1.0
2021-11-12 22:03:42 +01:00
Sandro
9d4ccae3d9
Merge pull request #143822 from expipiplus1/ellie-lighthouse
2021-11-12 21:20:24 +01:00
Artturi
4e61e1242c
Merge pull request #144933 from Artturin/ananicyinit
...
ananicy: init at unstable-2021-11-05
2021-11-12 21:08:14 +02:00
Dmitry Kalinkin
f153da3507
Merge pull request #145649 from SuperSandro2000/top-level-pkgs
...
top-level: remove all extra pkgs
2021-11-12 13:45:23 -05:00
github-actions[bot]
65356b24bf
Merge staging-next into staging
2021-11-12 18:01:48 +00:00
github-actions[bot]
699560194d
Merge master into staging-next
2021-11-12 18:01:08 +00:00
Daniel Nagy
fa6b4a9320
lucenepp: 3.0.7 -> 3.0.8 ( #134481 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-11-12 18:22:05 +01:00
Alyssa Ross
95947f6dd7
python2.pkgs.pycairo: fix cross
2021-11-12 16:57:24 +00:00
Alyssa Ross
c18332aed3
python3.pkgs.pycairo: fix cross
2021-11-12 16:56:57 +00:00
Sandro Jäckel
554495a75f
top-level: remove all extra pkgs
2021-11-12 17:47:09 +01:00
