Skip to content

Commit

Permalink
Updated neocities-deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
kugland committed Jan 9, 2025
1 parent d5af1b5 commit 13c223f
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 7 deletions.
7 changes: 5 additions & 2 deletions default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{ pkgs ? import <nixpkgs> { } }: rec {
{
pkgs ? import <nixpkgs> { },
fenix ? import (fetchTarball "https://github.com/nix-community/fenix/archive/main.tar.gz") { },
}: rec {
# The `lib`, `modules`, and `overlays` names are special
lib = import ./lib { inherit pkgs; }; # functions
modules = import ./modules; # NixOS modules
Expand All @@ -8,7 +11,7 @@
bip39 = pkgs.callPackage ./pkgs/bip39 { };
ffsubsync = pkgs.callPackage ./pkgs/ffsubsync { inherit auditok pysubs2; };
my-bookmarks-pl = pkgs.callPackage ./pkgs/my-bookmarks-pl { };
neocities-deploy = pkgs.callPackage ./pkgs/neocities-deploy { };
neocities-deploy = pkgs.callPackage ./pkgs/neocities-deploy { inherit fenix; };
pysubs2 = pkgs.callPackage ./pkgs/pysubs2 { };
subtitlecomposer = pkgs.callPackage ./pkgs/subtitlecomposer { };
}
39 changes: 39 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
{
description = "My personal NUR repository";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
fenix = {
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs =
{ self
, fenix
, nixpkgs
,
}:
Expand All @@ -24,6 +31,7 @@
legacyPackages = forAllSystems (system:
import ./default.nix {
pkgs = import nixpkgs { inherit system; };
fenix = fenix.outputs.packages.${system};
});
packages = forAllSystems (system: nixpkgs.lib.filterAttrs (_: v: nixpkgs.lib.isDerivation v) self.legacyPackages.${system});
};
Expand Down
17 changes: 13 additions & 4 deletions pkgs/neocities-deploy/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
{ pkgs
, lib
, fetchFromGitHub
, rustPlatform
, buildRustPackage ? rustPlatform.buildRustPackage
, fenix
,
}:
buildRustPackage rec {

let
toolchain = fenix.minimal.toolchain;
buildRustPackage = (pkgs.makeRustPlatform {
cargo = toolchain;
rustc = toolchain;
}).buildRustPackage;

in
buildRustPackage rec {
pname = "neocities-deploy";
version = "0.1.13";
src = fetchFromGitHub {
Expand All @@ -15,10 +23,11 @@ buildRustPackage rec {
hash = "sha256-Ax1xmNyt+Gymk28p9lXh+CV17rWjMBKIZtc+nthic+8=";
};
cargoHash = "sha256-R6TTB+TXA44vp+7454fu9/5bscgNao0wuskdgpA2BwY=";
doCheck = false;
meta = with lib; {
description = "A command-line tool for deploying your Neocities site";
homepage = "https://github.com/kugland/neocities-deploy";
license = licenses.gpl3;
maintainers = [ ];
maintainers = [ pkgs.maintainers.kugland ];
};
}

0 comments on commit 13c223f

Please sign in to comment.