summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chaski/services/tracktrain.nix12
-rw-r--r--flake.lock105
-rw-r--r--flake.nix16
-rw-r--r--flora/services/mail.nix2
-rw-r--r--home/packages.nix6
-rw-r--r--ilex/configuration.nix3
-rw-r--r--pkgs/crs-tools-add-lockfile.patch (renamed from pkgs/0001-add-lockfile.patch)0
-rw-r--r--pkgs/crs-tools.nix2
-rw-r--r--pkgs/glitchtip-fix-poetry-name.patch (renamed from pkgs/0001-fix-poetry-name-issue.patch)0
-rw-r--r--pkgs/glitchtip-fix-versions.patch (renamed from pkgs/0002-fix-django-version-bound.patch)0
-rw-r--r--pkgs/glitchtip.nix4
-rw-r--r--pkgs/overlay.nix23
-rw-r--r--pkgs/typst.nix27
13 files changed, 66 insertions, 134 deletions
diff --git a/chaski/services/tracktrain.nix b/chaski/services/tracktrain.nix
index b6394de..bbaa693 100644
--- a/chaski/services/tracktrain.nix
+++ b/chaski/services/tracktrain.nix
@@ -121,13 +121,11 @@ in
script = ''
cd /tmp
ln -sf ${pkgs.writeText "config.yaml" tracktrain-config} "config.yaml"
- ${stripLib (((import inputs.tracktrain {nixpkgs = pkgs;}))
- # have to remove version constraints because some aren't in 22.05
- .overrideAttrs (old: { patchPhase = ''
- sed -i "s/base.*/base/g" *.cabal
- sed -i "s/^>=.*//g" *.cabal
- sed -i "s/>=.*//g" *.cabal
- ''; }))
+ ${
+ import inputs.tracktrain {
+ nixpkgs = pkgs;
+ compiler = "default";
+ }
}/bin/tracktrain +RTS -T
'';
startAt = "daily";
diff --git a/flake.lock b/flake.lock
index f3ab829..e3731b5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -73,11 +73,11 @@
"utils": "utils"
},
"locked": {
- "lastModified": 1683779844,
- "narHash": "sha256-sIeOU0GsCeQEn5TpqE/jFRN4EGsPsjqVRsPdrzIDABM=",
+ "lastModified": 1686747123,
+ "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=",
"owner": "serokell",
"repo": "deploy-rs",
- "rev": "c80189917086e43d49eece2bd86f56813500a0eb",
+ "rev": "724463b5a94daa810abfc64a4f87faef4e00f984",
"type": "github"
},
"original": {
@@ -158,12 +158,12 @@
"rev": "2a9d4fcf48b872aef1343f71dfddf44946fd8eb5",
"revCount": 18,
"type": "git",
- "url": "https://stuebinm.eu/git/gtfs-books"
+ "url": "https://stuebinm.eu/git/forks/gtfs-books"
},
"original": {
"ref": "main",
"type": "git",
- "url": "https://stuebinm.eu/git/gtfs-books"
+ "url": "https://stuebinm.eu/git/forks/gtfs-books"
}
},
"home-manager": {
@@ -173,16 +173,16 @@
]
},
"locked": {
- "lastModified": 1685189510,
- "narHash": "sha256-Hq5WF7zIixojPgvhgcd6MBvywwycVZ9wpK/8ogOyoaA=",
+ "lastModified": 1687871164,
+ "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "2d963854ae2499193c0c72fd67435fee34d3e4fd",
+ "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "master",
+ "ref": "release-23.05",
"repo": "home-manager",
"type": "github"
}
@@ -220,42 +220,27 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1685302407,
- "narHash": "sha256-GaH2fAOQOSJehr085tMNaE2LPTbVRI7burGZUVeSfmQ=",
+ "lastModified": 1687829761,
+ "narHash": "sha256-QRe1Y8SS3M4GeC58F/6ajz6V0ZLUVWX3ZAMgov2N3/g=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "b2ea8027e4d43b652293448eeafe564b53ca2a94",
+ "rev": "9790f3242da2152d5aa1976e3e4b8b414f4dd206",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "release-23.05",
+ "ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
- "nixpkgs-22_11": {
- "locked": {
- "lastModified": 1669558522,
- "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "ref": "nixos-22.11",
- "type": "indirect"
- }
- },
"nixpkgs-oldstable": {
"locked": {
- "lastModified": 1685314633,
- "narHash": "sha256-8LXBPqTQXl5ofkjpJ18JcbmLJ/lWDoMxtUwiDYv0wro=",
+ "lastModified": 1688117947,
+ "narHash": "sha256-eSVbMmqsGwPlJy8jqzxwZ+cJzu8TpI2KSSKm8xVw+XQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b",
+ "rev": "2039c98a8afec8ff3273a3ac34b9e3864174ed94",
"type": "github"
},
"original": {
@@ -267,11 +252,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1685012353,
- "narHash": "sha256-U3oOge4cHnav8OLGdRVhL45xoRj4Ppd+It6nPC9nNIU=",
+ "lastModified": 1687977148,
+ "narHash": "sha256-gUcXiU2GgjYIc65GOIemdBJZ+lkQxuyIh7OkR9j0gCo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "aeb75dba965e790de427b73315d5addf91a54955",
+ "rev": "60a783e00517fce85c42c8c53fe0ed05ded5b2a4",
"type": "github"
},
"original": {
@@ -281,21 +266,6 @@
"type": "github"
}
},
- "nixpkgs_2": {
- "locked": {
- "lastModified": 1670751203,
- "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "ref": "nixos-unstable",
- "type": "indirect"
- }
- },
"playground": {
"flake": false,
"locked": {
@@ -345,11 +315,11 @@
]
},
"locked": {
- "lastModified": 1685240871,
- "narHash": "sha256-bOCbP0lWTjhmrPcdyuFD/yx/38CKkzC2TNXmBzZSLJA=",
+ "lastModified": 1688092301,
+ "narHash": "sha256-NTgT955DzXWVjHsuBn1t2K0x4hUghY7uE1jG2nGL5R4=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "aa1b08de9ca770534ad750dccc70cebd95c15e26",
+ "rev": "4c31223801dd0f28ac15d60f2e5ddbd4d51ce17a",
"type": "github"
},
"original": {
@@ -379,16 +349,23 @@
"inputs": {
"blobs": "blobs",
"flake-compat": "flake-compat_2",
- "nixpkgs": "nixpkgs_2",
- "nixpkgs-22_11": "nixpkgs-22_11",
+ "nixpkgs": [
+ "nixpkgs-unstable"
+ ],
+ "nixpkgs-22_11": [
+ "nixpkgs-oldstable"
+ ],
+ "nixpkgs-23_05": [
+ "nixpkgs"
+ ],
"utils": "utils_2"
},
"locked": {
- "lastModified": 1684964237,
- "narHash": "sha256-dDS+GhdZN2MAa2FJKFGM2gpgAXhx+xoMkpVsRx9qpDE=",
+ "lastModified": 1688064897,
+ "narHash": "sha256-Q3CZc6ZfC4KpjGWVPsrofFgxor+UjqhbFBSi7YmHVvI=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
- "rev": "1bcfcf786bc289ca1bd2c9d29d6f02d9141b1da3",
+ "rev": "0c1801b48995ec6909e040abedaa56a64f0db430",
"type": "gitlab"
},
"original": {
@@ -408,11 +385,11 @@
]
},
"locked": {
- "lastModified": 1685242617,
- "narHash": "sha256-UBPXGfGwGMJm2Wj9kDj8+TMMK2PTouSM/TpiXYtaqtQ=",
+ "lastModified": 1687398569,
+ "narHash": "sha256-e/umuIKFcFtZtWeX369Hbdt9r+GQ48moDmlTcyHWL28=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "3e016341d4dca6ce7c62316f90e66341841a30f9",
+ "rev": "2ff6973350682f8d16371f8c071a304b8067f192",
"type": "github"
},
"original": {
@@ -439,11 +416,11 @@
"tracktrain": {
"flake": false,
"locked": {
- "lastModified": 1685134031,
- "narHash": "sha256-pue+T755mMbzBmYL6nspiHaFvbKrjfG9I3XxhRegN7U=",
+ "lastModified": 1688154251,
+ "narHash": "sha256-iv2xUUYhjIcKWs1+l7h43z7v/a9/OamBKXi/gcl4ppI=",
"ref": "main",
- "rev": "c0128f357b5268cd31969b8ff630db3ccb3681de",
- "revCount": 91,
+ "rev": "a995dabf07574a32c1ae62ad23b96ba7d8e076ee",
+ "revCount": 92,
"type": "git",
"url": "https://stuebinm.eu/git/tracktrain"
},
diff --git a/flake.nix b/flake.nix
index 4da00c9..c96d5aa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,17 +1,23 @@
{
- description = "testing nix flakes for server deployment";
+ description = ''
+ stuebinm's flake stuff. re-use of packages defined here is free,
+ but perhaps don't depend on anything actually working or being maintained
+ '';
inputs = {
- nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
+ nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixpkgs-oldstable.url = "github:NixOS/nixpkgs/release-22.11";
- home-manager.url = "github:nix-community/home-manager/master";
+ home-manager.url = "github:nix-community/home-manager/release-23.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
deploy-rs.url = "github:serokell/deploy-rs";
deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
simple-nixos-mailserver.url =
"gitlab:simple-nixos-mailserver/nixos-mailserver/master";
+ simple-nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs-unstable";
+ simple-nixos-mailserver.inputs.nixpkgs-23_05.follows = "nixpkgs";
+ simple-nixos-mailserver.inputs.nixpkgs-22_11.follows = "nixpkgs-oldstable";
rust-overlay.url = "github:oxalica/rust-overlay";
rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
sops-nix.url = "github:Mic92/sops-nix";
@@ -40,7 +46,7 @@
bahnhof-name.url = "git+https://stuebinm.eu/git/bahnhof.name";
bahnhof-name.flake = false;
- gtfsBooks.url = "git+https://stuebinm.eu/git/gtfs-books?ref=main";
+ gtfsBooks.url = "git+https://stuebinm.eu/git/forks/gtfs-books?ref=main";
gtfsBooks.flake = false;
walint.url = "git+https://stuebinm.eu/git/walint?ref=playground";
walint.flake = false;
@@ -132,7 +138,7 @@
packages.x86_64-linux = {
inherit (nixpkgs)
galmon-core galmon-full glitchtip typst almanac
- kijetesantakaluotokieni showrt isabelle-utils isabat emacs29
+ kijetesantakaluotokieni showrt isabelle-utils isabat
travelynx crs-tracker crs-php bahnhof-name;
};
diff --git a/flora/services/mail.nix b/flora/services/mail.nix
index e43e56f..2e1179a 100644
--- a/flora/services/mail.nix
+++ b/flora/services/mail.nix
@@ -21,6 +21,6 @@
# Use Let's Encrypt certificates. Note that this needs to set up a stripped
# down nginx and opens port 80.
- certificateScheme = 3;
+ certificateScheme = "acme-nginx";
};
}
diff --git a/home/packages.nix b/home/packages.nix
index eb3cca0..b1e6ca1 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -6,7 +6,7 @@ in
{
home.packages = with pkgs; [
# inputs.emacs-overlay.packages.x86_64-linux.emacsPgtk
- emacs29
+ emacs29-pgtk
emacs-all-the-icons-fonts nerdfonts
# internet apps & clients
@@ -30,8 +30,8 @@ in
# things for emacs
sqlite brightnessctl scrot playerctl tlp
# haskell & co
- haskell.packages.ghc902.ghc cabal-install stack
- haskell.packages.ghc902.haskell-language-server
+ ghc cabal-install stack
+ haskell-language-server
haskellPackages.hoogle haskellPackages.stylish-haskell
# other functional things
racket dhall lean dune_2 ocamlPackages.utop ocamlPackages.ocp-indent
diff --git a/ilex/configuration.nix b/ilex/configuration.nix
index 402e967..d8cd2d4 100644
--- a/ilex/configuration.nix
+++ b/ilex/configuration.nix
@@ -15,7 +15,8 @@
networking.firewall.allowedTCPPorts = [ 5000 ];
- boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_3;
+ boot.kernelPackages =
+ pkgs.linuxKernel.packageAliases.linux_latest;
hardware.opengl.driSupport32Bit = true;
# Use the systemd-boot EFI boot loader.
diff --git a/pkgs/0001-add-lockfile.patch b/pkgs/crs-tools-add-lockfile.patch
index a8cd3ce..a8cd3ce 100644
--- a/pkgs/0001-add-lockfile.patch
+++ b/pkgs/crs-tools-add-lockfile.patch
diff --git a/pkgs/crs-tools.nix b/pkgs/crs-tools.nix
index def657c..4993b53 100644
--- a/pkgs/crs-tools.nix
+++ b/pkgs/crs-tools.nix
@@ -27,7 +27,7 @@ rec {
};
patches = [
- ./0001-add-lockfile.patch
+ ./crs-tools-add-lockfile.patch
];
buildInputs = [ php php.packages.composer ];
diff --git a/pkgs/0001-fix-poetry-name-issue.patch b/pkgs/glitchtip-fix-poetry-name.patch
index 9cc82bd..9cc82bd 100644
--- a/pkgs/0001-fix-poetry-name-issue.patch
+++ b/pkgs/glitchtip-fix-poetry-name.patch
diff --git a/pkgs/0002-fix-django-version-bound.patch b/pkgs/glitchtip-fix-versions.patch
index 43d97a9..43d97a9 100644
--- a/pkgs/0002-fix-django-version-bound.patch
+++ b/pkgs/glitchtip-fix-versions.patch
diff --git a/pkgs/glitchtip.nix b/pkgs/glitchtip.nix
index 380eb48..94550ad 100644
--- a/pkgs/glitchtip.nix
+++ b/pkgs/glitchtip.nix
@@ -18,8 +18,8 @@ let
projectDir = src;
patches = [
- ./0001-fix-poetry-name-issue.patch
- ./0002-fix-django-version-bound.patch
+ ./glitchtip-fix-poetry-name.patch
+ ./glitchtip-fix-versions.patch
];
# a bunch of python packages seem to misdeclare their dependencies
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 0f38c5f..b3876d5 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -18,11 +18,6 @@ in
});
});
- typst = self.callPackage ./typst.nix {
- rust-bin =
- self.rust-bin;
- };
-
almanac = self.rustPlatform.buildRustPackage rec {
pname = "almanac";
version = "git";
@@ -64,22 +59,6 @@ in
isabelle-rust-utils = self.isabelle-utils;
};
- emacs29 = self.callPackage
- (import "${inputs.nixpkgs.outPath}/pkgs/applications/editors/emacs/generic.nix" {
- version = "29";
- sha256 = "sha256-52ww8DBlDu1frfmLMTnsCmQld6OVX7qBNqVXjuY3GA8=";
- }) {
- inherit (self.darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz
- QuartzCore WebKit ImageCaptureCore GSS ImageIO;
- gconf = null;
- alsa-lib = null;
- gpm = null;
- libXaw = self.xorg.libXaw;
- inherit (self.darwin) sigtool;
- withPgtk = true;
- withX = false;
- };
-
crs-tracker = crs-tools.tracker;
crs-php = crs-tools.php;
@@ -97,7 +76,5 @@ in
src = inputs.bahnhof-name;
};
-
- # dbus = super.dbus.override { x11Support = false; };
mu = oldstable.mu;
}
diff --git a/pkgs/typst.nix b/pkgs/typst.nix
deleted file mode 100644
index f505cf5..0000000
--- a/pkgs/typst.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ rustPlatform, fetchFromGitHub, lib, git, rust-bin, ... }:
-
-rustPlatform.buildRustPackage rec {
- pname = "typst-cli";
- version = "v0.3.0";
-
- cargoBuildFlags = "-p typst-cli";
- cargoLock = {
- lockFile = "${src}/Cargo.lock";
- outputHashes = {
- "iai-0.1.1" = "sha256-EdNzCPht5chg7uF9O8CtPWR/bzSYyfYIXNdLltqdlR0=";
- };
- };
- src = fetchFromGitHub {
- owner = "typst";
- repo = "typst";
- sha256 = "sha256-JCsHNPQ9WHqq1Qg2j3TjRr0RCnwS8X3/K/n8FXYE8D4=";
- rev = version;
- leaveDotGit = true;
- };
-
- # the build.rs script wants a version hash from git.
- nativeBuildInputs = [
- git
- rust-bin.stable.latest.minimal
- ];
-}