From a01e8b740e03ed5808ea8a59da8b13e62942bc66 Mon Sep 17 00:00:00 2001 From: Aleksey Uimanov Date: Sun, 22 Mar 2020 20:01:49 +0500 Subject: qxmledit: init at 0.9.15 --- pkgs/applications/editors/qxmledit/default.nix | 28 ++++++++++++++++++++++++ pkgs/applications/editors/qxmledit/qxmledit.json | 6 +++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/editors/qxmledit/default.nix create mode 100644 pkgs/applications/editors/qxmledit/qxmledit.json (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix new file mode 100644 index 0000000000000..131c015d1c153 --- /dev/null +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, + qmake, qtbase, qtxmlpatterns, qtsvg, qtscxml, qtquick1, libGLU }: + +stdenv.mkDerivation rec { + name = "qxmledit-${version}" ; + version = "0.9.15" ; + src = fetchFromGitHub ( stdenv.lib.importJSON ./qxmledit.json ) ; + nativeBuildInputs = [ qmake ] ; + buildInputs = [ qtbase qtxmlpatterns qtsvg qtscxml qtquick1 libGLU ] ; + qmakeFlags = [ "CONFIG+=release" ] ; + outputs = [ "out" "doc" ] ; + + preConfigure = '' +export QXMLEDIT_INST_DATA_DIR="$out/share/data" +export QXMLEDIT_INST_TRANSLATIONS_DIR="$out/share/i18n" +export QXMLEDIT_INST_INCLUDE_DIR="$out/include" +export QXMLEDIT_INST_DIR="$out/bin" +export QXMLEDIT_INST_LIB_DIR="$out/lib" +export QXMLEDIT_INST_DOC_DIR="$doc" +''; + + meta = with stdenv.lib; { + description = "Simple XML editor based on qt libraries" ; + homepage = https://sourceforge.net/projects/qxmledit; + license = licenses.lgpl2; + platforms = platforms.all; + } ; +} diff --git a/pkgs/applications/editors/qxmledit/qxmledit.json b/pkgs/applications/editors/qxmledit/qxmledit.json new file mode 100644 index 0000000000000..3b50532d6a0df --- /dev/null +++ b/pkgs/applications/editors/qxmledit/qxmledit.json @@ -0,0 +1,6 @@ +{ + "owner": "lbellonda", + "repo": "qxmledit", + "rev": "6136dca50ceb3b4447c91a7a18dcf84785ea11d1", + "sha256": "1wcnphalwf0a5gz9r44jgk8wcv1w2qipbwjkbzkra2kxanxns834" +} \ No newline at end of file -- cgit 1.4.1 From db9a868fe6bd0c8e026276bf3f373da20538796a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 27 Mar 2020 16:12:17 +0100 Subject: uberwriter: renamed to apostrophe * update 2020-01-24 -> 2020-03-29 * reflect change of name and main repository --- pkgs/applications/editors/apostrophe/default.nix | 56 ++++++++++++++++++++++++ pkgs/applications/editors/uberwriter/default.nix | 55 ----------------------- pkgs/top-level/all-packages.nix | 8 ++-- 3 files changed, 60 insertions(+), 59 deletions(-) create mode 100644 pkgs/applications/editors/apostrophe/default.nix delete mode 100644 pkgs/applications/editors/uberwriter/default.nix (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix new file mode 100644 index 0000000000000..623f86a61c2c6 --- /dev/null +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchFromGitLab, meson, ninja, cmake +, wrapGAppsHook, pkgconfig, desktop-file-utils +, appstream-glib, pythonPackages, glib, gobject-introspection +, gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive +, shared-mime-info, haskellPackages}: + +let + pythonEnv = pythonPackages.python.withPackages(p: with p; + [ regex setuptools python-Levenshtein pyenchant pygobject3 pycairo pypandoc ]); + texliveDist = texlive.combined.scheme-medium; + +in stdenv.mkDerivation rec { + pname = "apostrophe"; + version = "unstable-2020-03-29"; + + src = fetchFromGitLab { + owner = "somas"; + repo = pname; + domain = "gitlab.gnome.org"; + rev = "219fa8976e3b8a6f0cea15cfefe4e336423f2bdb"; + sha256 = "192n5qs3x6rx62mqxd6wajwm453pns8kjyz5v3xc891an6bm1kqx"; + }; + + nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils + appstream-glib wrapGAppsHook ]; + + buildInputs = [ glib pythonEnv gobject-introspection gtk3 + gnome3.adwaita-icon-theme webkitgtk gspell texliveDist + glib-networking ]; + + postPatch = '' + patchShebangs --build build-aux/meson_post_install.py + + substituteInPlace ${pname}/config.py --replace "/usr/share/${pname}" "$out/share/${pname}" + + # get rid of unused distributed dependencies + rm -r ${pname}/pylocales + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PYTHONPATH : "$out/lib/python${pythonEnv.pythonVersion}/site-packages/" + --prefix PATH : "${texliveDist}/bin" + --prefix PATH : "${haskellPackages.pandoc-citeproc}/bin" + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; + + meta = with stdenv.lib; { + homepage = "https://gitlab.gnome.org/somas/apostrophe"; + description = "A distraction free Markdown editor for GNU/Linux"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/applications/editors/uberwriter/default.nix b/pkgs/applications/editors/uberwriter/default.nix deleted file mode 100644 index 48ebc79e70503..0000000000000 --- a/pkgs/applications/editors/uberwriter/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchFromGitHub, meson, ninja, cmake -, wrapGAppsHook, pkgconfig, desktop-file-utils -, appstream-glib, pythonPackages, glib, gobject-introspection -, gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive -, shared-mime-info, haskellPackages}: - -let - pythonEnv = pythonPackages.python.withPackages(p: with p; - [ regex setuptools python-Levenshtein pyenchant pygobject3 pycairo pypandoc ]); - texliveDist = texlive.combined.scheme-medium; - -in stdenv.mkDerivation rec { - pname = "uberwriter"; - version = "unstable-2020-01-24"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "0647b413407eb8789a25c353602c4ac979dc342a"; - sha256 = "19z52fpbf0p7dzx7q0r5pk3nn0c8z69g1hv6db0cqp61cqv5z95q"; - }; - - nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils - appstream-glib wrapGAppsHook ]; - - buildInputs = [ glib pythonEnv gobject-introspection gtk3 - gnome3.adwaita-icon-theme webkitgtk gspell texliveDist - glib-networking ]; - - postPatch = '' - patchShebangs --build build-aux/meson_post_install.py - - substituteInPlace uberwriter/config.py --replace "/usr/share/uberwriter" "$out/share/uberwriter" - - # get rid of unused distributed dependencies - rm -r uberwriter/{pylocales,pressagio} - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PYTHONPATH : "$out/lib/python${pythonEnv.pythonVersion}/site-packages/" - --prefix PATH : "${texliveDist}/bin" - --prefix PATH : "${haskellPackages.pandoc-citeproc}/bin" - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - ) - ''; - - meta = with stdenv.lib; { - homepage = http://uberwriter.github.io/uberwriter/; - description = "A distraction free Markdown editor for GNU/Linux"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.sternenseemann ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d1f57640d546..f5de0871bc05c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7175,10 +7175,6 @@ in ua = callPackage ../tools/networking/ua { }; - uberwriter = callPackage ../applications/editors/uberwriter { - pythonPackages = python3Packages; - }; - ubridge = callPackage ../tools/networking/ubridge { }; ucl = callPackage ../development/libraries/ucl { }; @@ -18582,6 +18578,10 @@ in appeditor = callPackage ../applications/misc/appeditor { }; + apostrophe = callPackage ../applications/editors/apostrophe { + pythonPackages = python3Packages; + }; + aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { }; ardour = callPackage ../applications/audio/ardour { -- cgit 1.4.1 From 0bb661d512329235ca6102f123d04a8cf0d48629 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 1 Apr 2020 00:35:01 -0400 Subject: vscode: Don't hardcode icon This also allows people to use a vscode icon that is shipped with their theme. (provided it is called code) Fixes #83846 --- pkgs/applications/editors/vscode/generic.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index a573c518b5d68..abd4a55c92b85 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -25,7 +25,7 @@ in comment = "Code Editing. Redefined."; genericName = "Text Editor"; exec = executableName; - icon = "@out@/share/pixmaps/code.png"; + icon = "code"; startupNotify = "true"; categories = "Utility;TextEditor;Development;IDE;"; mimeType = "text/plain;inode/directory;"; @@ -37,7 +37,7 @@ in [Desktop Action new-empty-window] Name=New Empty Window Exec=${executableName} --new-window %F - Icon=@out@/share/pixmaps/code.png + Icon=code ''; }; @@ -47,7 +47,7 @@ in comment = "Code Editing. Redefined."; genericName = "Text Editor"; exec = executableName + " --open-url %U"; - icon = "@out@/share/pixmaps/code.png"; + icon = "code"; startupNotify = "true"; categories = "Utility;TextEditor;Development;IDE;"; mimeType = "x-scheme-handler/vscode;"; @@ -83,10 +83,8 @@ in ln -s $out/lib/vscode/bin/${executableName} $out/bin mkdir -p $out/share/applications - substitute $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop \ - --subst-var out - substitute $urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop $out/share/applications/${executableName}-url-handler.desktop \ - --subst-var out + ln -s $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop + ln -s $urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop $out/share/applications/${executableName}-url-handler.desktop mkdir -p $out/share/pixmaps cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png -- cgit 1.4.1 From c9fd76de7512adab77ba7af6b40ac4fd1b715262 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 1 Apr 2020 00:36:58 -0400 Subject: vscode: add backports notice --- pkgs/applications/editors/vscode/vscode.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 967cd45946fea..306bb115ef430 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -19,6 +19,8 @@ in # The update script doesn't correctly change the hash for darwin, so please: # nixpkgs-update: no auto update + # Please backport all compatible updates to the stable release. + # This is important for the extension ecosystem. version = "1.43.0"; pname = "vscode"; -- cgit 1.4.1 From f9fc1d3be463f902d66d044b3ce543d0813412d6 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 1 Apr 2020 00:37:10 -0400 Subject: vscodium: add backports notice --- pkgs/applications/editors/vscode/vscodium.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index bffe73ec4f6ba..ae40a0187def0 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -25,6 +25,8 @@ in # The update script doesn't correctly change the hash for darwin, so please: # nixpkgs-update: no auto update + # Please backport all compatible updates to the stable release. + # This is important for the extension ecosystem. version = "1.43.0"; pname = "vscodium"; -- cgit 1.4.1 From 0f70340b798cc0d04c4514be4e2879ef5215337d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 1 Apr 2020 12:01:50 +0200 Subject: android-studio: 3.6.1.0 -> 3.6.2.0 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 9a476ada2142a..b10ef9513daa5 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,9 +8,9 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.6.1.0"; # "Android Studio 3.6.1" - build = "192.6241897"; - sha256Hash = "1mwzk18224bl8hbw9cdxwzgj5cfain4y70q64cpj4p0snffxqm77"; + version = "3.6.2.0"; # "Android Studio 3.6.2" + build = "192.6308749"; + sha256Hash = "04r4iwlmns1lf3wfd32cqmndbdz9rf7hfbi5r6qmvpi8j83fghvr"; }; betaVersion = { version = "4.0.0.12"; # "Android Studio 4.0 Beta 3" -- cgit 1.4.1 From 354508b0c5be4b269538672119283c6e5df8398a Mon Sep 17 00:00:00 2001 From: Alexey Uimanov Date: Wed, 1 Apr 2020 23:07:57 +0500 Subject: Update pkgs/applications/editors/qxmledit/default.nix Co-Authored-By: Thomas Tuegel --- pkgs/applications/editors/qxmledit/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix index 131c015d1c153..9e9766f04e83c 100644 --- a/pkgs/applications/editors/qxmledit/default.nix +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ] ; preConfigure = '' -export QXMLEDIT_INST_DATA_DIR="$out/share/data" -export QXMLEDIT_INST_TRANSLATIONS_DIR="$out/share/i18n" -export QXMLEDIT_INST_INCLUDE_DIR="$out/include" -export QXMLEDIT_INST_DIR="$out/bin" -export QXMLEDIT_INST_LIB_DIR="$out/lib" -export QXMLEDIT_INST_DOC_DIR="$doc" -''; + export QXMLEDIT_INST_DATA_DIR="$out/share/data" + export QXMLEDIT_INST_TRANSLATIONS_DIR="$out/share/i18n" + export QXMLEDIT_INST_INCLUDE_DIR="$out/include" + export QXMLEDIT_INST_DIR="$out/bin" + export QXMLEDIT_INST_LIB_DIR="$out/lib" + export QXMLEDIT_INST_DOC_DIR="$doc" + ''; meta = with stdenv.lib; { description = "Simple XML editor based on qt libraries" ; -- cgit 1.4.1 From 9fa951a20aabaf4a1b7aa123a1d024db668857ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Apr 2020 20:08:03 +0000 Subject: texworks: 0.6.4 -> 0.6.5 --- pkgs/applications/editors/texworks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix index d5549c5259281..d0347bcb37c61 100644 --- a/pkgs/applications/editors/texworks/default.nix +++ b/pkgs/applications/editors/texworks/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "texworks"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "TeXworks"; repo = "texworks"; rev = "release-${version}"; - sha256 = "0d7f23c6c1wj4aii4h5w9piv01qfb69zrd79dvxwydrk99i8gnl4"; + sha256 = "1lw1p4iyzxypvjhnav11g6rwf6gx7kyzwy2iprvv8zzpqcdkjp2z"; }; nativeBuildInputs = [ cmake pkg-config ]; -- cgit 1.4.1