erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:59264113f93c8e99c8804d2be001575f2d53d0f0
Branches Tags
erwin:main
..
compare: erwin:e99de3618d05c174102b3038b021b28b92eb0584
Branches Tags
erwin:main

2 commits
59264113f9 ... e99de3618d

Author SHA1 Message Date
Erwin Boskma
e99de3618d
flake.lock: Update 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/a6717b1afee7ae955c61eefdf0ce8f864ef78115?narHash=sha256-3wKGpHy9Kyh98DrziqC/s//60Q0pE17NgbY93L0uWng%3D' (2024-03-26)
  → 'github:nix-community/disko/502241afa3de2a24865ddcbe4c122f4546e32092?narHash=sha256-vBB5HoQVnA6c/UrDOhLXKAahEwSRccw2YXYHxD7qoi4%3D' (2024-03-28)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/9f6f38ce57d29b78cc6db45cf87813ae631641ec?narHash=sha256-Z7JxlKxbhGWLOvypllSMGhDMWd/A2Hv8zRKJY3a9TTY%3D' (2024-03-27)
  → 'github:nix-community/emacs-overlay/593fd7712944cec2a04b0f5d54b22e35fe03290b?narHash=sha256-unfcrYWtZn%2BxIAcwfXNh2s1/ZpG9HObEHJG6I7yBliI%3D' (2024-03-28)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/56528ee42526794d413d6f244648aaee4a7b56c0?narHash=sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM%3D' (2024-03-22)
  → 'github:NixOS/nixpkgs/44733514b72e732bd49f5511bd0203dea9b9a434?narHash=sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq%2BP/1Z5IoYWs7E%3D' (2024-03-26)
• Updated input 'home-manager':
    'github:nix-community/home-manager/1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb?narHash=sha256-WJOahf%2B6115%2BGMl3wUfURu8fszuNeJLv9qAWFQl3Vmo%3D' (2024-03-22)
  → 'github:nix-community/home-manager/3142bdcc470e1e291e1fbe942fd69e06bd00c5df?narHash=sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX%2BMwnC3A%3D' (2024-03-28)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/57e6b3a9e4ebec5aa121188301f04a6b8c354c9b?narHash=sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu%2BXtw%2BmfvkUAs%3D' (2024-03-25)
  → 'github:nixos/nixpkgs/2726f127c15a4cc9810843b96cad73c7eb39e443?narHash=sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ%3D' (2024-03-27)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/56f48d6e7559b807763ea03191bfaf95549ce610?narHash=sha256-yK1zue1c8EdpZvEyQWrjawG9Ykzl7eB2xJ/V%2B2vU5Jo%3D' (2024-03-27)
  → 'github:oxalica/rust-overlay/aa858717377db2ed8ffd2d44147d907baee656e5?narHash=sha256-oD4OJ3TRmVrbAuKZWxElRCyCagNCDuhfw2exBmNOy48%3D' (2024-03-28)
 2024-03-28 09:02:03 +01:00
Erwin Boskma
2e5d7a110a
zed: Update to 0.127.5 
Still doesn't work on wayland though...
 2024-03-27 17:37:54 +01:00
3 changed files with 86 additions and 54 deletions
Show stats Expand all files Collapse all files

36
flake.lock
View file

@ -147,11 +147,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711462743, "lastModified": 1711588700,
"narHash": "sha256-3wKGpHy9Kyh98DrziqC/s//60Q0pE17NgbY93L0uWng=", "narHash": "sha256-vBB5HoQVnA6c/UrDOhLXKAahEwSRccw2YXYHxD7qoi4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "a6717b1afee7ae955c61eefdf0ce8f864ef78115", "rev": "502241afa3de2a24865ddcbe4c122f4546e32092",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -171,11 +171,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1711530423, "lastModified": 1711604862,
"narHash": "sha256-Z7JxlKxbhGWLOvypllSMGhDMWd/A2Hv8zRKJY3a9TTY=", "narHash": "sha256-unfcrYWtZn+xIAcwfXNh2s1/ZpG9HObEHJG6I7yBliI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "9f6f38ce57d29b78cc6db45cf87813ae631641ec", "rev": "593fd7712944cec2a04b0f5d54b22e35fe03290b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -468,11 +468,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711133180, "lastModified": 1711604890,
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", "narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", "rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -640,11 +640,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1711124224, "lastModified": 1711460390,
"narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "56528ee42526794d413d6f244648aaee4a7b56c0", "rev": "44733514b72e732bd49f5511bd0203dea9b9a434",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -688,11 +688,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1711333969, "lastModified": 1711523803,
"narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=", "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b", "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -817,11 +817,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711505476, "lastModified": 1711592024,
"narHash": "sha256-yK1zue1c8EdpZvEyQWrjawG9Ykzl7eB2xJ/V+2vU5Jo=", "narHash": "sha256-oD4OJ3TRmVrbAuKZWxElRCyCagNCDuhfw2exBmNOy48=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "56f48d6e7559b807763ea03191bfaf95549ce610", "rev": "aa858717377db2ed8ffd2d44147d907baee656e5",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
pkgs/zed/Cargo.lock generated
View file

@ -12758,7 +12758,7 @@ dependencies = [
[[package]] [[package]]
name = "zed" name = "zed"
version = "0.127.3" version = "0.127.5"
dependencies = [ dependencies = [
"activity_indicator", "activity_indicator",
"anyhow", "anyhow",

102
pkgs/zed/default.nix
View file

@ -5,31 +5,32 @@
curl, curl,
pkg-config, pkg-config,
protobuf, protobuf,
xcbuild,
fontconfig, fontconfig,
freetype, freetype,
libgit2, libgit2,
libxkbcommon,
openssl, openssl,
sqlite, sqlite,
vulkan-loader,
xorg,
zlib, zlib,
zstd, zstd,
alsa-lib,
libxkbcommon,
wayland,
xorg,
stdenv, stdenv,
darwin, darwin,
alsa-lib, vulkan-loader,
wayland,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "zed"; pname = "zed";
version = "0.127.3"; version = "0.127.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zed-industries"; owner = "zed-industries";
repo = "zed"; repo = "zed";
rev = "v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-qzQ0mOY8/reyQqTddG5nqtXDcyPJvrz/HUFci6fNums="; hash = "sha256-clMPXz6htCGoX7wcONo68kacPSvgrAd6SH5VDHSGyOM=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -83,14 +84,12 @@ rustPlatform.buildRustPackage rec {
}; };
}; };
doCheck = false;
nativeBuildInputs = [ nativeBuildInputs = [
curl curl
pkg-config pkg-config
protobuf protobuf
rustPlatform.bindgenHook rustPlatform.bindgenHook
]; ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ];
buildInputs = buildInputs =
[ [
@ -98,45 +97,78 @@ rustPlatform.buildRustPackage rec {
fontconfig fontconfig
freetype freetype
libgit2 libgit2
libxkbcommon
openssl openssl
sqlite sqlite
vulkan-loader
xorg.libxcb
zlib zlib
zstd zstd
] ]
++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.CoreAudio
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.CoreGraphics
darwin.apple_sdk.frameworks.CoreServices
darwin.apple_sdk.frameworks.CoreText
darwin.apple_sdk.frameworks.Foundation
darwin.apple_sdk.frameworks.IOKit
darwin.apple_sdk.frameworks.Metal
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
]
++ lib.optionals stdenv.isLinux [ ++ lib.optionals stdenv.isLinux [
alsa-lib alsa-lib
libxkbcommon
wayland wayland
]; xorg.libxcb
]
++ lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks;
[
AppKit
CoreAudio
CoreFoundation
CoreGraphics
CoreMedia
CoreServices
CoreText
Foundation
IOKit
Metal
Security
SystemConfiguration
VideoToolbox
]
);
buildFeatures = [ "gpui/runtime_shaders" ];
env = { env = {
ZSTD_SYS_USE_PKG_CONFIG = true; ZSTD_SYS_USE_PKG_CONFIG = true;
}; };
postFixup = lib.optionalString stdenv.isLinux ''
patchelf --add-rpath ${vulkan-loader}/lib $out/bin/*
'';
# Fail with "unimplemented error"
checkFlags = lib.optionals stdenv.hostPlatform.isLinux [
"--skip=test_base_keymap"
"--skip=test_bundled_settings_and_themes"
"--skip=test_disabled_keymap_binding"
"--skip=test_navigation"
"--skip=test_new_empty_workspace"
"--skip=test_open_and_save_new_file"
"--skip=test_open_entry"
"--skip=test_opening_excluded_paths"
"--skip=test_open_paths"
"--skip=test_open_paths_action"
"--skip=test_pane_actions"
"--skip=test_reopening_closed_items"
"--skip=test_save_conflicting_item"
"--skip=test_setting_language_when_saving_as_single_file_worktree"
"--skip=test_window_edit_state"
"--skip=test_open_add_new"
"--skip=test_open_file_in_many_spaces"
"--skip=test_open_non_existing_file"
];
meta = with lib; { meta = with lib; {
description = "Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter"; description = "A high-performance, multiplayer code editor from the creators of Atom and Tree-sitter";
homepage = "https://github.com/zed-industries/zed"; homepage = "https://zed.dev";
license = with licenses; [ changelog = "https://github.com/zed-industries/zed/releases/tag/v${version}";
asl20 license = licenses.gpl3Only;
agpl3Only maintainers = with maintainers; [
gpl3Only GaetanLepage
niklaskorz
]; ];
maintainers = with maintainers; [ ];
mainProgram = "zed"; mainProgram = "zed";
platforms = platforms.all;
}; };
} }