diff --git a/flake.lock b/flake.lock index 93b01ae3..b4562554 100644 --- a/flake.lock +++ b/flake.lock @@ -476,11 +476,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707956935, - "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", + "lastModified": 1708118438, + "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", + "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", "type": "github" }, "original": { diff --git a/patches/288823.patch b/patches/288823.patch deleted file mode 100644 index bba0adb8..00000000 --- a/patches/288823.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix -index 98edbce3cb49f8..8ecfdb35a7d7ca 100644 ---- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix -+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix -@@ -19,13 +19,13 @@ - - stdenv.mkDerivation (finalAttrs: { - pname = "teams-for-linux"; -- version = "1.4.10"; -+ version = "1.4.11"; - - src = fetchFromGitHub { - owner = "IsmaelMartinez"; - repo = "teams-for-linux"; - rev = "v${finalAttrs.version}"; -- hash = "sha256-dR9YJJBBxvnJkD42+MwIql3B1dlA6WUSLJ//lW22mmc="; -+ hash = "sha256-vjxbWOaUanYXalGVDgX+sjsrz5Cn1yGBkBs9B8VGrDQ="; - }; - - offlineCache = fetchYarnDeps { diff --git a/patches/289258.patch b/patches/289258.patch deleted file mode 100644 index 13973629..00000000 --- a/patches/289258.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix -index 7279f61bac72e5..e888bfe750bb71 100644 ---- a/pkgs/servers/mastodon/gemset.nix -+++ b/pkgs/servers/mastodon/gemset.nix -@@ -1891,13 +1891,11 @@ - groups = ["default"]; - platforms = []; - source = { -- fetchSubmodules = false; -- rev = "e020fcc3a54d993ab45b7194d89ab720296c111b"; -- sha256 = "18pbm9qkancy38v0gpb6f5k0xd8r347jl4xvj4jn98ihfhzgwygj"; -- type = "git"; -- url = "https://github.com/jhawthorn/nsa.git"; -+ remotes = ["https://rubygems.org"]; -+ sha256 = "1narh0bj0c9pg8cb2jhpydfa9mnm3dclckzk5s6xrwa2gm99hnk4"; -+ type = "gem"; - }; -- version = "0.2.8"; -+ version = "0.3.0"; - }; - oj = { - groups = ["default"]; -@@ -2065,10 +2063,10 @@ - platforms = []; - source = { - remotes = ["https://rubygems.org"]; -- sha256 = "0pfj771p5a29yyyw58qacks464sl86d5m3jxjl5rlqqw2m3v5xq4"; -+ sha256 = "0s4vskbydg5k0z86v2g5drf03lslkr4b1l421vz29531jlrsljvy"; - type = "gem"; - }; -- version = "1.5.4"; -+ version = "1.5.5"; - }; - pghero = { - dependencies = ["activerecord"]; -diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix -index bb1a11ac7e60a0..4036b5b48135c6 100644 ---- a/pkgs/servers/mastodon/source.nix -+++ b/pkgs/servers/mastodon/source.nix -@@ -1,7 +1,7 @@ - # This file was generated by pkgs.mastodon.updateScript. - { fetchFromGitHub, applyPatches, patches ? [] }: - let -- version = "4.2.6"; -+ version = "4.2.7"; - in - ( - applyPatches { -@@ -9,7 +9,7 @@ in - owner = "mastodon"; - repo = "mastodon"; - rev = "v${version}"; -- hash = "sha256-xUJiyQN3xsl/8+D/kaky+iYunY0ctlSbjkftN2+NQNw="; -+ hash = "sha256-lz1HMg/B6BOqGxypzDTTO5yY7C5B6QRNIpRnDZW2eGs="; - }; - patches = patches ++ []; - }) // {