diff options
| author | github-actions[bot] | 2022-08-12 18:01:11 +0000 |
|---|---|---|
| committer | GitHub | 2022-08-12 18:01:11 +0000 |
| commit | de52f0cee42d66819340aaec1553c9966f4a55e6 (patch) | |
| tree | eeb0995372e9ed330acf6a4df85bc8cb446cbaf7 /pkgs/applications/editors | |
| parent | 71344f23b354d1cfd528329ea82dce0c486d3179 (diff) | |
| parent | 10b8ec9dd16200ac6dc5ce27ba5a4ada3c8c1eca (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/micro/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/editors/xxe-pe/default.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index bace622004a8..9fc80181533c 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -27,6 +27,7 @@ buildGoModule rec { postInstall = '' installManPage assets/packaging/micro.1 install -Dt $out/share/applications assets/packaging/micro.desktop + install -Dm644 assets/micro-logo-mark.svg $out/share/icons/hicolor/scalable/apps/micro.svg ''; passthru.tests.expect = callPackage ./test-with-expect.nix {}; diff --git a/pkgs/applications/editors/xxe-pe/default.nix b/pkgs/applications/editors/xxe-pe/default.nix index 191ed6d2d421..1f592b7320c7 100644 --- a/pkgs/applications/editors/xxe-pe/default.nix +++ b/pkgs/applications/editors/xxe-pe/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "xxe-pe"; - version = "10.1.0"; + version = "10.2.0"; src = assert !acceptLicense -> throw '' @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; fetchurl { url = "https://www.xmlmind.com/xmleditor/_download/xxe-perso-${builtins.replaceStrings [ "." ] [ "_" ] version}.zip"; - sha256 = "sha256-AeyaJSEJQQJ/XxvaIky4fnEr+7fVAEqhSxtYhN8L2JA="; + sha256 = "sha256-JZ9nQwMrQL/1HKGwvXoWlnTx55ZK/UYjMJAddCtm0rw="; }; nativeBuildInputs = [ |