Commit Graph
331131 Commits
Author SHA1 Message Date
Victor Engmark cd838da194 vanity: Indent with spaces part 2
More risky since it affects the inside of strings.
2021-11-18 10:53:29 +13:00
Victor Engmark 57b496ea98 misc: Replace tab indentation with spaces
I've tried to be consistent, using four or eight spaces to line up
with existing code.
2021-11-14 16:04:46 +13:00
Victor Engmark 90dbec47b7 vanity: Indent with spaces
Some literal tabs within strings should probably be spaces `\t`, but
I'm not familiar enough to make that call.
2021-11-14 16:04:46 +13:00
John EricsonandGitHub 5a7f6e1f18 Merge pull request #144839 from l0b0/fix-redirect
pkgs/build-support: Redirect to standard error rather than file "2"
2021-11-13 21:56:43 -05:00
SandroandGitHub 22a4fcfd4e Merge pull request #145239 from Stunkymonkey/development-pname-version-1 2021-11-13 23:59:13 +01:00
Thiago Kenji OkadaandGitHub d2b9fe98a6 Merge pull request #144325 from r-ryantm/auto-update/eksctl
eksctl: 0.70.0 -> 0.71.0
2021-11-13 19:42:38 -03:00
Jörg ThalheimandGitHub c022ac707a Merge pull request #144091 from alyssais/timidity
timidity: fix cross
2021-11-13 22:39:23 +00:00
Martin WeineltandGitHub 6125e5d801 Merge pull request #145786 from trofi/fix-pytest-flake8-hash 2021-11-13 21:51:36 +01:00
Sergei Trofimovich 82d7a450e5 python3Packages.pytest-flake8: fix patch hash 2021-11-13 20:21:08 +00:00
github-actions[bot]andGitHub 914defdc38 Merge staging-next into staging 2021-11-13 18:01:47 +00:00
github-actions[bot]andGitHub 4db5f307b0 Merge master into staging-next 2021-11-13 18:01:11 +00:00
figsodaandGitHub a6b0f5af47 Merge pull request #145769 from figsoda/update-glitter
glitter: 1.5.2 -> 1.5.3
2021-11-13 13:00:43 -05:00
Maciej KrügerandGitHub 8b032ba1c2 Merge pull request #144616 from fgaz/fedigroups/init 2021-11-13 18:51:33 +01:00
sternenseemann 4e50d99934 soldat-unstable: build using CMake
This will be the build system going forward, so it seems sensible to
support it right away. There's no neat way to use the system
GameNetworkingSockets upstream yet, so we add a hack for now.

Proactively decrease platforms to Linux only since the CMake doesn't
quite use GNUInstallDirs on Darwin and Windows unfortunately.
2021-11-13 18:49:45 +01:00
sternenseemann d37d84bdca soldat-unstable: 2021-04-27 -> 2021-11-01
Now builds with GameNetworkingSockets 1.3.0.
2021-11-13 18:49:45 +01:00
sternenseemann 23805c77bc gamenetworkingsockets: propagate OpenSSL
We need to propagate OpenSSL for using CMake's find_package.
2021-11-13 18:49:45 +01:00
sternenseemannandsterni b127a6f81a gamenetworkingsockets: 1.2.0 -> 1.3.0 2021-11-13 18:49:45 +01:00
Robert ScottandGitHub f6a2ed2082 Merge pull request #145771 from risicle/ris-fiona-skip-aarch64-tests
python3Packages.fiona: skip some tests failing on aarch64
2021-11-13 17:15:47 +00:00
figsodaandMatthieu Coudron 5aaa5f5e75 pluginupdate.py: fix compatibility with nix 2.4 2021-11-13 17:33:43 +01:00
figsoda e7200f5810 glitter: 1.5.2 -> 1.5.3 2021-11-13 10:55:13 -05:00
Alyssa Ross 26b89bcd16 Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-11-13 15:30:01 +00:00
Thiago Kenji OkadaandGitHub e29d818477 Merge pull request #145080 from welteki/faas-cli-0.13.15
faas-cli: 0.13.13 -> 0.13.15
2021-11-13 12:13:55 -03:00
Robert Scott 001ac66432 python3Packages.fiona: skip some tests failing on aarch64 2021-11-13 15:04:08 +00:00
Fabian AffolterandGitHub 9730df15c3 Merge pull request #145579 from dotlambda/ocrmypdf-12.7.2
python3Packages.ocrmypdf: 12.7.0 -> 12.7.2
2021-11-13 15:15:55 +01:00
Mario RodasandGitHub 7c3fe6b0ba Merge pull request #145731 from jbedo/pueue
pueue: 1.0.3 -> 1.0.4
2021-11-13 09:11:13 -05:00
Maximilian BoschandGitHub 281479cb07 Merge pull request #139816 from mweinelt/frozendict-et-al
matrix-synapse: unpin frozendict
2021-11-13 14:55:30 +01:00
Maximilian BoschandGitHub 91f58a36fc Merge pull request #145671 from TredwellGit/linux
Kernels 2021-11-12
2021-11-13 14:51:28 +01:00
SandroandGitHub d14a8e372f Merge pull request #145696 from fabaff/bump-json-schema-for-humans 2021-11-13 13:45:05 +01:00
Ellie HermaszewskaandGitHub a9b3a7d740 Merge pull request #145739 from chvp/bump-mu 2021-11-13 20:41:09 +08:00
Han Verstraete f3784bc57c faas-cli: 0.13.13 -> 0.13.15 2021-11-13 13:31:32 +01:00
SandroandGitHub 594fa6aea6 Merge pull request #143994 from Stunkymonkey/ocaml-pname 2021-11-13 13:30:16 +01:00
SandroandGitHub 6b46e6b0f0 Merge pull request #144635 from gardspirito/alfis-dialog 2021-11-13 13:27:02 +01:00
Martin WeineltandGitHub 25da6bdd41 Merge pull request #142507 from mweinelt/sqlalchemy 2021-11-13 13:22:02 +01:00
SandroandGitHub caae37d0f4 Merge pull request #145743 from NixOS/revert-145411-libs 2021-11-13 13:21:39 +01:00
SandroandGitHub 802bd2b7e3 Revert "follow up to pname+version switch: libs" 2021-11-13 13:21:27 +01:00
SandroandGitHub 6416f7aa6d Merge pull request #145411 from SuperSandro2000/libs 2021-11-13 13:21:16 +01:00
Vincent LaporteandVincent Laporte 3e84e0fd7d coqPackages.graph-theory: enable for Coq 8.14 2021-11-13 13:17:20 +01:00
Vincent LaporteandVincent Laporte 551c849344 ocamlPackages.elpi: use recent version of ppxlib 2021-11-13 13:16:42 +01:00
github-actions[bot]andGitHub 631c3d7cb2 Merge master into staging-next 2021-11-13 12:01:13 +00:00
Pavol RusnakandGitHub fca6647ac7 Merge pull request #145737 from expipiplus1/ellie-monado2
monado: build with libbsd
2021-11-13 13:00:23 +01:00
Maciej KrügerandGitHub 8f900c0534 Merge pull request #145738 from mkg20001/tree-fix 2021-11-13 12:47:59 +01:00
sternenseemann 1a1e32f023 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts were caused by 2043dbb6fa
interacting with b2767b69dd.
2021-11-13 12:35:55 +01:00
Maciej KrügerandGitHub 83d501e64c Merge pull request #145700 from beardhatcode/bump/nextcloud 2021-11-13 12:33:52 +01:00
Mario RodasandGitHub 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 ThalheimandGitHub 89b568491a Merge pull request #145475 from jlesquembre/dstp
dstp: init at 0.3.0
2021-11-13 11:26:00 +00:00
Charlotte Van Petegem a5c670a45f mu: 1.6.9 -> 1.6.10 2021-11-13 12:21:20 +01:00
Maciej Krüger f745b93d86 tree: fix package
makeFlags seems to be escaped now, so to do CC=$CC we need to
append it to makeFlags in the shell script now

Otherwise we get CC=\$CC
2021-11-13 12:20:52 +01:00
Timo KaufmannandGitHub 9075835128 Merge pull request #145023 from LibreCybernetics/update-keybase-gui
keybase-gui: 5.7.1 → 5.8.1
2021-11-13 12:18:59 +01:00
Jörg ThalheimandGitHub a33e09d1d2 Merge pull request #145704 from uri-canva/darwin-writers
writers: fix writeRust on darwin
2021-11-13 11:18:25 +00:00
Maciej KrügerandGitHub af3d601919 Merge pull request #145733 from VergeDX/flat-remix-gnome 2021-11-13 12:10:51 +01:00