summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hosts/flora/services/pleroma.nix2
-rw-r--r--nix/sources.json22
-rw-r--r--nix/sources.nix5
-rw-r--r--pkgs/default.nix3
4 files changed, 18 insertions, 14 deletions
diff --git a/hosts/flora/services/pleroma.nix b/hosts/flora/services/pleroma.nix
index 075908d..a76a9eb 100644
--- a/hosts/flora/services/pleroma.nix
+++ b/hosts/flora/services/pleroma.nix
@@ -26,7 +26,7 @@ in
documentation.enable = false;
# pleroma has a cli tool for configuration
- environment.systemPackages = [ pkgs.pleroma-otp pkgs.dnsutils ];
+ environment.systemPackages = [ pkgs.pleroma pkgs.dnsutils ];
services.pleroma = {
enable = true;
diff --git a/nix/sources.json b/nix/sources.json
index c112883..b61f355 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,10 +5,10 @@
"homepage": "https://github.com/nmattia/niv",
"owner": "nmattia",
"repo": "niv",
- "rev": "94080ae8286024820c570a2a24ed7c36d7ad04a9",
- "sha256": "0wlk52zwlrq727x3z1vg9d9qq4zw62ab5jzg4068iqb6hyb0cr0w",
+ "rev": "e0ca65c81a2d7a4d82a189f1e23a48d59ad42070",
+ "sha256": "1pq9nh1d8nn3xvbdny8fafzw87mj7gsmp6pxkdl65w2g18rmcmzx",
"type": "tarball",
- "url": "https://github.com/nmattia/niv/archive/94080ae8286024820c570a2a24ed7c36d7ad04a9.tar.gz",
+ "url": "https://github.com/nmattia/niv/archive/e0ca65c81a2d7a4d82a189f1e23a48d59ad42070.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {
@@ -17,10 +17,10 @@
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "21ff9308b75d448765f7c3704a1459a3d8e1c844",
- "sha256": "0i32d1q5v9a0q4y1s010afn6vxljbliilq5cs63mk6sdw3kryj2b",
+ "rev": "d6a5be86b6adf99d0c853331460c6736785bfaaf",
+ "sha256": "0lsfrid5g880yqq5vqcbp0n61pgc9z25fbvzb0a8akrbn87jzjjl",
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/21ff9308b75d448765f7c3704a1459a3d8e1c844.tar.gz",
+ "url": "https://github.com/NixOS/nixpkgs/archive/d6a5be86b6adf99d0c853331460c6736785bfaaf.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs-unstable": {
@@ -29,16 +29,16 @@
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "94b2848559b12a8ed1fe433084686b2a81123c99",
- "sha256": "1pbl4c2dsaz2lximgd31m96jwbps6apn3anx8cvvhk1gl9rkg107",
+ "rev": "b27eaa18b47b77fbbf9f3bd7a17046b2d64b637b",
+ "sha256": "0vhqw7avmn9cimkqk6m2bn7ksjf52iqhv0r89myxm7yvy3wn7nhi",
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/94b2848559b12a8ed1fe433084686b2a81123c99.tar.gz",
+ "url": "https://github.com/NixOS/nixpkgs/archive/b27eaa18b47b77fbbf9f3bd7a17046b2d64b637b.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"workadventure": {
- "ref": "master",
+ "branch": "master",
"repo": "https://stuebinm.eu/git/workadventure-nix",
- "rev": "6122eb04910dd6c34585dcbff72679a93b5aeaf5",
+ "rev": "cea6e1ce0b6ffab61fe304dceb049dce268c9b65",
"type": "git"
}
}
diff --git a/nix/sources.nix b/nix/sources.nix
index b796fff..1938409 100644
--- a/nix/sources.nix
+++ b/nix/sources.nix
@@ -98,7 +98,10 @@ let
saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
in
- if ersatz == "" then drv else ersatz;
+ if ersatz == "" then drv else
+ # this turns the string into an actual Nix path (for both absolute and
+ # relative paths)
+ if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
# Ports of functions for older nix versions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index fb2cc3d..5195e04 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -7,7 +7,8 @@ let
callPackage = pkgs.lib.callPackageWith (pkgs // newpkgs);
newpkgs = {
- pleroma-otp = callPackage "${sources.nixpkgs-unstable}/pkgs/servers/pleroma-otp" {};
+ #pleroma-otp = callPackage "${sources.nixpkgs-unstable}/pkgs/servers/pleroma-otp" {};
+ pleroma = (import sources.nixpkgs-unstable {}).pleroma;
# dendrite = callPackage "${sources.nixchen}/pkgs/dendrite" {};
inherit callPackage;