diff options
| author | lassulus <lassulus@lassul.us> | 2019-03-12 11:18:05 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2019-03-12 11:18:05 +0100 |
| commit | a56a2ef0083653a0c0d5c6339857878521958b5d (patch) | |
| tree | b81a6a64b916464bd9702f153e852b48d59c167d /krebs/5pkgs | |
| parent | c4ebcc43d2b2f2451b16ee453f5275bd46018cd4 (diff) | |
| parent | 4b7673a6a7f221119883ec043519b2f7323779e1 (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs/5pkgs')
| -rw-r--r-- | krebs/5pkgs/default.nix | 14 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/Reaktor/default.nix | 4 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/flameshot-once/profile.nix | 2 |
3 files changed, 3 insertions, 17 deletions
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index dc04b6a72..4cdaedebf 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -13,15 +13,6 @@ foldl' mergeAttrs {} // { - # https://github.com/NixOS/nixpkgs/pull/30065 - brscan4 = overrideDerivation super.brscan4 (original: rec { - name = "brscan4-0.4.4-4"; - src = super.fetchurl { - url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; - sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd"; - }; - }); - reaktor2 = self.haskellPackages.reaktor2; ReaktorPlugins = self.callPackage ./simple/Reaktor/plugins.nix {}; @@ -31,9 +22,4 @@ foldl' mergeAttrs {} export PROOT_NO_SECCOMP=1 exec ${super.proot}/bin/proot "$@" ''; - - # XXX symlinkJoin changed arguments somewhere around nixpkgs d541e0d - symlinkJoin = { name, paths, ... }@args: let - x = super.symlinkJoin args; - in if typeOf x != "lambda" then x else super.symlinkJoin name paths; } diff --git a/krebs/5pkgs/simple/Reaktor/default.nix b/krebs/5pkgs/simple/Reaktor/default.nix index a88db6379..1cc498a68 100644 --- a/krebs/5pkgs/simple/Reaktor/default.nix +++ b/krebs/5pkgs/simple/Reaktor/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonPackage rec { name = "Reaktor-${version}"; - version = "0.7.0"; + version = "0.7.1"; doCheck = false; @@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec { owner = "krebs"; repo = "Reaktor"; rev = "v${version}"; - sha256 = "12yy06vk0smjs0rmahrn2kd4bcdh1yjw1fz6rifw6nmgx889d9hj"; + sha256 = "0cv5a4x73ls6sk8qj2qi6gqn31rv8kvdg13dsf3jv92xdfx6brjn"; }; meta = { homepage = http://krebsco.de/; diff --git a/krebs/5pkgs/simple/flameshot-once/profile.nix b/krebs/5pkgs/simple/flameshot-once/profile.nix index 4fcbd62c0..7373da00a 100644 --- a/krebs/5pkgs/simple/flameshot-once/profile.nix +++ b/krebs/5pkgs/simple/flameshot-once/profile.nix @@ -60,7 +60,7 @@ let type = types.positive; }; filenamePattern = mkOption { - default = "%FT%T%z_flameshot.png"; + default = "%FT%T%z_flameshot"; type = # This is types.filename extended by [%:][%:+]* types.addCheck types.str (test "[%:0-9A-Za-z._][%:+0-9A-Za-z._-]*"); |