Commit Graph

5962 Commits

Author SHA1 Message Date
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
Matthieu Coudron 3675e4b7e3
Merge pull request #122998 from ck3d/add-neovide
neovide: init at ba42855
2021-05-15 21:49:51 +02:00
Christian Kögler 0935f7d7dd neovide: Separate skia externals 2021-05-15 13:27:34 +02:00
Christian Kögler 5067ba8444 neovide: Install icons and desktop files 2021-05-15 10:11:54 +02:00
github-actions[bot] 78ae7ac75e
Merge staging-next into staging 2021-05-15 06:22:25 +00:00
Christian Kögler a0bc1ab480 neovide: ba42855 -> 0b976c3
Simplify packaging, since upstream applied proposed pull request.
2021-05-15 08:19:54 +02:00
Vladimír Čunát c48eaa70e3
Merge branch 'master' into staging-next 2021-05-14 22:27:34 +02:00
Anderson Torres f6fa95f6f1
Merge pull request #122797 from AndersonTorres/quick-patches
Emacs packages updates
2021-05-14 14:17:29 -03:00
Christian Kögler 428edf7fe0 neovide: init at ba42855 2021-05-14 18:53:15 +02:00
upkeep-bot 4f4486dbce vscode: 1.56.1 -> 1.56.2 2021-05-14 00:37:21 +00:00
Jan Tojnar ac6a4f7cf5
Merge branch 'staging-next' into staging 2021-05-14 01:40:09 +02:00
github-actions[bot] 39e3f7c2cc
Merge master into staging-next 2021-05-13 18:32:50 +00:00
Jonas Chevalier c6b62f2381
mkShell: introduce packages argument (#122180)
The distinction between the inputs doesn't really make sense in the
mkShell context.  Technically speaking, we should be using the
nativeBuildInputs most of the time.

So in order to make this function more beginner-friendly, add "packages"
as an attribute, that maps to nativeBuildInputs.

This commit also updates all the uses in nixpkgs.
2021-05-13 19:17:29 +02:00
github-actions[bot] 60f5ecc76d
Merge staging-next into staging 2021-05-13 12:26:52 +00:00
github-actions[bot] 7465594428
Merge master into staging-next 2021-05-13 12:26:48 +00:00
Mathnerd314 d1601a40c4
supertux-editor: mark as broken (#122781)
SuperTux now uses an in-game editor, so there's no point in trying to build this old C# monstrosity.
2021-05-13 06:19:30 -04:00
Jan Tojnar 0313c77b55
Merge branch 'staging-next' into staging 2021-05-13 11:42:36 +02:00
github-actions[bot] e59f22faf5
Merge master into staging-next 2021-05-13 06:22:11 +00:00
AndersonTorres 0b31c01708 elpa-generate.nix: update via update-elpa 2021-05-13 02:59:26 -03:00
AndersonTorres 7110fa6331 recipes-archive-melpa.json: update via update-melpa 2021-05-13 02:59:26 -03:00
AndersonTorres 0e15125e37 emacsPackages.org: 20210503 -> 20210510 2021-05-13 02:59:25 -03:00
AndersonTorres 3dcaf54794 emacsPackages.sunrise-commander: modify description 2021-05-12 23:08:07 -03:00
Anderson Torres 9c0ca46a6d
Merge pull request #122578 from AndersonTorres/quick-patches
Quick patches
2021-05-12 23:04:37 -03:00
github-actions[bot] b057978bb2
Merge staging-next into staging 2021-05-12 18:32:29 +00:00
github-actions[bot] f214722172
Merge master into staging-next 2021-05-12 18:32:26 +00:00
Sandro 03521ca42d
Merge pull request #122710 from samuela/upkeep-bot/vscodium-1.56.1-1620821772
vscodium: 1.56.0 -> 1.56.1
2021-05-12 18:51:47 +02:00
Martin Weinelt a18880bf72 Merge remote-tracking branch 'origin/master' into staging-next 2021-05-12 18:28:03 +02:00
upkeep-bot 9bd967cdfe vscodium: 1.56.0 -> 1.56.1 2021-05-12 12:16:12 +00:00
AndersonTorres 5ad65d4eb8 emacasPackages.sunrise-commander: 6r435 -> 0.0.0-unstable=2021-04-23 2021-05-12 00:15:41 -03:00
upkeep-bot 2ca5a4e2b6 vscode: 1.56.0 -> 1.56.1 2021-05-12 00:25:40 +00:00
Jan Tojnar 7982550ac4
Merge branch 'staging-next' into staging 2021-05-11 09:09:10 +02:00
github-actions[bot] 49b8e6f7d4
Merge master into staging-next 2021-05-11 00:48:15 +00:00
Jason Felice 2d5cb58f4b kak-ansi: 0.2.3 -> 0.2.4 2021-05-10 15:29:57 -04:00
github-actions[bot] 61fa3fdde8
Merge master into staging-next 2021-05-10 18:28:17 +00:00
Graham Christensen bab18ef959
Merge pull request #122401 from samuela/upkeep-bot/vscodium-1.56.0-1620606156
vscodium: 1.55.2 -> 1.56.0
2021-05-10 13:18:13 -04:00
Graham Christensen 3419bf4db6
Merge pull request #121910 from samuela/upkeep-bot/vscode-1.56.0-1620303266
vscode: 1.55.2 -> 1.56.0
2021-05-10 13:17:46 -04:00
Jan Tojnar 594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
upkeep-bot 5bd24c3783 vscodium: 1.55.2 -> 1.56.0 2021-05-10 00:22:37 +00:00
github-actions[bot] bc1f4b790e
Merge master into staging-next 2021-05-09 12:23:16 +00:00
erictapen d3ed0f5028
ghostwriter: 2.0.0-rc5 -> 2.0.0 (#122268) 2021-05-09 10:40:10 +02:00
Vladimír Čunát 5663b2b2d3
Merge branch 'master' into staging-next
(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00
Dmitry Kalinkin 0c04615963
Merge pull request #119767 from yuanw/emacsMacport-8.2
emacsMacPort: 8.0 -> 8.2
2021-05-09 00:44:55 -04:00
Jan Tojnar dd78ce1c53
Merge branch 'staging-next' into staging 2021-05-08 20:59:05 +02:00
github-actions[bot] 6d46d8a9b9
Merge master into staging-next 2021-05-08 18:22:46 +00:00
Robert Hensing 8e3c5eb501 treewide: xvfb_run -> xvfb-run 2021-05-08 15:48:41 +02:00
Martin Weinelt 9651084620 Merge remote-tracking branch 'origin/master' into staging-next 2021-05-08 14:43:43 +02: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
github-actions[bot] b4416b52c5
Merge master into staging-next 2021-05-08 00:46:50 +00:00