Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gitbutler: init at 0.10.11 #289664

Closed
wants to merge 16 commits into from
Closed
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
7 changes: 7 additions & 0 deletions lib/licenses.nix
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,13 @@ in mkLicense lset) ({
fullName = "GNU Free Documentation License v1.3 or later";
};

fsl-10-mit = {
fullName = "Functional Source License, Version 1.0, MIT Change License";
url = "https://github.com/getsentry/fsl.software/blob/7a73b65596671c42fa8df81a42731cb1c226d8fa/FSL-1.0-MIT.template.md";
free = false;
redistributable = true;
};

ffsl = {
fullName = "Floodgap Free Software License";
url = "https://www.floodgap.com/software/ffsl/license.html";
Expand Down
95 changes: 95 additions & 0 deletions pkgs/by-name/gi/gitbutler-ui/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
{
"name": "@gitbutler/ui",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite dev",
"test": "vitest run --mode development",
"build:development": "vite build --mode development",
"build:nightly": "vite build --mode nightly",
"build": "vite build",
"check": "svelte-check --tsconfig ./tsconfig.json",
"check:watch": "pnpm check --watch",
"lint": "prettier --no-editorconfig --check . && eslint .",
"format": "prettier --no-editorconfig --write .",
"fix": "eslint --fix .",
"tauri": "tauri",
"prepare": "svelte-kit sync"
},
"devDependencies": {
"@codemirror/lang-cpp": "^6.0.2",
"@codemirror/lang-css": "^6.2.1",
"@codemirror/lang-html": "^6.4.8",
"@codemirror/lang-java": "^6.0.1",
"@codemirror/lang-javascript": "^6.2.1",
"@codemirror/lang-json": "^6.0.1",
"@codemirror/lang-markdown": "^6.2.4",
"@codemirror/lang-php": "^6.0.1",
"@codemirror/lang-python": "^6.1.4",
"@codemirror/lang-rust": "^6.0.1",
"@codemirror/lang-vue": "^0.1.3",
"@codemirror/lang-wast": "^6.0.2",
"@codemirror/lang-xml": "^6.0.2",
"@codemirror/language": "^6.10.1",
"@codemirror/legacy-modes": "^6.3.3",
"@codemirror/state": "^6.4.0",
"@codemirror/view": "^6.23.1",
"@lezer/common": "^1.2.1",
"@lezer/highlight": "^1.2.0",
"@octokit/rest": "^20.0.2",
"@replit/codemirror-lang-svelte": "^6.0.0",
"@sentry/sveltekit": "^7.100.1",
"@sveltejs/adapter-static": "^2.0.3",
"@sveltejs/kit": "^1.30.3",
"@tauri-apps/api": "^1.5.3",
"@types/crypto-js": "^4.2.2",
"@types/diff": "^5.0.9",
"@types/diff-match-patch": "^1.0.36",
"@types/lscache": "^1.3.4",
"@types/marked": "^5.0.2",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"autoprefixer": "^10.4.17",
"class-transformer": "^0.5.1",
"crypto-js": "^4.2.0",
"date-fns": "^2.30.0",
"diff-match-patch": "^1.0.5",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-square-svelte-store": "^1.0.0",
"eslint-plugin-svelte": "^2.35.1",
"inter-ui": "^4.0.1",
"leven": "^4.0.0",
"lscache": "^1.3.2",
"marked": "^10.0.0",
"mm-jsr": "^3.0.2",
"nanoevents": "^9.0.0",
"nanoid": "^5.0.5",
"postcss": "^8.4.34",
"postcss-load-config": "^5.0.2",
"posthog-js": "1.105.1",
"prettier": "^3.2.5",
"prettier-plugin-svelte": "^3.1.2",
"prettier-plugin-tailwindcss": "^0.5.11",
"reflect-metadata": "^0.2.1",
"rxjs": "^7.8.1",
"svelte": "^4.2.10",
"svelte-check": "^3.6.3",
"svelte-floating-ui": "^1.5.8",
"svelte-french-toast": "^1.2.0",
"svelte-loadable-store": "^2.0.1",
"svelte-outclick": "^3.7.0",
"svelte-resize-observer": "^2.0.0",
"tailwindcss": "^3.4.1",
"tauri-plugin-context-menu": "^0.7.0",
"tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1",
"tinykeys": "^2.1.0",
"tslib": "^2.6.2",
"typescript": "^5.3.3",
"vite": "^4.5.2",
"vitest": "^0.34.6"
}
}
66 changes: 66 additions & 0 deletions pkgs/by-name/gi/gitbutler-ui/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{ lib
, mkYarnPackage
, fetchYarnDeps
, fetchFromGitHub
}:

mkYarnPackage rec {
pname = "gitbutler-ui";
version = "0.10.11";

src = fetchFromGitHub {
owner = "gitbutlerapp";
repo = "gitbutler";
rev = "release/${version}";
hash = "sha256-Y8LurSQKhjHX3RUiuOdHtPkZK5NKmx3eqQ5NGtnhMlY=";
};

sourceRoot = "${src.name}/gitbutler-ui";

# The package.json must use spaces instead of upstream's tabs to pass Nixpkgs
# CI.
# To generate the Yarn lockfile, run `yarn install`.
hacker1024 marked this conversation as resolved.
Show resolved Hide resolved
# There is no way to import the tagged pnpm lockfile, so make sure to test the
# result thoughly as dependency versions may differ from the release.
packageJSON = ./package.json;
yarnLock = ./yarn.lock;
offlineCache = fetchYarnDeps {
inherit yarnLock;
hash = "sha256-rggtkfE6An8It0Rvgfk0J8JHpg0NbLiweRsz0nM/tzM=";
};
Comment on lines +20 to +30
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#290715 👀


preConfigure = ''
chmod u+w -R "$NIX_BUILD_TOP"
'';

buildPhase = ''
runHook preBuild

export HOME="$(mktemp -d)"
yarn --offline prepare
yarn --offline build

runHook postBuild
'';

installPhase = ''
runHook preInstall

cp -r deps/@gitbutler/ui/build "$out"

runHook postInstall
'';

distPhase = "true";

meta = rec {
description = "The UI for GitButler.";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
description = "The UI for GitButler.";
description = "Git client for simultaneous branches on top of your existing workflow";

homepage = "https://gitbutler.com";
downloadPage = homepage;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
downloadPage = homepage;

there is no point in repeating this.
Also this is used wrongly, since it is not a direct link to the download page

changelog = "https://github.com/gitbutlerapp/gitbutler/releases/tag/release/${version}";
license = lib.licenses.fsl-10-mit;
maintainers = with lib.maintainers; [ hacker1024 ];
platforms = with lib.platforms; all;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
platforms = with lib.platforms; all;
platforms = lib.platforms.all;

sourceProvenance = with lib.sourceTypes; [ fromSource ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
sourceProvenance = with lib.sourceTypes; [ fromSource ];

That doesn't need to be set

};
}
Loading
Loading