diff options
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/dasel/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/gollum/Gemfile.lock | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/gollum/gemset.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/misc/ideamaker/default.nix | 77 |
4 files changed, 86 insertions, 9 deletions
diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index d3aff8e6b1ba..ca1a87dd2dd9 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.6.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LGrFs9JNb0gjXg6IRkUfUOWS+sr1nukzOEWK4XUfkfw="; + sha256 = "sha256-N27XmrbZTLeNkNvGDsChqKZrAagkQoGFaJeeZ1/Qnkw="; }; vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw"; diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 7b1b20a1b78f..eed618a5cbd1 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -8,11 +8,11 @@ GEM gemojione (4.3.3) json github-markup (3.0.5) - gollum (5.1.1) + gollum (5.1.2) gemojione (~> 4.1) gollum-lib (~> 5.0) kramdown (~> 2.3) - kramdown-parser-gfm (~> 1.0.0) + kramdown-parser-gfm (~> 1.1.0) mustache (>= 0.99.5, < 1.0.0) octicons (~> 8.5) rss (~> 0.2.9) @@ -39,7 +39,7 @@ GEM json (2.3.1) kramdown (2.3.0) rexml - kramdown-parser-gfm (1.0.1) + kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) loofah (2.8.0) crass (~> 1.0.2) diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 7d7c0ef3d5f0..75ee9d05ab43 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14i6y3ilv9l7cqvkawl75js26cfj1pd8cphhmq9lic95ajvdf371"; + sha256 = "0pmvxj7pka7pjpw060a9pfxsci1hmx45hk9hbp5m49xkkiiqf1gx"; type = "gem"; }; - version = "5.1.1"; + version = "5.1.2"; }; gollum-lib = { dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "octicons" "rouge" "twitter-text"]; @@ -120,10 +120,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ykna2apphld9llmjnz0210fipp4fkmj2ja18l7iz9xikg0h0ihi"; + sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; diff --git a/pkgs/applications/misc/ideamaker/default.nix b/pkgs/applications/misc/ideamaker/default.nix new file mode 100644 index 000000000000..7b2eeec292bf --- /dev/null +++ b/pkgs/applications/misc/ideamaker/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, autoPatchelfHook +, curl +, dpkg +, fetchurl +, gcc +, lib +, libGLU +, libcork +, makeDesktopItem +, qt5 +, quazip_qt4 +, zlib +}: +stdenv.mkDerivation rec { + pname = "ideamaker"; + version = "4.0.1"; + + src = fetchurl { + # N.B. Unfortunately ideamaker adds a number after the patch number in + # their release scheme which is not referenced anywhere other than in + # the download URL. Because of this, I have chosen to not use ${version} + # and just handwrite the correct values in the following URL, hopefully + # avoiding surprises for the next person that comes to update this + # package. + url = "https://download.raise3d.com/ideamaker/release/4.0.1/ideaMaker_4.0.1.4802-ubuntu_amd64.deb"; + sha256 = "0a1jcakdglcr4kz0kyq692dbjk6aq2yqcp3i6gzni91k791h49hp"; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg qt5.wrapQtAppsHook ]; + buildInputs = [ + curl + gcc.cc.lib + libGLU + libcork + qt5.qtbase + qt5.qtserialport + quazip_qt4 + zlib + ]; + + unpackPhase = '' + runHook preUnpack + dpkg-deb -x $src . + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/pixmaps} + + cp usr/lib/x86_64-linux-gnu/ideamaker/ideamaker $out/bin + ln -s "${desktopItem}/share/applications" $out/share/ + cp usr/share/ideamaker/icons/ideamaker-icon.png $out/share/pixmaps/${pname}.png + + runHook postInstall + ''; + + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "Ideamaker"; + genericName = meta.description; + categories = "Utility;Viewer;Engineering;"; + mimeType = "application/sla"; + }; + + meta = with lib; { + homepage = "https://www.raise3d.com/ideamaker/"; + description = "Raise3D's 3D slicer software"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ lovesegfault ]; + }; +} |