Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse Source
This commit is contained in:
lassulus 2022-09-13 11:50:18 +02:00
commit 548bd143db
4 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
krebs/5pkgs/haskell/mailaids.nix
View File

@ -1,14 +1,14 @@
{ mkDerivation, aeson, aeson-pretty, base, bytestring { mkDerivation, aeson, aeson-pretty, base, bytestring
, case-insensitive, fetchgit, lens, optparse-applicative , case-insensitive, fetchgit, lens, lib, optparse-applicative
, purebred-email, lib, text, vector, word8 , purebred-email, text, vector, word8
}: }:
mkDerivation { mkDerivation {
pname = "mailaids"; pname = "mailaids";
version = "1.0.0"; version = "1.1.0";
src = fetchgit { src = fetchgit {
url = "https://cgit.krebsco.de/mailaids"; url = "https://cgit.krebsco.de/mailaids";
sha256 = "15h0k82czm89gkwhp1rwdy77jz8dmb626qdz7c2narvz9j7169v5"; sha256 = "0mkq3b0j28h7ydg6aaqlqnvajb8nhdc9g7rmil2d4vl5fxxaqspv";
rev = "8f11927ea74d6adb332c884502ebd9c486837523"; rev = "a25fc32eceefc10a91ef77ff2763b3f1b9324aaf";
fetchSubmodules = true; fetchSubmodules = true;
}; };
isLibrary = false; isLibrary = false;

16
krebs/5pkgs/haskell/purebred-email/default.nix
View File

@ -1,31 +1,27 @@
{ mkDerivation, attoparsec, base, base64-bytestring, bytestring { mkDerivation, attoparsec, base, base64-bytestring, bytestring
, case-insensitive, concise, deepseq, fetchgit, hedgehog, lens, lib , case-insensitive, concise, deepseq, fetchgit, hedgehog, lens, lib
, QuickCheck, quickcheck-instances, semigroupoids, semigroups , QuickCheck, quickcheck-instances, random, semigroupoids
, stringsearch, tasty, tasty-golden, tasty-hedgehog, tasty-hunit , stringsearch, tasty, tasty-golden, tasty-hedgehog, tasty-hunit
, tasty-quickcheck, text, time , tasty-quickcheck, text, time
}: }:
mkDerivation { mkDerivation {
pname = "purebred-email"; pname = "purebred-email";
version = "0.4.3"; version = "0.5.1";
src = fetchgit { src = fetchgit {
url = "https://github.com/purebred-mua/purebred-email"; url = "https://github.com/purebred-mua/purebred-email";
sha256 = "06xhccavrdzfsvg65mzdnp0a7b1ilk2rqpnyvkr171ir6mqdpb19"; sha256 = "0iilyy5dkbzbiazyyfjdz585c3x8b7c2piynmycm7krkc48993vw";
rev = "769b360643f699c0a8cd6f1c3a3de36cf0479834"; rev = "7ba346e10ad1521a923bc04a4ffeca479d8dd071";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [
./untweak-mime-version-header.patch
];
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
libraryHaskellDepends = [ libraryHaskellDepends = [
attoparsec base base64-bytestring bytestring case-insensitive attoparsec base base64-bytestring bytestring case-insensitive
concise deepseq lens semigroupoids semigroups stringsearch text concise deepseq lens random semigroupoids stringsearch text time
time
]; ];
testHaskellDepends = [ testHaskellDepends = [
attoparsec base bytestring case-insensitive hedgehog lens attoparsec base bytestring case-insensitive hedgehog lens
QuickCheck quickcheck-instances semigroups tasty tasty-golden QuickCheck quickcheck-instances random tasty tasty-golden
tasty-hedgehog tasty-hunit tasty-quickcheck text time tasty-hedgehog tasty-hunit tasty-quickcheck text time
]; ];
homepage = "https://github.com/purebred-mua/purebred-email"; homepage = "https://github.com/purebred-mua/purebred-email";

2
submodules/krops

@ -1 +1 @@
Subproject commit 3aa04be96f19cc5f4866b2b36a351f88f6667bd2 Subproject commit 3ebbfc62615d4ba253a4dd96bac0f4b2128a2b6d

11
tv/1systems/alnus/config.nix
View File

@ -69,13 +69,12 @@ with import <stockholm/lib>;
enable = true; enable = true;
twoFingerScroll = true; twoFingerScroll = true;
}; };
desktopManager.xfce.enable = true;
displayManager.lightdm.autoLogin.enable = true;
displayManager.lightdm.autoLogin.user = "dv";
displayManager.lightdm.enable = true;
}; };
services.xserver.desktopManager.plasma5.enable = true;
services.xserver.displayManager.autoLogin.enable = true;
services.xserver.displayManager.autoLogin.user = "dv";
system.stateVersion = "22.05";
users.users.dv = { users.users.dv = {
inherit (config.krebs.users.dv) home uid; inherit (config.krebs.users.dv) home uid;