Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,40 @@ jobs:
- name: Build
run: cargo build --release

nix:
name: Nix Build
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Check for Nix-relevant changes
uses: dorny/paths-filter@v3
id: filter
with:
filters: |
nix:
- 'flake.nix'
- 'flake.lock'
- 'Cargo.toml'
- 'Cargo.lock'
- 'src/**'
- 'tests/**'

- name: Install Nix
if: steps.filter.outputs.nix == 'true'
uses: DeterminateSystems/determinate-nix-action@v3

- name: Setup Nix cache
if: steps.filter.outputs.nix == 'true'
uses: DeterminateSystems/magic-nix-cache-action@v8
with:
use-flakehub: false

- name: Check flake
if: steps.filter.outputs.nix == 'true'
run: nix flake check

# E2E tests run only on main branch with secrets
e2e:
name: E2E Tests
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/update-flake-lock.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Update flake.lock

on:
workflow_dispatch:
schedule:
- cron: '0 0 1 * *' # Monthly on the 1st

jobs:
update:
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
steps:
- uses: actions/checkout@v4
- uses: DeterminateSystems/determinate-nix-action@v3
- uses: DeterminateSystems/update-flake-lock@main
with:
pr-title: "nix: update flake.lock"
pr-labels: |
dependencies
nix
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
/target
.DS_Store

# Nix
result

# Generated npm platform packages
/npm/darwin-arm64/
/npm/darwin-x64/
Expand Down
27 changes: 27 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,33 @@ cargo install jj-ryu

Binary name is `ryu`.

### Nix

```sh
# Try it
nix run github:dmmulroy/jj-ryu

# Install to profile
nix profile install github:dmmulroy/jj-ryu
```

Or add to your flake inputs:

```nix
{
inputs.jj-ryu.url = "github:dmmulroy/jj-ryu";

outputs = { self, nixpkgs, jj-ryu, ... }: {
nixosConfigurations.myhost = nixpkgs.lib.nixosSystem {
modules = [{
nixpkgs.overlays = [ jj-ryu.overlays.default ];
environment.systemPackages = [ pkgs.jj-ryu ];
}];
};
};
}
```

## Quick start

```sh
Expand Down
96 changes: 96 additions & 0 deletions flake.lock

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

100 changes: 100 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
{
description = "jj-ryu - Stacked PRs CLI for Jujutsu";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
rust-overlay.url = "github:oxalica/rust-overlay";
flake-utils.url = "github:numtide/flake-utils";
};

outputs =
{
self,
nixpkgs,
rust-overlay,
flake-utils,
}:
{
overlays.default = final: prev: {
jj-ryu = self.packages.${final.system}.ryu;
};
}
// flake-utils.lib.eachDefaultSystem (
system:
let
overlays = [ (import rust-overlay) ];
pkgs = import nixpkgs { inherit system overlays; };
lib = pkgs.lib;

rust = pkgs.rust-bin.stable."1.89.0".default;
rustPlatform = pkgs.makeRustPlatform {
cargo = rust;
rustc = rust;
};

version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.version;
versionSuffix = if self ? rev then "-${builtins.substring 0 7 self.rev}" else "-dirty";

src = pkgs.lib.fileset.toSource {
root = ./.;
fileset = pkgs.lib.fileset.unions [
./Cargo.toml
./Cargo.lock
./src
./tests
];
};

meta = with pkgs.lib; {
description = "Stacked PRs for Jujutsu with GitHub/GitLab support";
homepage = "https://github.com/dmmulroy/jj-ryu";
changelog = "https://github.com/dmmulroy/jj-ryu/releases/tag/v${version}";
license = licenses.mit;
maintainers = [ ];
mainProgram = "ryu";
platforms = platforms.unix;
};

ryu = rustPlatform.buildRustPackage {
pname = "jj-ryu";
version = "${version}${versionSuffix}";
inherit src meta;
cargoLock = {
lockFile = ./Cargo.lock;
};
nativeBuildInputs = [
pkgs.pkg-config
pkgs.jujutsu
pkgs.git
];
buildInputs = lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ];
doCheck = true;
};
in
{
packages = {
default = ryu;
ryu = ryu;
};

apps.default = flake-utils.lib.mkApp { drv = ryu; };
apps.ryu = flake-utils.lib.mkApp { drv = ryu; };

checks = {
ryu = ryu;
};

devShells.default = pkgs.mkShell {
inputsFrom = [ ryu ];
packages = [
rust
pkgs.pkg-config
pkgs.rust-analyzer
pkgs.cargo-watch
];
};

formatter = pkgs.nixfmt-rfc-style;
}
);
}
Loading