From c24030bdc0ea5e01431303e577323b09bb3dd311 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 26 Jul 2022 20:46:01 +0200 Subject: reaktor2: 0.4.0a -> 0.4.2 --- krebs/5pkgs/haskell/reaktor2/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/krebs/5pkgs/haskell/reaktor2/default.nix b/krebs/5pkgs/haskell/reaktor2/default.nix index 9ff2bd88..7f89c0b1 100644 --- a/krebs/5pkgs/haskell/reaktor2/default.nix +++ b/krebs/5pkgs/haskell/reaktor2/default.nix @@ -1,18 +1,18 @@ { mkDerivation, aeson, async, attoparsec, base, blessings -, bytestring, containers, data-default, fetchgit, filepath -, hashable, lens, lens-aeson, network, network-simple -, network-simple-tls, network-uri, pcre-light, process, random -, servant-server, lib, string-conversions, stringsearch, text -, time, transformers, unagi-chan, unix, unordered-containers -, vector, wai, warp +, bytestring, containers, data-default, filepath, hashable, lens +, lens-aeson, lib, network, network-simple, network-simple-tls +, network-uri, pcre-light, process, random, servant-server +, string-conversions, stringsearch, text, time, transformers +, unagi-chan, unix, unordered-containers, vector, wai, warp +, fetchgit }: -mkDerivation rec { +mkDerivation { pname = "reaktor2"; - version = "0.4.0a"; + version = "0.4.2"; src = fetchgit { - url = "https://cgit.lassul.us/reaktor2"; - sha256 = "sha256-x1i2TWcycYVFij6832xaBiQa1RQ1VmSfu5Qt1QrUtds="; - rev = "6d3eb6de5e770ee26874bb7449934f0c55bd1efa"; + url = "https://cgit.krebsco.de/reaktor2"; + hash = "sha256-JPQyy0hDSH5JqQGjwoO5BNsD4qk+GKP1VH+j4/2cqes"; + rev = "53a11f421fb18e8687fa06e5511cea8bd9defc36"; fetchSubmodules = true; }; isLibrary = false; -- cgit v1.2.3 From 3e138aabba75e578916040234703ac5541060026 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 26 Jul 2022 21:08:28 +0200 Subject: krops: 1.26.3 -> 1.27.0 --- submodules/krops | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/krops b/submodules/krops index 89e5e676..3aa04be9 160000 --- a/submodules/krops +++ b/submodules/krops @@ -1 +1 @@ -Subproject commit 89e5e67659bbbf0da53cc2cc5dea644b9a2301f6 +Subproject commit 3aa04be96f19cc5f4866b2b36a351f88f6667bd2 -- cgit v1.2.3 From 1c0078af9685997e5adcbc765148e2efd956803c Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 2 Aug 2022 13:33:55 +0200 Subject: tv: -> ../..{,/..}/lib --- tv/5pkgs/default.nix | 2 +- tv/5pkgs/override/default.nix | 2 +- tv/5pkgs/simple/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 4f6643c7..5a018a16 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -1,4 +1,4 @@ -with import ; +with import ../../lib; let pushBack = x: xs: if elem x xs then diff --git a/tv/5pkgs/override/default.nix b/tv/5pkgs/override/default.nix index 4cc4749d..f719a9f6 100644 --- a/tv/5pkgs/override/default.nix +++ b/tv/5pkgs/override/default.nix @@ -1,4 +1,4 @@ -with import ; +with import ../../../lib; self: super: mapNixDir (path: import path self super) ./. diff --git a/tv/5pkgs/simple/default.nix b/tv/5pkgs/simple/default.nix index 6ba4fec8..9fb45dd1 100644 --- a/tv/5pkgs/simple/default.nix +++ b/tv/5pkgs/simple/default.nix @@ -1,4 +1,4 @@ -with import ; +with import ../../../lib; self: super: -- cgit v1.2.3 From 20ff460cb3626e4dce81c9a4aa8ae2fb4b61d869 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 2 Aug 2022 13:43:30 +0200 Subject: tv: pidgin-with-plugins -> pidgin --- tv/1systems/alnus/config.nix | 4 ++-- tv/1systems/mu/config.nix | 4 ++-- tv/1systems/querel/config.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index c09e7f9b..bddd69ef 100644 --- a/tv/1systems/alnus/config.nix +++ b/tv/1systems/alnus/config.nix @@ -18,8 +18,8 @@ with import ; environment.systemPackages = [ pkgs.firefox pkgs.networkmanagerapplet - (pkgs.pidgin-with-plugins.override { - plugins = [ pkgs.pidginotr ]; + (pkgs.pidgin.override { + plugins = [ pkgs.pidgin-otr ]; }) ]; diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 21be2576..00bd5da1 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -63,8 +63,8 @@ with import ; pkgs.iptables pkgs.libreoffice pkgs.plasma-pa - (pkgs.pidgin-with-plugins.override { - plugins = [ pkgs.pidginotr ]; + (pkgs.pidgin.override { + plugins = [ pkgs.pidgin-otr ]; }) pkgs.skypeforlinux pkgs.slock diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix index ad82915f..44c7685e 100644 --- a/tv/1systems/querel/config.nix +++ b/tv/1systems/querel/config.nix @@ -26,8 +26,8 @@ with import ; pkgs.gimp pkgs.kate pkgs.libreoffice - (pkgs.pidgin-with-plugins.override { - plugins = [ pkgs.pidginotr ]; + (pkgs.pidgin.override { + plugins = [ pkgs.pidgin-otr ]; }) pkgs.sxiv pkgs.texlive.combined.scheme-full -- cgit v1.2.3