main
Carsten Kragelund 2023-05-07 22:46:07 +02:00
parent c042c8bfe2
commit 4387253dca
Signed by: nyx
GPG Key ID: CADDADEEC9F753C0
4 changed files with 13 additions and 21 deletions

@ -35,8 +35,7 @@ jobs:
- sanctureplicum
nixPath:
- nixpkgs=channel:nixos-unstable
# nixpkgs-unstable doesn't work
#- nixpkgs=channel:nixpkgs-unstable
- nixpkgs=channel:nixpkgs-unstable
# FIXME: Gitea on stable is using different patches.
# - nixpkgs=channel:nixos-22.11
runs-on: ubuntu-latest
@ -60,15 +59,6 @@ jobs:
name: ${{ matrix.cachixName }}
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Check evaluation
run: |
nix-env -f . -qa \* --meta --xml \
--allowed-uris https://static.rust-lang.org \
--option restrict-eval true \
--option allow-import-from-derivation true \
--drv-path --show-trace \
-I nixpkgs=$(nix-instantiate --find-file nixpkgs) \
-I $PWD
- name: Build nix packages
run: nix shell -f '<nixpkgs>' nix-build-uncached -c nix-build-uncached ci.nix -A cacheOutputs
- name: Trigger NUR update

@ -20,7 +20,7 @@
overlays = import ./overlays; # nixpkgs overlays
firefox-addons = pkgs.recurseIntoAttrs (pkgs.callPackage ./pkgs/firefox-addons { });
gitea-nyx = pkgs.recurseIntoAttrs (pkgs.callPackage ./pkgs/gitea-nyx { });
emacsPackages = import ./pkgs/emacs-packages { inherit pkgs; };
rec-mono-nyx = pkgs.recurseIntoAttrs (pkgs.callPackage ./pkgs/rec-mono-nyx { inherit mach-nix mach-nixpkgs system; });
gitea-nyx = import ./pkgs/gitea-nyx { inherit pkgs; };
emacsPackages = pkgs.recurseIntoAttrs (pkgs.callPackage ./pkgs/emacs-packages { });
rec-mono-nyx = import ./pkgs/rec-mono-nyx { inherit mach-nix mach-nixpkgs system pkgs; };
}

@ -1,3 +1,3 @@
{ pkgs, ... }: {
spectre-el = pkgs.callPackage ./spectre-el.nix {};
spectre-el = import ./spectre-el.nix;
}

@ -1,6 +1,11 @@
{ pkgs, giteaVersion, ... }:
let
nodeNix = (pkgs.callPackage ./node.nix { inherit giteaVersion; });
src = pkgs.fetchgit {
url = "https://gitea.pid1.sh/sanctureplicum/gitea.git";
rev = "refs/tags/${giteaVersion}";
hash = "sha256-KQEBq1BFQRLJW9fJq4W1sOsAqOCfNHKY/+cT8rkXxv4=";
};
nodeNix = (import ./node.nix { inherit pkgs giteaVersion src; });
nodeEnv = (pkgs.callPackage (nodeNix + "/default.nix") { });
in
pkgs.buildGoModule rec {
@ -8,11 +13,7 @@ pkgs.buildGoModule rec {
version = "${giteaVersion}-nyx";
vendorSha256 = "sha256-gfHyssQrY5r3rQAzonM3Rv/BDIYGEY/PiOZEyoGGeiw=";
src = pkgs.fetchgit {
url = "https://gitea.pid1.sh/sanctureplicum/gitea.git";
rev = "refs/tags/${giteaVersion}";
hash = "sha256-KQEBq1BFQRLJW9fJq4W1sOsAqOCfNHKY/+cT8rkXxv4=";
};
inherit src;
nativeBuildInputs = [
pkgs.gnumake
@ -26,6 +27,7 @@ pkgs.buildGoModule rec {
ln -s ${nodeEnv.nodeDependencies}/lib/node_modules ./node_modules
export PATH="${nodeEnv.nodeDependencies}/bin:$PATH"
TAGS="bindata" VERSION="${version}" make frontend vendor generate release-sources
rm -rf $HOME
'';
installPhase = ''