diff options
author | makefu <github@syntax-fehler.de> | 2015-10-09 12:06:27 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-10-09 12:06:27 +0200 |
commit | 42c2a52eaa7a111824f00582eb0479154b51211e (patch) | |
tree | 8c1b64fce6a8c70275a68f8b8753bff2fb633543 /krebs/5pkgs | |
parent | e507ab5ba770d57e846aa79f12ef055bd2fa70e4 (diff) | |
parent | 965eba6073f9de3726d9776ca18f6de9ad8ec867 (diff) |
Merge branch 'master' of pnp:stockholm
Diffstat (limited to 'krebs/5pkgs')
-rw-r--r-- | krebs/5pkgs/Reaktor/default.nix | 4 | ||||
-rw-r--r-- | krebs/5pkgs/default.nix | 1 | ||||
-rw-r--r-- | krebs/5pkgs/realwallpaper.nix | 28 |
3 files changed, 31 insertions, 2 deletions
diff --git a/krebs/5pkgs/Reaktor/default.nix b/krebs/5pkgs/Reaktor/default.nix index 52478208..c38aa642 100644 --- a/krebs/5pkgs/Reaktor/default.nix +++ b/krebs/5pkgs/Reaktor/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonPackage rec { name = "Reaktor-${version}"; - version = "0.4.3"; + version = "0.5.0"; propagatedBuildInputs = with pkgs;[ python3Packages.docopt python3Packages.requests2 ]; src = fetchurl { url = "https://pypi.python.org/packages/source/R/Reaktor/Reaktor-${version}.tar.gz"; - sha256 = "1rvfw9vg7i7z2ah7m5k3zik2b92d3xdaqa8am62qw6vgvmxcmfp4"; + sha256 = "1npag52xmnyqv56z0anyf6xf00q0smfzsippal0xdbxrfj7s8qim"; }; meta = { homepage = http://krebsco.de/; diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 72c113b9..616992b9 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -24,6 +24,7 @@ rec { pssh = callPackage ./pssh {}; passwdqc-utils = callPackage ./passwdqc-utils {}; Reaktor = callPackage ./Reaktor {}; + realwallpaper = callPackage ./realwallpaper.nix {}; youtube-tools = callPackage ./youtube-tools {}; execve = name: { filename, argv, envp ? {}, destination ? "" }: diff --git a/krebs/5pkgs/realwallpaper.nix b/krebs/5pkgs/realwallpaper.nix new file mode 100644 index 00000000..4fea977e --- /dev/null +++ b/krebs/5pkgs/realwallpaper.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, xplanet, imagemagick, curl, file }: + +stdenv.mkDerivation { + name = "realwallpaper"; + + src = fetchgit { + url = https://github.com/Lassulus/realwallpaper; + rev = "c2778c3c235fc32edc8115d533a0d0853ab101c5"; + sha256 = "0yhbjz19zk8sj5dsvccm6skkqq2vardn1yi70qmd5li7qvp17mvs"; + }; + + phases = [ + "unpackPhase" + "installPhase" + ]; + + buildInputs = [ + xplanet + imagemagick + curl + file + ]; + + installPhase = '' + mkdir -p $out + cp realwallpaper.sh $out/realwallpaper.sh + ''; +} |