diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/audio/gpodder/default.nix | 7 | ||||
-rw-r--r-- | pkgs/data/fonts/jetbrains-mono/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/vscode-extensions/default.nix | 8 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-zen.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/tailscale/default.nix | 6 |
5 files changed, 18 insertions, 13 deletions
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 681c6ffe2810..cd5e476b8845 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -29,8 +29,14 @@ python3Packages.buildPythonApplication rec { glibcLocales ]; + # as of 2021-07, the gobject-introspection setup hook does not + # work with `strictDeps` enabled, thus for proper `wrapGAppsHook` + # it needs to be disabled explicitly. https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + buildInputs = [ python3 + gtk3 gobject-introspection gnome.adwaita-icon-theme ]; @@ -49,7 +55,6 @@ python3Packages.buildPythonApplication rec { eyeD3 podcastparser html5lib - gtk3 ]; makeFlags = [ diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix index 0ba7fd835c3c..65ffe491a783 100644 --- a/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "2.225"; + version = "2.241"; in fetchzip { name = "JetBrainsMono-${version}"; url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "1k8xmjaingz50626hd73hqbp196kg3zndiy0aqb88z5cw9nd0fva"; + sha256 = "1gwhbmq8zw026i66g96i75zn2zff7cr83ns8aaslrzsrkk247lah"; postFetch = '' mkdir -p $out/share/fonts diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 2941c95bb4e8..7a825f4f6833 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -207,7 +207,7 @@ let }; }; - bbenoist.Nix = buildVscodeMarketplaceExtension { + bbenoist.nix = buildVscodeMarketplaceExtension { mktplcRef = { name = "Nix"; publisher = "bbenoist"; @@ -296,7 +296,7 @@ let }; }; - CoenraadS.bracket-pair-colorizer = buildVscodeMarketplaceExtension { + coenraads.bracket-pair-colorizer = buildVscodeMarketplaceExtension { meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/CoenraadS.bracket-pair-colorizer/changelog"; description = "A customizable extension for colorizing matching brackets"; @@ -708,7 +708,7 @@ let }; }; - golang.Go = buildVscodeMarketplaceExtension { + golang.go = buildVscodeMarketplaceExtension { mktplcRef = { name = "Go"; publisher = "golang"; @@ -1518,7 +1518,7 @@ let aliases = self: super: { # aliases - ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) Go; }; + ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) go; }; }; # TODO: add overrides overlay, so that we can have a generated.nix diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index caf65508210d..3955b1851d32 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.12.19"; - suffix = "zen2"; + version = "5.13.5"; + suffix = "zen1"; in buildLinux (args // { @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-l+KIlaXoq/Nzf7mUom9DUjaAsn7UxeKGL6MbYN7mBZk="; + sha256 = "sha256-3guG482lsdcWqAJ1kY757D4EeOEpTDvy95de0bHif98="; }; extraMeta = { diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index e09def926e18..094173256c03 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "tailscale"; - version = "1.10.2"; + version = "1.12.0"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-bAWQTdpqDF7ERQzNY1k0NtxdA9M9bIyfHtvX0nKfIQY="; + sha256 = "sha256-PdCEmB0qchXtxIDfQVjA7f6YgHUe3ojmsMazpq4k6Bo="; }; nativeBuildInputs = [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "1mq5bbz9vsxhcrwxpsdnhp8q8zrnp6jpqggn9n5kqr82f3bizwxv"; + vendorSha256 = "sha256-NIf5nyUXZY5UGFcdjeeFZdGKVcD2pve+PytziCD2NFk="; doCheck = false; |