From a66d2de5ba78f60f5ba2f4bbd73fcb8a61500e62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 Apr 2024 15:38:19 +0000 Subject: cri-o-unwrapped: 1.29.3 -> 1.29.4 --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index a32d4bd8db441..959fe755c209e 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.29.3"; + version = "1.29.4"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-JJuqYC4GAZqXyyAjVoPipnGjRGbVx1rfH4UrtIOP7cc="; + hash = "sha256-bF9hvKKwhsmX606Jk34qn32JklUrG939BW2x4tbknjo="; }; vendorHash = null; -- cgit 1.4.1 From c326dd2aa8b230c988861b3978a134104d5d5e5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 May 2024 17:41:08 +0000 Subject: qpwgraph: 0.6.3 -> 0.7.1 --- pkgs/applications/audio/qpwgraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 0867919ab47e7..60ac9cb81b795 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.6.3"; + version = "0.7.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-mTWmXHC9KkXgUIO5CIcGOoYYLx+5si/LETSmHFhmrRE="; + sha256 = "sha256-mtW+dbjdp7as0N5+iacMSNrJ4jm8HWYqJP6G+lutucc="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; -- cgit 1.4.1 From b26ccee60e3cabf50994727ef02d62719b1627f8 Mon Sep 17 00:00:00 2001 From: Aos Dabbagh <25783780+aos@users.noreply.github.com> Date: Fri, 5 Apr 2024 23:25:16 -0400 Subject: kubernetes-helm-mapkubeapis: init at 0.4.1 Was looking for this plugin, but couldn't find it. I found this open PR: NixOS#217530 but it seems to have gone stale (no activity in over a year). I posted in it but figured everyone is too busy so I just decided to resubmit, addressing comments :-) --- .../networking/cluster/helm/plugins/default.nix | 4 +-- .../cluster/helm/plugins/helm-mapkubeapis.nix | 34 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/cluster/helm/plugins/default.nix b/pkgs/applications/networking/cluster/helm/plugins/default.nix index 1a6aa12a91e5b..8ac059e98a249 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/default.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/default.nix @@ -1,17 +1,17 @@ { callPackage }: { + helm-cm-push = callPackage ./helm-cm-push.nix { }; helm-diff = callPackage ./helm-diff.nix { }; helm-git = callPackage ./helm-git.nix { }; - helm-cm-push = callPackage ./helm-cm-push.nix { }; + helm-mapkubeapis = callPackage ./helm-mapkubeapis.nix { }; helm-s3 = callPackage ./helm-s3.nix { }; helm-secrets = callPackage ./helm-secrets.nix { }; helm-unittest = callPackage ./helm-unittest.nix { }; - } diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix new file mode 100644 index 0000000000000..21cb8b065e7ee --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix @@ -0,0 +1,34 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "helm-mapkubeapis"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "helm"; + repo = "helm-mapkubeapis"; + rev = "v${version}"; + hash = "sha256-6NeePXTdp5vlBLfIlWeXQZMZ0Uz/e1ZCgZmJvBJfaFw="; + }; + + vendorHash = "sha256-rVrQqeakPQl3rjzmqzHw74ffreLEVzP153wWJ8TEOIM="; + + # NOTE: Remove the install and upgrade hooks. + postPatch = '' + sed -i '/^hooks:/,+2 d' plugin.yaml + ''; + + postInstall = '' + install -dm755 $out/helm-mapkubeapis + mv $out/bin $out/helm-mapkubeapis/ + install -m644 -Dt $out/helm-mapkubeapis/config/ config/Map.yaml + install -m644 -Dt $out/helm-mapkubeapis plugin.yaml + ''; + + meta = { + description = "A Helm plugin which maps deprecated or removed Kubernetes APIs in a release to supported APIs"; + homepage = "https://github.com/helm/helm-mapkubeapis"; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ aos ]; + }; +} -- cgit 1.4.1 From c6861e8f0f0c4983ba0777864fa1bb2f4dfe8054 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 May 2024 02:55:32 +0000 Subject: vis: 0.8 -> 0.9 --- pkgs/applications/editors/vis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 479a475e07416..0ef1efaf75776 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "vis"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { rev = "v${version}"; - sha256 = "sha256-XvWj6fZxzXeRA5oCAqIIwlfjrJcHnDrjeiPExEQKSkY="; + sha256 = "sha256-SYM3zlzhp3NdyOjtXc+pOiWY4/WA/Ax+qAWe18ggq3g="; repo = "vis"; owner = "martanne"; }; -- cgit 1.4.1 From 97f83eb69dcd4bab83631860c92b796d091f1f75 Mon Sep 17 00:00:00 2001 From: Madelyn <20760527+r3n3gad3p3arl@users.noreply.github.com> Date: Thu, 2 May 2024 09:24:43 +0000 Subject: Merge #288176: init mpvScripts.mpv-notify-send at 0-unstable-2020-02-24 --- maintainers/maintainer-list.nix | 5 +++ pkgs/applications/video/mpv/scripts/default.nix | 1 + .../video/mpv/scripts/mpv-notify-send.nix | 39 ++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 pkgs/applications/video/mpv/scripts/mpv-notify-send.nix (limited to 'pkgs/applications') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 77a0f3520ef99..4c89893f4b756 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16527,6 +16527,11 @@ githubId = 35229674; name = "Armin Rothfuss"; }; + r3n3gad3p3arl = { + github = "r3n3gad3p3arl"; + githubId = 20760527; + name = "Madelyn"; + }; raboof = { email = "arnout@bzzt.net"; matrix = "@raboof:matrix.org"; diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 8b740d1ded325..ce5188c09d294 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -75,6 +75,7 @@ let modernx-zydezu = callPackage ./modernx-zydezu.nix { }; mpris = callPackage ./mpris.nix { }; mpv-cheatsheet = callPackage ./mpv-cheatsheet.nix { }; + mpv-notify-send = callPackage ./mpv-notify-send.nix { }; mpv-osc-modern = callPackage ./mpv-osc-modern.nix { }; mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; mpv-slicing = callPackage ./mpv-slicing.nix { }; diff --git a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix new file mode 100644 index 0000000000000..04b03670b79f2 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix @@ -0,0 +1,39 @@ +{ lib +, buildLua +, fetchFromGitHub +, fetchpatch +, unstableGitUpdater +, libnotify }: + +buildLua rec { + pname = "mpv-notify-send"; + version = "0-unstable-2020-02-24"; + + src = fetchFromGitHub { + owner = "emilazy"; + repo = pname; + rev = "a2bab8b2fd8e8d14faa875b5cc3a73f1276cd88a"; + sha256 = "sha256-EwVkhyB87TJ3i9xJmmZMSTMUKvfbImI1S+y1vgRWbDk="; + }; + + patches = [ + # show title of online videos instead of url + (fetchpatch { + url = "https://github.com/emilazy/mpv-notify-send/pull/6.patch"; + hash = "sha256-7aXQ8qeqG4yX0Uyn09xCIESnwPZsb6Frd7C49XgbpFw="; + }) + ]; + + passthru.extraWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath libnotify) + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "A Lua script for mpv to send notifications with notify-send"; + homepage = "https://github.com/emilazy/mpv-notify-send"; + license = licenses.wtfpl; + maintainers = with maintainers; [ r3n3gad3p3arl ]; + }; +} -- cgit 1.4.1 From e5de825be6e7d07384fcf7784d82f4d4179e1bd0 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 2 May 2024 13:26:14 +0400 Subject: vis: migrate to by-name --- pkgs/applications/editors/vis/default.nix | 63 ------------------------------- pkgs/by-name/vi/vis/package.nix | 63 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 63 insertions(+), 65 deletions(-) delete mode 100644 pkgs/applications/editors/vis/default.nix create mode 100644 pkgs/by-name/vi/vis/package.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix deleted file mode 100644 index 0ef1efaf75776..0000000000000 --- a/pkgs/applications/editors/vis/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper -, copyDesktopItems, makeDesktopItem -, ncurses, libtermkey, lua, tre -, acl, libselinux -}: - -let - luaEnv = lua.withPackages(ps: [ ps.lpeg ]); -in -stdenv.mkDerivation rec { - pname = "vis"; - version = "0.9"; - - src = fetchFromGitHub { - rev = "v${version}"; - sha256 = "sha256-SYM3zlzhp3NdyOjtXc+pOiWY4/WA/Ax+qAWe18ggq3g="; - repo = "vis"; - owner = "martanne"; - }; - - nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ]; - - buildInputs = [ - ncurses - libtermkey - luaEnv - tre - ] ++ lib.optionals stdenv.isLinux [ - acl - libselinux - ]; - - postInstall = '' - wrapProgram $out/bin/vis \ - --prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ - --prefix LUA_PATH ';' "${luaEnv}/share/lua/${lua.luaversion}/?.lua" \ - --prefix VIS_PATH : "\$HOME/.config:$out/share/vis" - ''; - - desktopItems = [ - (makeDesktopItem { - name = "vis"; - exec = "vis %U"; - type = "Application"; - icon = "accessories-text-editor"; - comment = meta.description; - desktopName = "vis"; - genericName = "Text editor"; - categories = [ "Application" "Development" "IDE" ]; - mimeTypes = [ "text/plain" "application/octet-stream" ]; - startupNotify = false; - terminal = true; - }) - ]; - - meta = with lib; { - description = "A vim like editor"; - homepage = "https://github.com/martanne/vis"; - license = licenses.isc; - maintainers = with maintainers; [ vrthra ramkromberg ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/by-name/vi/vis/package.nix b/pkgs/by-name/vi/vis/package.nix new file mode 100644 index 0000000000000..0ef1efaf75776 --- /dev/null +++ b/pkgs/by-name/vi/vis/package.nix @@ -0,0 +1,63 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper +, copyDesktopItems, makeDesktopItem +, ncurses, libtermkey, lua, tre +, acl, libselinux +}: + +let + luaEnv = lua.withPackages(ps: [ ps.lpeg ]); +in +stdenv.mkDerivation rec { + pname = "vis"; + version = "0.9"; + + src = fetchFromGitHub { + rev = "v${version}"; + sha256 = "sha256-SYM3zlzhp3NdyOjtXc+pOiWY4/WA/Ax+qAWe18ggq3g="; + repo = "vis"; + owner = "martanne"; + }; + + nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ]; + + buildInputs = [ + ncurses + libtermkey + luaEnv + tre + ] ++ lib.optionals stdenv.isLinux [ + acl + libselinux + ]; + + postInstall = '' + wrapProgram $out/bin/vis \ + --prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ + --prefix LUA_PATH ';' "${luaEnv}/share/lua/${lua.luaversion}/?.lua" \ + --prefix VIS_PATH : "\$HOME/.config:$out/share/vis" + ''; + + desktopItems = [ + (makeDesktopItem { + name = "vis"; + exec = "vis %U"; + type = "Application"; + icon = "accessories-text-editor"; + comment = meta.description; + desktopName = "vis"; + genericName = "Text editor"; + categories = [ "Application" "Development" "IDE" ]; + mimeTypes = [ "text/plain" "application/octet-stream" ]; + startupNotify = false; + terminal = true; + }) + ]; + + meta = with lib; { + description = "A vim like editor"; + homepage = "https://github.com/martanne/vis"; + license = licenses.isc; + maintainers = with maintainers; [ vrthra ramkromberg ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0054b6f0a942..add3138d86baf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35350,8 +35350,6 @@ with pkgs; neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { }; - vis = callPackage ../applications/editors/vis { }; - viw = callPackage ../applications/editors/viw { }; virter = callPackage ../applications/virtualization/virter { }; -- cgit 1.4.1