diff options
author | Linnnus <[email protected]> | 2024-12-05 16:49:01 +0100 |
---|---|---|
committer | Linnnus <[email protected]> | 2024-12-06 08:31:48 +0100 |
commit | 5147001f318ae56702d19ec832c9eaed5cf35e43 (patch) | |
tree | c27f0365ea7ba27839990398cd9e4091f753d9a4 | |
parent | a2f2f142a64ea34637e1586728d6e4e33553040f (diff) |
Bump nixpkgs 24.{05 => 11} and nixpkgs-unstable
- Bump perl input to pkgs/trash
- Use {swiftPackages. => }xcbuild for pbv
- Remove cling; was crashing and ) wasn't using it anyways
- LSP tsserver was renamed to ts_ls
-rw-r--r-- | flake.lock | 27 | ||||
-rw-r--r-- | flake.nix | 6 | ||||
-rw-r--r-- | hosts/muhammed/home/dev-utils/default.nix | 1 | ||||
-rw-r--r-- | hosts/muhammed/home/neovim/lsp.nix | 6 | ||||
-rw-r--r-- | pkgs/pbv/default.nix | 3 | ||||
-rw-r--r-- | pkgs/trash/default.nix | 4 |
6 files changed, 23 insertions, 24 deletions
@@ -129,16 +129,16 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1733050161, + "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -165,33 +165,34 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727264057, - "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", + "lastModified": 1733261153, + "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", + "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { - "id": "nixpkgs", + "owner": "NixOS", "ref": "nixos-unstable", - "type": "indirect" + "repo": "nixpkgs", + "type": "github" } }, "push-notification-api": { @@ -1,13 +1,13 @@ { inputs = { nixpkgs = { - url = "github:NixOS/nixpkgs/nixos-24.05"; + url = "github:NixOS/nixpkgs/nixos-24.11"; }; nixpkgs-unstable = { - url = "nixpkgs/nixos-unstable"; + url = "github:NixOS/nixpkgs/nixos-unstable"; }; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-darwin = { diff --git a/hosts/muhammed/home/dev-utils/default.nix b/hosts/muhammed/home/dev-utils/default.nix index ac63f3d..f3c2df2 100644 --- a/hosts/muhammed/home/dev-utils/default.nix +++ b/hosts/muhammed/home/dev-utils/default.nix @@ -14,7 +14,6 @@ ffmpeg_6-full # interpreaters - cling unstable.deno (python311Full.withPackages (ps: with ps; [ diff --git a/hosts/muhammed/home/neovim/lsp.nix b/hosts/muhammed/home/neovim/lsp.nix index 0c7a642..c301bb0 100644 --- a/hosts/muhammed/home/neovim/lsp.nix +++ b/hosts/muhammed/home/neovim/lsp.nix @@ -62,7 +62,7 @@ cmd = { "${pkgs.unstable.deno}/bin/deno", "lsp" }, root_dir = function(startpath) if util.find_package_json_ancestor(startpath) then - -- This is a Node project; let tsserver handle this one. + -- This is a Node project; let ts_ls handle this one. -- This exactly mirrors how typescript-langauge-server yields to this server for Deno projects. return nil else @@ -73,9 +73,7 @@ end end, }, - -- NOTE: Will be renamed to ts_ls shortly - -- See: https://github.com/neovim/nvim-lspconfig/commit/bdbc65aadc708ce528efb22bca5f82a7cca6b54d - tsserver = { + ts_ls = { cmd = { "${pkgs.nodePackages_latest.typescript-language-server}/bin/typescript-language-server", "--stdio" }, root_dir = function(startpath) local find_deno_root_dir = util.root_pattern("deno.json", "deno.jsonc") diff --git a/pkgs/pbv/default.nix b/pkgs/pbv/default.nix index 7b642af..c61e021 100644 --- a/pkgs/pbv/default.nix +++ b/pkgs/pbv/default.nix @@ -1,6 +1,7 @@ { lib, swiftPackages, + xcbuild, fetchFromGitHub, }: swiftPackages.stdenv.mkDerivation { @@ -16,7 +17,7 @@ swiftPackages.stdenv.mkDerivation { buildInputs = [ swiftPackages.swift - swiftPackages.xcbuild + xcbuild swiftPackages.apple_sdk.frameworks.Cocoa ]; diff --git a/pkgs/trash/default.nix b/pkgs/trash/default.nix index 58e4a1b..d71a209 100644 --- a/pkgs/trash/default.nix +++ b/pkgs/trash/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, - perl536Packages, + perl538Packages, darwin, lib, }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.ScriptingBridge - perl536Packages.podlators + perl538Packages.podlators ]; outputs = ["out" "man"]; |