makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse source
This commit is contained in:
lassulus 2022-08-02 13:48:10 +02:00
parent b501b81041 20ff460cb3
commit 8d297d33a9
8 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
krebs/5pkgs/haskell/reaktor2/default.nix
View file

@ -1,18 +1,18 @@
{ mkDerivation, aeson, async, attoparsec, base, blessings { mkDerivation, aeson, async, attoparsec, base, blessings
, bytestring, containers, data-default, fetchgit, filepath , bytestring, containers, data-default, filepath, hashable, lens
, hashable, lens, lens-aeson, network, network-simple , lens-aeson, lib, network, network-simple, network-simple-tls
, network-simple-tls, network-uri, pcre-light, process, random , network-uri, pcre-light, process, random, servant-server
, servant-server, lib, string-conversions, stringsearch, text , string-conversions, stringsearch, text, time, transformers
, time, transformers, unagi-chan, unix, unordered-containers , unagi-chan, unix, unordered-containers, vector, wai, warp
, vector, wai, warp , fetchgit
}: }:
mkDerivation rec { mkDerivation {
pname = "reaktor2"; pname = "reaktor2";
version = "0.4.0a"; version = "0.4.2";
src = fetchgit { src = fetchgit {
url = "https://cgit.lassul.us/reaktor2"; url = "https://cgit.krebsco.de/reaktor2";
sha256 = "sha256-x1i2TWcycYVFij6832xaBiQa1RQ1VmSfu5Qt1QrUtds="; hash = "sha256-JPQyy0hDSH5JqQGjwoO5BNsD4qk+GKP1VH+j4/2cqes";
rev = "6d3eb6de5e770ee26874bb7449934f0c55bd1efa"; rev = "53a11f421fb18e8687fa06e5511cea8bd9defc36";
fetchSubmodules = true; fetchSubmodules = true;
}; };
isLibrary = false; isLibrary = false;

2
submodules/krops

@ -1 +1 @@
Subproject commit 89e5e67659bbbf0da53cc2cc5dea644b9a2301f6 Subproject commit 3aa04be96f19cc5f4866b2b36a351f88f6667bd2

4
tv/1systems/alnus/config.nix
View file

@ -18,8 +18,8 @@ with import <stockholm/lib>;
environment.systemPackages = [ environment.systemPackages = [
pkgs.firefox pkgs.firefox
pkgs.networkmanagerapplet pkgs.networkmanagerapplet
(pkgs.pidgin-with-plugins.override { (pkgs.pidgin.override {
plugins = [ pkgs.pidginotr ]; plugins = [ pkgs.pidgin-otr ];
}) })
]; ];

4
tv/1systems/mu/config.nix
View file

@ -63,8 +63,8 @@ with import <stockholm/lib>;
pkgs.iptables pkgs.iptables
pkgs.libreoffice pkgs.libreoffice
pkgs.plasma-pa pkgs.plasma-pa
(pkgs.pidgin-with-plugins.override { (pkgs.pidgin.override {
plugins = [ pkgs.pidginotr ]; plugins = [ pkgs.pidgin-otr ];
}) })
pkgs.skypeforlinux pkgs.skypeforlinux
pkgs.slock pkgs.slock

4
tv/1systems/querel/config.nix
View file

@ -26,8 +26,8 @@ with import <stockholm/lib>;
pkgs.gimp pkgs.gimp
pkgs.kate pkgs.kate
pkgs.libreoffice pkgs.libreoffice
(pkgs.pidgin-with-plugins.override { (pkgs.pidgin.override {
plugins = [ pkgs.pidginotr ]; plugins = [ pkgs.pidgin-otr ];
}) })
pkgs.sxiv pkgs.sxiv
pkgs.texlive.combined.scheme-full pkgs.texlive.combined.scheme-full

2
tv/5pkgs/default.nix
View file

@ -1,4 +1,4 @@
with import <stockholm/lib>; with import ../../lib;
let let
pushBack = x: xs: pushBack = x: xs:
if elem x xs then if elem x xs then

2
tv/5pkgs/override/default.nix
View file

@ -1,4 +1,4 @@
with import <stockholm/lib>; with import ../../../lib;
self: super: self: super:
mapNixDir (path: import path self super) ./. mapNixDir (path: import path self super) ./.

2
tv/5pkgs/simple/default.nix
View file

@ -1,4 +1,4 @@
with import <stockholm/lib>; with import ../../../lib;
self: super: self: super: