Merge remote-tracking branch 'gum/master'
This commit is contained in:
commit
878a7f164a
@ -11,6 +11,9 @@ with import <stockholm/lib>;
|
|||||||
./vim.nix
|
./vim.nix
|
||||||
./binary-cache/nixos.nix
|
./binary-cache/nixos.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
|
||||||
|
|
||||||
programs.command-not-found.enable = false;
|
programs.command-not-found.enable = false;
|
||||||
nixpkgs.config.allowUnfreePredicate = (pkg: pkgs.lib.hasPrefix "unrar-" pkg.name);
|
nixpkgs.config.allowUnfreePredicate = (pkg: pkgs.lib.hasPrefix "unrar-" pkg.name);
|
||||||
krebs = {
|
krebs = {
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./android-pentest.nix
|
./android-pentest.nix
|
||||||
|
./consoles.nix
|
||||||
./core.nix
|
./core.nix
|
||||||
./core-gui.nix
|
./core-gui.nix
|
||||||
./dev.nix
|
./dev.nix
|
||||||
|
8
makefu/2configs/tools/consoles.nix
Normal file
8
makefu/2configs/tools/consoles.nix
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
users.users.makefu.packages = with pkgs; [
|
||||||
|
opl-utils
|
||||||
|
hdl-dump
|
||||||
|
bin2iso
|
||||||
|
];
|
||||||
|
}
|
@ -21,6 +21,9 @@
|
|||||||
gen-oath-safe
|
gen-oath-safe
|
||||||
cdrtools
|
cdrtools
|
||||||
stockholm
|
stockholm
|
||||||
|
# nix related
|
||||||
|
nix-repl
|
||||||
|
nix-index
|
||||||
# git-related
|
# git-related
|
||||||
tig
|
tig
|
||||||
];
|
];
|
||||||
|
33
makefu/5pkgs/hdl-dump/default.nix
Normal file
33
makefu/5pkgs/hdl-dump/default.nix
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
{ stdenv, lib, pkgs, fetchurl,fetchFromGitHub, upx, wine }:
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "hdl-dump";
|
||||||
|
version = "75df8d7";
|
||||||
|
name = "${pname}-${version}";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "AKuHAK";
|
||||||
|
repo = "hdl-dump";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "10jjr6p5yn0c182x17m7q68jmf8gizcny7wjxw7z5yh0fv5s48z4";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ upx wine ];
|
||||||
|
|
||||||
|
makeFlags = [ "RELEASE=yes" ];
|
||||||
|
|
||||||
|
# uses wine, currently broken
|
||||||
|
#postBuild = ''
|
||||||
|
# make -C gui
|
||||||
|
#'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
cp hdl_dump $out/bin
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = https://github.com/AKuHAK/hdl-dump ;
|
||||||
|
description = "copy isos to psx hdd";
|
||||||
|
license = lib.licenses.gpl2;
|
||||||
|
};
|
||||||
|
}
|
27
makefu/5pkgs/opl-utils/default.nix
Normal file
27
makefu/5pkgs/opl-utils/default.nix
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
{ stdenv, lib, pkgs, fetchFromGitHub }:
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "opl-utils";
|
||||||
|
version = "881c0d2";
|
||||||
|
name = "${pname}-${version}";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "ifcaro";
|
||||||
|
repo = "open-ps2-loader";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "1c2hgbyp5hymyq60mrk7g0m3gi00wqx165pdwwwb740q0qig07d1";
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
preBuild = "cd pc/";
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
cp */bin/* $out/bin
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = https://github.com/ifcaro/Open-PS2-Loader;
|
||||||
|
description = "open-ps2-loader utils (opl2iso,iso2opl,genvmc)";
|
||||||
|
license = lib.licenses.afl3;
|
||||||
|
};
|
||||||
|
}
|
@ -13,7 +13,7 @@ let
|
|||||||
then "buildbot"
|
then "buildbot"
|
||||||
else "makefu";
|
else "makefu";
|
||||||
_file = <stockholm> + "/makefu/1systems/${name}/source.nix";
|
_file = <stockholm> + "/makefu/1systems/${name}/source.nix";
|
||||||
ref = "3874de4"; # unstable @ 2017-12-08
|
ref = "475bec2"; # unstable @ 2017-08-04
|
||||||
# + do_sqlite3 ruby: 55a952be5b5
|
# + do_sqlite3 ruby: 55a952be5b5
|
||||||
|
|
||||||
in
|
in
|
||||||
|
Loading…
Reference in New Issue
Block a user