Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-04-08 22:52:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: change name to ReSet to avoid conflicts

Browse source
This commit is contained in:
DashieTM 2024-06-07 00:28:40 +02:00
parent 8ddaea9a7d
commit b7151f1feb
6 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/release.yml vendored
View file

@ -12,7 +12,9 @@ jobs:
profile: minimal profile: minimal
toolchain: nightly toolchain: nightly
- name: Build rust package - name: Build rust package
run: cargo build --release --verbose run: |
cargo build --release --verbose
mv ./target/release/reset ./target/release/ReSet
- name: Build Flatpak - name: Build Flatpak
run: "cd flatpak\npython3 flatpak-generator.py ../Cargo.lock -o cargo-sources.json \nflatpak-builder build org.Xetibo.ReSet.json --force-clean \nflatpak build-export export build\nflatpak build-bundle export reset.flatpak org.Xetibo.ReSet\n" run: "cd flatpak\npython3 flatpak-generator.py ../Cargo.lock -o cargo-sources.json \nflatpak-builder build org.Xetibo.ReSet.json --force-clean \nflatpak build-export export build\nflatpak build-bundle export reset.flatpak org.Xetibo.ReSet\n"
- name: Build Ubuntu package - name: Build Ubuntu package
@ -22,15 +24,15 @@ jobs:
mkdir -p ./debian/usr/share mkdir -p ./debian/usr/share
mkdir -p ./debian/usr/share/applications mkdir -p ./debian/usr/share/applications
mkdir -p ./debian/usr/share/pixmaps mkdir -p ./debian/usr/share/pixmaps
cp ./target/release/reset ./debian/usr/bin/. cp ./target/release/ReSet ./debian/usr/bin/ReSet
cp ./reset.desktop ./debian/usr/share/applications/. cp ./reset.desktop ./debian/usr/share/applications/.
cp ./src/resources/icons/ReSet.svg ./debian/usr/share/pixmaps/. cp ./src/resources/icons/ReSet.svg ./debian/usr/share/pixmaps/.
dpkg-deb --build debian dpkg-deb --build debian
mv debian.deb reset.deb mv debian.deb ReSet.deb
- name: Release - name: Release
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
with: with:
files: | files: |
target/release/reset target/release/ReSet
flatpak/reset.flatpak flatpak/reset.flatpak
reset.deb ReSet.deb

2
PKGBUILD
View file

@ -14,7 +14,7 @@ build() {
package() { package() {
cd .. cd ..
install -Dm755 target/release/"$pkgname" "$pkgdir"/usr/bin/"$pkgname" install -Dm755 target/release/"$pkgname" "$pkgdir"/usr/bin/ReSet
install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
install -Dm644 "src/resources/icons/ReSet.svg" "$pkgdir/usr/share/pixmaps/ReSet.svg" install -Dm644 "src/resources/icons/ReSet.svg" "$pkgdir/usr/share/pixmaps/ReSet.svg"
} }

8
flake.nix
View file

@ -47,15 +47,15 @@
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
in in
rec { rec {
reset = pkgs.callPackage ./nix/default.nix { inherit inputs lockFile; }; ReSet = pkgs.callPackage ./nix/default.nix { inherit inputs lockFile; };
default = reset; default = ReSet;
}; };
}; };
flake = _: rec { flake = _: rec {
nixosModules.home-manager = homeManagerModules.default; nixosModules.home-manager = homeManagerModules.default;
homeManagerModules = rec { homeManagerModules = rec {
reset = import ./nix/hm.nix inputs.self; ReSet = import ./nix/hm.nix inputs.self;
default = reset; default = ReSet;
}; };
}; };
}; };

8
nix/default.nix
View file

@ -19,7 +19,7 @@ let
cargoToml = builtins.fromTOML (builtins.readFile ../Cargo.toml); cargoToml = builtins.fromTOML (builtins.readFile ../Cargo.toml);
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = cargoToml.package.name; pname = "ReSet";
version = cargoToml.package.version; version = cargoToml.package.version;
src = ../.; src = ../.;
@ -50,8 +50,8 @@ rustPlatform.buildRustPackage rec {
copyLibs = true; copyLibs = true;
postInstall = '' postInstall = ''
install -D --mode=444 $src/${pname}.desktop $out/share/applications/${pname}.desktop install -D --mode=444 $src/reset.desktop $out/share/applications/reset.desktop
install -D --mode=444 $src/src/resources/icons/ReSet.svg $out/share/pixmaps/ReSet.svg install -D --mode=444 $src/src/resources/icons/${pname}.svg $out/share/pixmaps/${pname}.svg
''; '';
# test is broken in nix for some reason # test is broken in nix for some reason
@ -64,6 +64,6 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/Xetibo/ReSet/releases/tag/${version}"; changelog = "https://github.com/Xetibo/ReSet/releases/tag/${version}";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ DashieTM ]; maintainers = with maintainers; [ DashieTM ];
mainProgram = "reset"; mainProgram = "ReSet";
}; };
} }

8
nix/hm.nix
View file

@ -5,19 +5,19 @@ self: { config
, ... , ...
}: }:
let let
cfg = config.programs.reset; cfg = config.programs.ReSet;
defaultPackage = self.packages.${pkgs.stdenv.hostPlatform.system}.default; defaultPackage = self.packages.${pkgs.stdenv.hostPlatform.system}.default;
in in
{ {
meta.maintainers = with lib.maintainers; [ DashieTM ]; meta.maintainers = with lib.maintainers; [ DashieTM ];
options.programs.reset = with lib; { options.programs.ReSet = with lib; {
enable = mkEnableOption "reset"; enable = mkEnableOption "ReSet";
package = mkOption { package = mkOption {
type = with types; nullOr package; type = with types; nullOr package;
default = defaultPackage; default = defaultPackage;
defaultText = lib.literalExpression '' defaultText = lib.literalExpression ''
reset.packages.''${pkgs.stdenv.hostPlatform.system}.default ReSet.packages.''${pkgs.stdenv.hostPlatform.system}.default
''; '';
description = mdDoc '' description = mdDoc ''
Package to run Package to run

2
reset.desktop
View file

@ -2,7 +2,7 @@
Name=ReSet Name=ReSet
GenericName=SettingsApplication GenericName=SettingsApplication
GenericName[de]=SettingsApplikation GenericName[de]=SettingsApplikation
Exec=reset Exec=ReSet
Terminal=false Terminal=false
Type=Application Type=Application
Keywords=settings;gtk; Keywords=settings;gtk;