lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

merge

Browse source
This commit is contained in:
Luke Granger-Brown 2024-12-01 11:19:10 +00:00
commit 105b0813c1
4 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -25,6 +25,7 @@
/go/trains/*/lukegb-trains.json
/py/icalfilter/config/*
/rust/*/target/*
result
result-*
result

4
nix/pkgs/default.nix
View file

@ -8,7 +8,6 @@
plex-pass = import ./plex-pass.nix args;
secretsync = import ./secretsync args;
copybara = pkgs.callPackage ./copybara.nix { };
hg-git = import ./hg-git.nix args;
erbium = import ./erbium args;
sheepshaver = import ./sheepshaver.nix args;
intermec-cups-driver = pkgs.callPackage ./intermec-cups-driver.nix {};
@ -26,7 +25,8 @@
lukegb-wallpapers = pkgs.callPackage ./lukegb-wallpapers {};
rundeck-bin = pkgs.callPackage ./rundeck-bin {};
mercurial = pkgs.mercurialFull.withExtensions (pm: with pm; [
hg-evolve
(hg-evolve.override { mercurial = pkgs.mercurialFull; })
(hg-git.override { mercurial = pkgs.mercurialFull; })
]);
ubi_reader = pkgs.python3Packages.callPackage ./ubi_reader {};
prometheus-bird-exporter-lfty = pkgs.callPackage ./prometheus-bird-exporter-lfty.nix {};

26
nix/pkgs/hg-git.nix
View file

@ -1,26 +0,0 @@
# SPDX-FileCopyrightText: 2020 Luke Granger-Brown <depot@lukegb.com>
#
# SPDX-License-Identifier: Apache-2.0
{ pkgs, ... }:
with pkgs;
with pkgs.python3Packages;
(buildPythonPackage rec {
pname = "hg-git";
version = "0.9.0a1";
src = fetchPypi {
inherit pname version;
sha256 = "1lhb813zljki3q10bx3n9d7c075s6ahhak5d3a1m6gaxmy6gzj5y";
};
doCheck = false;
propagatedBuildInputs = [ dulwich ];
meta = with lib; {
description = "Push and pull from a Git server using Mercurial";
homepage = "http://hg-git.github.com/";
license = licenses.gpl2;
};
})

6
nix/pkgs/world-of-goo2.nix
View file

@ -5,11 +5,11 @@
appimageTools.wrapType2 rec {
pname = "worldofgoo2";
version = "12329.171";
version = "1.0.12478.15";
src = requireFile {
name = "World_of_Goo_2-x86_64.${version}.appimage";
hash = "sha256-/dOder333lqgKi+dQCIzeVtPObRYsn5LSYldXFXaK8o=";
name = "World_of_Goo_2-x86_64-${version}.appimage";
hash = "sha256-esFcDFxeCDdl1BVEYdTeHxgkLo0j9HMYmEnPK0fIEhA=";
message = "Please download World of Goo 2 from the Humble Store and add it to the store.";
};