Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
6e9b36d7a0
40 changed files with 374 additions and 149 deletions
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mob";
|
||||
version = "3.2.0";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "remotemobprogramming";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qr6F98OVI+K0V59YH35GERiC9jgxp/YJm4N4EGvDotk=";
|
||||
sha256 = "sha256-c6Feex0FGxxOWBEHxe0GqPHv65EwMMdxIeehZUGbl0Q=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zine";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-savwRdIO48gCwqW2Wz/nWZuI1TxW/F0OR9jhNzHF+us=";
|
||||
sha256 = "sha256-teLx21vA4b+ft4zZqou4EiTHhh9Foq2Vukmk4z0pWUM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-U+pzT3V4rHiU+Hrax1EUXGQgdjrdfd3G07luaDSam3g=";
|
||||
cargoSha256 = "sha256-OaA090pvJ6rc29wcsUTiuV4/VY/oDDEOGo94Ol31OzI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "argocd";
|
||||
version = "2.4.14";
|
||||
version = "2.4.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-cd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-txVNv/JowIGKMvNjsMUzwLT328qJg/DkS/R0RkN8b34=";
|
||||
sha256 = "sha256-2D9JYQshq9riZsZxFpV10b8bnkg82Jnh4Cx/TSryZ4I=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-n6elT6ETOtbZsFqfwMo9d2qqamS8jdrROjFjStNkalc=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cilium-cli";
|
||||
version = "0.12.4";
|
||||
version = "0.12.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AmJHc9+d053tzz1nj5yyJYDxV3/Bko3plkfR2RjbjH8=";
|
||||
sha256 = "sha256-VChonOHnif9Rz0pLg+nGt5jFT4wLIQq/C64zBlP/w0w=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "glooctl";
|
||||
version = "1.12.21";
|
||||
version = "1.12.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solo-io";
|
||||
repo = "gloo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Hb33S6ADqyDnSo/rMEwIqm1dW3di5vo4wfPkEuMFybg=";
|
||||
hash = "sha256-t/i1UhPfhT7+HAhVBhZKQezqpFrBrzimUHjIozQeJnk=";
|
||||
};
|
||||
|
||||
subPackages = [ "projects/gloo/cli/cmd" ];
|
||||
vendorSha256 = "sha256-D43Sax4GhdojTb3BHwDOHYp9kM3sjk3ZAvCNp5RoyoM=";
|
||||
vendorSha256 = "sha256-MRBnwpuqYElxA4V1x7F4wccKV3T51RopfT37QUr7G4Y=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "roxctl";
|
||||
version = "3.72.0";
|
||||
version = "3.72.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stackrox";
|
||||
repo = "stackrox";
|
||||
rev = version;
|
||||
sha256 = "sha256-KsG6L3tQFuA0oTbzgLTChrBIe4a77bygJSIne/D4qiI=";
|
||||
sha256 = "sha256-I6Sq5i2rkr447gxFRw2C0IV6WnFIpGHyp12NA8IUYKg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-FmpnRgU3w2zthgUJuAG5AqLl2UxMb0yywN5Sk9WoWBI=";
|
||||
|
|
|
|||
|
|
@ -75,13 +75,13 @@
|
|||
"version": "2.2.0"
|
||||
},
|
||||
"auth0": {
|
||||
"hash": "sha256-xe9BWrkuQqmwjUy3ys7M3IWJjqZiWkox9NYmsH3VHJ8=",
|
||||
"hash": "sha256-kyQBl/gdTj1Dlu4/FFowAQbBDTYMjp0JGQ09eBqwHEc=",
|
||||
"owner": "auth0",
|
||||
"provider-source-address": "registry.terraform.io/auth0/auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v0.38.0",
|
||||
"vendorHash": "sha256-e5mQ3NrWdFeyIjh38YbTd9fRVuxJB6FPmw7xNlEHzGY=",
|
||||
"version": "0.38.0"
|
||||
"rev": "v0.39.0",
|
||||
"vendorHash": "sha256-Cusw/qNi+xFblwjvh1xkN28z28TNz3gvTyIRaX/QvH4=",
|
||||
"version": "0.39.0"
|
||||
},
|
||||
"avi": {
|
||||
"hash": "sha256-BQ4M1e7wWDCq2HEJIoAAqSUmq9hV66auvH47p3j2M8I=",
|
||||
|
|
@ -479,13 +479,13 @@
|
|||
"version": "1.30.0"
|
||||
},
|
||||
"gridscale": {
|
||||
"hash": "sha256-3JB82wbZ6mosFJZ96rGOnv/f1VFhHk6WEfm2u6sop2E=",
|
||||
"hash": "sha256-0XKSGfvJ61iD6zZ3Re3tB6Orb2Dklu5tbD8hBGyzlgo=",
|
||||
"owner": "gridscale",
|
||||
"provider-source-address": "registry.terraform.io/gridscale/gridscale",
|
||||
"repo": "terraform-provider-gridscale",
|
||||
"rev": "v1.16.0",
|
||||
"rev": "v1.16.1",
|
||||
"vendorHash": null,
|
||||
"version": "1.16.0"
|
||||
"version": "1.16.1"
|
||||
},
|
||||
"hcloud": {
|
||||
"hash": "sha256-DWDM3yWKkRV9FJMzKK7JJQdI0WvFILF/bsZFv2CjrvM=",
|
||||
|
|
@ -777,13 +777,13 @@
|
|||
"version": "0.6.12"
|
||||
},
|
||||
"newrelic": {
|
||||
"hash": "sha256-Sm5GwfILRCg0/gTNJtrDrWZY+uBXvuTYtrrtTnugP9Q=",
|
||||
"hash": "sha256-Av6NIAjIfJbiOKr7y8bWCsLxToKn4eeroicWo7yu1PU=",
|
||||
"owner": "newrelic",
|
||||
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.5.0",
|
||||
"rev": "v3.5.1",
|
||||
"vendorHash": "sha256-1D66m18oWwuXgBIWstRWvjfy9iGrmO3gyVBucdPps2c=",
|
||||
"version": "3.5.0"
|
||||
"version": "3.5.1"
|
||||
},
|
||||
"nomad": {
|
||||
"hash": "sha256-HhocWB3ZCFdeYgmA64hv1CYwqIf4EB/Q+vNrFKVB31I=",
|
||||
|
|
@ -877,13 +877,13 @@
|
|||
"version": "1.48.0"
|
||||
},
|
||||
"opentelekomcloud": {
|
||||
"hash": "sha256-9JDRGya/2SJm4JsM6o6E7dqLQqDjfR8Gjf6BuSFEdpo=",
|
||||
"hash": "sha256-oqagD7YK/HyAoeI5WBrHuAmWiLoz/1441zne8vqN3A8=",
|
||||
"owner": "opentelekomcloud",
|
||||
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.31.5",
|
||||
"vendorHash": "sha256-7iDE/DKix9AKY0hX7m6V9KgDYmCiVFrpRMmgCSsm/5c=",
|
||||
"version": "1.31.5"
|
||||
"rev": "v1.31.6",
|
||||
"vendorHash": "sha256-AuxvQffKOHPqda8nMJPxWVMui9+d8IhmbPsZK/9A1yI=",
|
||||
"version": "1.31.6"
|
||||
},
|
||||
"opsgenie": {
|
||||
"hash": "sha256-hdLKa2usoDedzOlzPQrADJOqIxtANqTeTamn/DakRh4=",
|
||||
|
|
@ -1075,13 +1075,13 @@
|
|||
"version": "0.7.1"
|
||||
},
|
||||
"spotinst": {
|
||||
"hash": "sha256-hlTeN8dQWHU4yHDUqCeBbfapDI1lbxj05FlUN+vUOuM=",
|
||||
"hash": "sha256-D/cLkMAZwjJoaliUmfiLAn6uY1rNt1vu6QS5mQmBQ0s=",
|
||||
"owner": "spotinst",
|
||||
"provider-source-address": "registry.terraform.io/spotinst/spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.85.0",
|
||||
"rev": "v1.85.1",
|
||||
"vendorHash": "sha256-BDYX/4D3R2A1w3k14mON/2KZUg2kPbwePXQQpVanqdU=",
|
||||
"version": "1.85.0"
|
||||
"version": "1.85.1"
|
||||
},
|
||||
"stackpath": {
|
||||
"hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=",
|
||||
|
|
|
|||
|
|
@ -168,9 +168,9 @@ rec {
|
|||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.3.2";
|
||||
sha256 = "sha256-Xr6ZmKE7BoMh2gZcvcZgWwb8WuAb3Xb8vV9gZVjDZFE=";
|
||||
vendorSha256 = "sha256-+m7e49yN7OkiQQVvqimF0Tvz5wUr2M5bxs3yBU2lt7Y=";
|
||||
version = "1.3.3";
|
||||
sha256 = "sha256-Oqswfw/ZkBJKldRd916Jfaugz66C3wE8VU44kAkGmUA=";
|
||||
vendorSha256 = "sha256-mXCtgB1MdMP2XlJBagaDtZURw5o0JudAB2koHmfM0f8=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
inherit plugins;
|
||||
|
|
|
|||
|
|
@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
cmakeFlags = [ "-DNoVoip=True" ]; # libtgvoip required
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "-U__ARM_NEON__" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ars3niy/tdlib-purple";
|
||||
description = "libpurple Telegram plugin using tdlib";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "desync";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "folbricht";
|
||||
repo = "desync";
|
||||
sha256 = "sha256-yGlf6Z38GnOWSc2pvt/u4arx5lCB0QpoqPdNamdL9b0=";
|
||||
sha256 = "sha256-vyW5zR6Dw860LUj7sXFgwzU1AZDoPMoQ4G0xsK4L6+w=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-c+Sz3WMKyzdEE/Hs+7dekQPn+62ddbmfvV21W0KeLDU=";
|
||||
vendorSha256 = "sha256-RMM/WFIUg2Je3yAgshif3Nkhm8G3bh6EhHCHTAvMXUc=";
|
||||
|
||||
# nix builder doesn't have access to test data; tests fail for reasons unrelated to binary being bad.
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -14,18 +14,18 @@ let
|
|||
in
|
||||
mkYarnPackage rec {
|
||||
pname = "micropad";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MicroPad";
|
||||
repo = "Micropad-Electron";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-slutuLH95wQaZK02vRU/WDbYgG0RZbNKvrihLVMZWpQ=";
|
||||
sha256 = "sha256-ity5oU6TCBpQgimoiaMswOV3FY7Z0GmBcFWqQzdYmao=";
|
||||
};
|
||||
|
||||
micropad-core = fetchzip {
|
||||
url = "https://github.com/MicroPad/MicroPad-Core/releases/download/v${version}/micropad.tar.xz";
|
||||
sha256 = "1w0ajx15rm2mmyy4518ai8xfkfd6dfm38i3vfr9q9bw9h6igfn6g";
|
||||
sha256 = "0br8lsdrbjkr5gl434r5ngdhbwbzhav94q8kizsixb8k0wwyfxy5";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "micropad",
|
||||
"version": "4.0.0",
|
||||
"version": "4.1.0",
|
||||
"description": "A powerful note-taking app that helps you organise + take notes without restrictions.",
|
||||
"main": "main.js",
|
||||
"scripts": {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }:
|
||||
{ lib, stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK32 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tqsl";
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
zlib
|
||||
db
|
||||
(curl.override { inherit openssl; })
|
||||
wxGTK
|
||||
wxGTK32
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python3, fetchpatch }:
|
||||
{ lib, stdenv, fetchurl, wxGTK30-gtk3, subversion, apr, aprutil, python3, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rapidsvn";
|
||||
|
|
@ -9,12 +9,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";
|
||||
};
|
||||
|
||||
buildInputs = [ wxGTK subversion apr aprutil python3 ];
|
||||
buildInputs = [ wxGTK30-gtk3 subversion apr aprutil python3 ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
|
||||
|
||||
configureFlags = [ "--with-svn-include=${subversion.dev}/include"
|
||||
"--with-svn-lib=${subversion.out}/lib" ];
|
||||
configureFlags = [
|
||||
"--with-svn-include=${subversion.dev}/include"
|
||||
"--with-svn-lib=${subversion.out}/lib"
|
||||
];
|
||||
|
||||
patches = [
|
||||
./fix-build.patch
|
||||
|
|
@ -31,6 +33,11 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/3e375f11d94cb8faddb8b7417354a9fb51f304ec.patch";
|
||||
hash = "sha256-BUpCMEH7jctOLtJktDUE52bxexfLemLItZ0IgdAnq9g=";
|
||||
})
|
||||
# wxWidgets 3.0 compatibility patches
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/r/rapidsvn/0.12.1dfsg-3.1/debian/patches/wx3.0.patch";
|
||||
sha256 = "sha256-/07+FoOrNw/Pc+wlVt4sGOITfIIEu8ZbI3/ym0u8bs4=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -16,24 +15,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-a11y";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1adx1sx9qh02hjgv5h0gwyn116shjl3paxmyaiv4cgh6vq3ndp3c";
|
||||
sha256 = "sha256-iS+xTCjbRZfaUiOtHbQ+/SaajfWWAlC9XiZbIGZPO9I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream code not respecting our localedir
|
||||
# https://github.com/elementary/wingpanel-indicator-a11y/pull/48
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/wingpanel-indicator-a11y/commit/fb8412d56bc1c42b70e8ee41b837e8024e1297f7.patch";
|
||||
sha256 = "0619npdw9wvaz1zk2lzikczyjdqba8v8c9ry9zizvvl4j1i1ad7k";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, pkg-config
|
||||
|
|
@ -24,13 +23,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-datetime";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-GxlnzLDrZmDDAGlUMoM4k4SkbCqra3Th6ugRAj3Wse4=";
|
||||
sha256 = "sha256-5hg0TH12bEeEPhUUmZz7vS4YTB6t779CXyOCf0c4/X4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -38,13 +37,6 @@ stdenv.mkDerivation rec {
|
|||
src = ./fix-paths.patch;
|
||||
elementary_calendar = elementary-calendar;
|
||||
})
|
||||
|
||||
# GridDay: Do not connect to the notify signal for the property
|
||||
# https://github.com/elementary/wingpanel-indicator-datetime/pull/305
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/845ac1345124571fe995ab7138d5dfe4d29847e9.patch";
|
||||
sha256 = "sha256-/wd/FnhjC0c0Y8mCZg8XNoPOYAAmfK+g1F6L6TMEkdM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-network";
|
||||
version = "2.3.3";
|
||||
version = "2.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-fcR8gcexxIzSvR27SUyDhyCOlev+0r7YPPJlCNydCYM=";
|
||||
sha256 = "sha256-j6USKTpiktDKH7jBV1FFg8f3HeNwEkMp3HxG/MeL41g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pkg-config
|
||||
, meson
|
||||
|
|
@ -16,24 +15,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-nightlight";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1zxjw68byg4sjn8lzsidzmy4ipwxgnv8rm529a7wzlpgj2xq3x4j";
|
||||
sha256 = "sha256-oZUPveNlm9p8gKeDGopfhu1rBbydLaQSlkPs6+WHrUo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream code not respecting our localedir
|
||||
# https://github.com/elementary/wingpanel-indicator-nightlight/pull/91
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/wingpanel-indicator-nightlight/commit/4e15f71ed958df3569b2f1e224b9fb18613281f1.patch";
|
||||
sha256 = "07awmswyy0988pm6ggyz22mllja675cbdzrjdqc1xd4knwcgy77v";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
libxml2
|
||||
meson
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-notifications";
|
||||
version = "6.0.6";
|
||||
version = "6.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-wAoLU59hEYubWn9o7cVlZ/mJoxJJjEkJA9xu9gwxQ7o=";
|
||||
sha256 = "sha256-MIuyVGI4jSLGQMQUmj/2PIvcRHSJyPO5Pnd1f8JIuXc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -17,24 +16,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-session";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0hww856qjl4kjmmksd5gp8bc5vj4fhs2s9fmbnpbf88lg5ds0wv0";
|
||||
sha256 = "sha256-2AEMe5dctTicW1MiGRV1SMjN/uFxQGbOYzCNFS1/KNk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream code not respecting our localedir
|
||||
# https://github.com/elementary/wingpanel-indicator-session/pull/162
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/wingpanel-indicator-session/commit/e85032da8e923df4589dc75ccded10026b6c1cd7.patch";
|
||||
sha256 = "139b2zbc6qjaw41nwfjkqv4npahkzryv4p5m6v10273clv6l72ng";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel";
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-WvkQx+9YjKCINpyVg8KjCV0GAb0rJfblSFaO14/4oas=";
|
||||
sha256 = "sha256-dShC6SXjOJmiLI6TUEZsthv5scnm9Jzum+sG/NkWAyM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
|
|||
function(generate_pkgconfig' \
|
||||
--replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \
|
||||
--replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR}
|
||||
'' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
|
||||
sed -i "/vptr/d" test/CMakeLists.txt
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "buildkit";
|
||||
version = "0.10.4";
|
||||
version = "0.10.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "buildkit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vxu0QLZ6ERNV1lTH0/c0yR6FT/im5rn85oqQeRvdt6M=";
|
||||
sha256 = "sha256-6p7LQvlVG0epkk4qFDKrmBBFIIbmB6AMROB7dfE+3ho=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grpc-gateway";
|
||||
version = "2.11.3";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc-ecosystem";
|
||||
repo = "grpc-gateway";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FGRuThptgcNttciYxNLUiY5oVoiODnXgMDiw1hz71mM=";
|
||||
sha256 = "sha256-OthyGEMVQnK0jN9svlfAZUl52lt19jtLd1Oj3cuirx4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-8mFTswOgBTSDypgtfovJT9Xsykis7Q1CCQL751SuTY8=";
|
||||
vendorSha256 = "sha256-UjwpFjHVaQT4irhbt2GGlYeNhDs9Dv73PcHKhMrQfQs=";
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mold";
|
||||
version = "1.5.1";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rui314";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-s57mXWZsj7S5O91I3tc/ecHJDbQR7amiyTxhYt7jzUM=";
|
||||
hash = "sha256-IXXyZZw1Tp/s9YkPR5Y+A6LpvaRo+XfA8UJBtt5Bjmg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "riot-redis";
|
||||
version = "2.18.1";
|
||||
version = "2.18.5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/redis-developer/riot/releases/download/v${version}/riot-redis-${version}.zip";
|
||||
sha256 = "sha256-mRuW/mPcqDO2txVwL2MlqZeprNDifjmOx7UUUy3yF3M=";
|
||||
sha256 = "sha256-XMcWNsQpFG1ovIIXGMURV5IVrL3+Aq2qls+r4IZbBl8=";
|
||||
};
|
||||
|
||||
buildInputs = [ jre_headless ];
|
||||
|
|
|
|||
|
|
@ -1,14 +1,16 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, cmake
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
, libgit2
|
||||
, openssl
|
||||
, stdenv
|
||||
, expat
|
||||
, fontconfig
|
||||
, libGL
|
||||
, xorg
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
|
@ -20,13 +22,23 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "sha256-IL7BxiJg6eTuFM0pJ3qLxYCVofE/RjmgQjvOW96QF9A=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-16mgp7GsjbizzCWN3MDpl6ps9CK1zdIpLiyNiKYjDI4=";
|
||||
# update dependencies so it is compatible with libgit2 1.5
|
||||
# libgit2-sys 0.14.3 is only compatible with libgit2 1.4
|
||||
cargoPatches = [ ./update-git2.patch ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ] ++ lib.optionals stdenv.isLinux [
|
||||
cargoSha256 = "sha256-i/ERVPzAWtN4884051VoA/ItypyURpHb/Py6w3KDOAo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [
|
||||
buildInputs = [
|
||||
libgit2
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
expat
|
||||
fontconfig
|
||||
libGL
|
||||
xorg.libX11
|
||||
|
|
@ -34,6 +46,10 @@ rustPlatform.buildRustPackage rec {
|
|||
xorg.libXi
|
||||
xorg.libXrandr
|
||||
xorg.libxcb
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# dark-light doesn't build on apple sdk < 10.14
|
||||
# see https://github.com/frewsxcv/rust-dark-light/issues/14
|
||||
darwin.apple_sdk_11_0.frameworks.AppKit
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
|
|
@ -47,7 +63,5 @@ rustPlatform.buildRustPackage rec {
|
|||
changelog = "https://github.com/slint-ui/cargo-ui/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ mit asl20 gpl3Only ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
# figsoda: I can't figure how to make it build on darwin
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
94
pkgs/development/tools/rust/cargo-ui/update-git2.patch
Normal file
94
pkgs/development/tools/rust/cargo-ui/update-git2.patch
Normal file
|
|
@ -0,0 +1,94 @@
|
|||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -720,9 +720,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "crates-index"
|
||||
-version = "0.18.7"
|
||||
+version = "0.18.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "0044896374c388ccbf1497dad6384bf6111dbcad9d7069506df7450ce9b62ea3"
|
||||
+checksum = "3447ec855b0c44cad8eedb3d32b53837f233894d5f4584a2648a7ebc5d3feef4"
|
||||
dependencies = [
|
||||
"git2",
|
||||
"hex",
|
||||
@@ -1387,9 +1387,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "git2"
|
||||
-version = "0.14.3"
|
||||
+version = "0.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "5e77a14ffc6ba4ad5188d6cf428894c4fcfda725326b37558f35bb677e712cec"
|
||||
+checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"libc",
|
||||
@@ -1884,9 +1884,9 @@ checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
|
||||
|
||||
[[package]]
|
||||
name = "libgit2-sys"
|
||||
-version = "0.13.3+1.4.2"
|
||||
+version = "0.14.0+1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c24d36c3ac9b9996a2418d6bf428cc0bc5d1a814a84303fc60986088c5ed60de"
|
||||
+checksum = "47a00859c70c8a4f7218e6d1cc32875c4b55f6799445b842b0d8ed5e4c3d959b"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
@@ -2712,9 +2712,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rayon"
|
||||
-version = "1.5.2"
|
||||
+version = "1.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221"
|
||||
+checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"crossbeam-deque",
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index ca5269d..6fa4ec2 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -33,7 +33,7 @@ version = "1.0.53"
|
||||
version = "0.14"
|
||||
|
||||
[dependencies.crates-index]
|
||||
-version = "0.18.0"
|
||||
+version = "0.18.10"
|
||||
|
||||
[dependencies.dunce]
|
||||
version = "1.0.2"
|
||||
@@ -42,7 +42,7 @@ version = "1.0.2"
|
||||
version = "0.3"
|
||||
|
||||
[dependencies.git2]
|
||||
-version = "0.14.3"
|
||||
+version = "0.15.0"
|
||||
|
||||
[dependencies.itertools]
|
||||
version = "0.10"
|
||||
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
|
||||
index 52eadbd..ef8aa7c 100644
|
||||
--- a/Cargo.toml.orig
|
||||
+++ b/Cargo.toml.orig
|
||||
@@ -22,7 +22,7 @@ default = ["slint-backend-qt", "slint-backend-gl-all"]
|
||||
[dependencies]
|
||||
anyhow = "1.0.53"
|
||||
cargo_metadata = "0.14"
|
||||
-crates-index = { version = "0.18.0" }
|
||||
+crates-index = { version = "0.18.10" }
|
||||
dunce = "1.0.2"
|
||||
futures = "0.3"
|
||||
itertools = "0.10"
|
||||
@@ -34,7 +34,7 @@ shlex = "1.1"
|
||||
slint = { version = "0.2.4", default-features = false, features = [ "compat-0-2-0" ] }
|
||||
tokio = { version = "1.16.1", features= ["full"] }
|
||||
toml_edit = "0.14.3"
|
||||
-git2 = "0.14.3"
|
||||
+git2 = "0.15.0"
|
||||
|
||||
[build-dependencies]
|
||||
slint-build = { version = "0.2.4" }
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchCrate, lib, rustPlatform, openssl, pkg-config }:
|
||||
{ lib, fetchCrate, rustPlatform, openssl, pkg-config, stdenv, CoreServices }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dioxus-cli";
|
||||
version = "0.1.4";
|
||||
|
|
@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
cargoSha256 = "sha256-Mf/WtOO/vFuhg90DoPDwOZ6XKj423foHZ8vHugXakb0=";
|
||||
|
||||
|
|
|
|||
|
|
@ -17,15 +17,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "1.26.1";
|
||||
version = "1.26.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rnHs0vMchUXB6iNXyhdN9uDzdyAIPgOxsQLKPHJ46jw=";
|
||||
sha256 = "sha256-/t1UG8F5sWJ+Zf9+r8oiAFF4pS+tLmXMDlTeY7+2qDQ=";
|
||||
};
|
||||
cargoSha256 = "sha256-YHHhrni2HLUIQIw090StfFhkYcipqnoYewEFLw3F0Pg=";
|
||||
cargoSha256 = "sha256-8CauLXX/ARAyqtQLQKgxuQWcmjSzSindCLkVk+wV/Nk=";
|
||||
|
||||
postPatch = ''
|
||||
# upstream uses lld on aarch64-darwin for faster builds
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ let
|
|||
};
|
||||
in
|
||||
fetch_librusty_v8 {
|
||||
version = "0.51.0";
|
||||
version = "0.53.1";
|
||||
shas = {
|
||||
x86_64-linux = "sha256-M6GrAHidz9OPVrNgqxoEmvRgbNMyWKV8xpSTMGvW6kI=";
|
||||
aarch64-linux = "sha256-gDC03Lku+biQGxa4vCOqhrGs7Js6BPbJFtqPDNxrpsQ=";
|
||||
x86_64-darwin = "sha256-uK6ytoRu1lHtqMiertICcaS3KN11iHhQmmIMhD2tCc0=";
|
||||
aarch64-darwin = "sha256-rNuQg78GsyErmcDOMn4PLIR1AzSQ6CbfqL7I67MlQQc=";
|
||||
x86_64-linux = "sha256-jMOzvvjnmauVmyeBlTOeVpQB1TcQ0K8D7xXsgjLcp3M=";
|
||||
aarch64-linux = "sha256-aRcKpPlliO26xJe2zBym5/+hNmJUIrWu3qXJa9R3Irg=";
|
||||
x86_64-darwin = "sha256-JsEx2t8d33xRlh+pmJtk5jvDktfW6nFGdw6oqJ3uYSU=";
|
||||
aarch64-darwin = "sha256-ju/qr65m33IyXFL2VQXhvtL7PsxSpi8RrGteIb9dQTU=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ fetchurl, lib, stdenv, SDL, SDL_image, SDL_mixer, SDL_sound, libsigcxx, physfs
|
||||
, boost, expat, freetype, libjpeg, wxGTK, lua, perl, pkg-config, zlib, zip, bzip2
|
||||
, boost, expat, freetype, libjpeg, wxGTK32, lua, perl, pkg-config, zlib, zip, bzip2
|
||||
, libpng, libtiff, fluidsynth, libmikmod, libvorbis, flac, libogg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat
|
||||
freetype libjpeg wxGTK lua perl zlib zip bzip2 libpng
|
||||
freetype libjpeg wxGTK32 lua perl zlib zip bzip2 libpng
|
||||
libtiff fluidsynth libmikmod flac libvorbis libogg
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, gtk2, glib, pkg-config, libGLU, libGL, wxGTK, libX11, xorgproto
|
||||
, runtimeShell }:
|
||||
{ lib, stdenv, fetchurl, gtk2, glib, pkg-config, libGLU, libGL, wxGTK32, libX11, xorgproto, runtimeShell }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fsg";
|
||||
|
|
@ -11,10 +10,13 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c";
|
||||
};
|
||||
|
||||
patches = [ ./wxgtk-3.2.patch ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk2 glib libGLU libGL wxGTK libX11 xorgproto ];
|
||||
|
||||
buildInputs = [ glib libGLU libGL wxGTK32 libX11 xorgproto ];
|
||||
|
||||
preBuild = ''
|
||||
sed -e '
|
||||
|
|
@ -32,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "Cellular automata engine tuned towards the likes of Falling Sand";
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
68
pkgs/games/fsg/wxgtk-3.2.patch
Normal file
68
pkgs/games/fsg/wxgtk-3.2.patch
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
diff --git a/Canvas.cpp b/Canvas.cpp
|
||||
index 8c00727..5ee7756 100644
|
||||
--- a/Canvas.cpp
|
||||
+++ b/Canvas.cpp
|
||||
@@ -889,7 +889,6 @@ void Canvas::Refresh(){
|
||||
if (doDraw){
|
||||
wxClientDC dc(this);
|
||||
|
||||
- dc.BeginDrawing();
|
||||
|
||||
wxMemoryDC memdc;
|
||||
wxImage image(g_width, g_height, bitmapdata, true);
|
||||
@@ -899,7 +898,6 @@ void Canvas::Refresh(){
|
||||
dc.Blit(0,0,g_width, g_height, &memdc, 0, 0);
|
||||
|
||||
if (!drawAll){
|
||||
- dc.EndDrawing();
|
||||
return;
|
||||
}
|
||||
else{
|
||||
@@ -912,7 +910,6 @@ void Canvas::Refresh(){
|
||||
}
|
||||
|
||||
|
||||
- dc.EndDrawing();
|
||||
|
||||
}
|
||||
}
|
||||
diff --git a/MainFrame.cpp b/MainFrame.cpp
|
||||
index c45107b..d93f9e1 100644
|
||||
--- a/MainFrame.cpp
|
||||
+++ b/MainFrame.cpp
|
||||
@@ -178,7 +178,7 @@ MainFrame::MainFrame(const wxString& title, const wxPoint& pos, const wxSize& si
|
||||
RHSizer->Add(RH4, 0, wxEXPAND | wxALL, 5);
|
||||
}
|
||||
|
||||
- sizer->Add(g_canvas, 0, wxADJUST_MINSIZE | wxALL, 10);
|
||||
+ sizer->Add(g_canvas, 0, wxALL, 10);
|
||||
sizer->Add(RHSizer, 1, wxEXPAND);
|
||||
}
|
||||
this->SetSizer(sizer);
|
||||
@@ -1165,7 +1165,7 @@ void MainFrame::OnMenu(wxCommandEvent& event){
|
||||
}
|
||||
else if(event.GetId() == 1051){
|
||||
//Load
|
||||
- wxFileDialog dialog(this, _("Load from a file"), _(""), _(""), _("Any Image Files (*.*)|*.*"), wxOPEN);
|
||||
+ wxFileDialog dialog(this, _("Load from a file"), _(""), _(""), _("Any Image Files (*.*)|*.*"), wxFD_OPEN);
|
||||
|
||||
if (dialog.ShowModal() == wxID_OK){
|
||||
sandboxFilename = dialog.GetPath();
|
||||
@@ -1174,7 +1174,7 @@ void MainFrame::OnMenu(wxCommandEvent& event){
|
||||
}
|
||||
else if(event.GetId() == 1052){
|
||||
//Save
|
||||
- wxFileDialog dialog(this, _("Save to a file"), _(""), _(""), _("PNG files (*.png)|*.png|BMP files (*.bmp)|*.bmp"), wxSAVE);
|
||||
+ wxFileDialog dialog(this, _("Save to a file"), _(""), _(""), _("PNG files (*.png)|*.png|BMP files (*.bmp)|*.bmp"), wxFD_SAVE);
|
||||
|
||||
if (dialog.ShowModal() == wxID_OK){
|
||||
wxString filename = dialog.GetPath();
|
||||
@@ -1216,7 +1216,7 @@ void MainFrame::OnMenu(wxCommandEvent& event){
|
||||
else if(event.GetId() == 1055){
|
||||
//Load physics
|
||||
|
||||
- wxFileDialog dialog(this, _("Load from a file"), _(""), _(""), _("Physics Files (*.txt)|*.txt"), wxOPEN);
|
||||
+ wxFileDialog dialog(this, _("Load from a file"), _(""), _(""), _("Physics Files (*.txt)|*.txt"), wxFD_OPEN);
|
||||
if (dialog.ShowModal() == wxID_OK){
|
||||
physicsFilename = dialog.GetPath();
|
||||
loadPhysics(physicsFilename);
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc
|
||||
, libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng
|
||||
, libjpeg, wxGTK30-gtk3, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng
|
||||
, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib
|
||||
, fetchFromGitHub, fetchpatch
|
||||
}:
|
||||
|
|
@ -9,7 +9,7 @@ let
|
|||
name = "megaglest-lib-env";
|
||||
paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext
|
||||
xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype
|
||||
stdenv.cc.cc glew libGLU wxGTK ];
|
||||
stdenv.cc.cc glew libGLU wxGTK30-gtk3 ];
|
||||
};
|
||||
path-env = buildEnv {
|
||||
name = "megaglest-path-env";
|
||||
|
|
@ -38,11 +38,11 @@ stdenv.mkDerivation {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper git ];
|
||||
buildInputs = [ curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK
|
||||
buildInputs = [ curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK30-gtk3
|
||||
glib cppunit fontconfig freetype ftgl glew libogg libvorbis libGLU ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_PREFIX=$out"
|
||||
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}"
|
||||
"-DBUILD_MEGAGLEST=On"
|
||||
"-DBUILD_MEGAGLEST_MAP_EDITOR=On"
|
||||
"-DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=On"
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wesnoth";
|
||||
version = "1.16.5";
|
||||
version = "1.16.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = version;
|
||||
owner = "wesnoth";
|
||||
repo = "wesnoth";
|
||||
sha256 = "sha256-U01dMrbPRBliag/RKnwG1G2YEv7fiTh6+S+S5cO1Fx8=";
|
||||
sha256 = "sha256-oQRjVjVjLIvCCafLr0FXvLwnKDjJY2FU20dYGLtNFiU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jetty";
|
||||
version = "11.0.8";
|
||||
version = "11.0.12";
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz";
|
||||
sha256 = "sha256-fHd0o5f+WLdbDK1nmSnHNKjDO0mV7+vkPs4zVEaqeyw=";
|
||||
sha256 = "sha256-otRm4hOJYK5QbWYevMosQlrSbmcni4ZREvwBo751JOQ=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cyberchef";
|
||||
version = "9.46.5";
|
||||
version = "9.48.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip";
|
||||
sha256 = "sha256-1Snj4rY3elEil7m1n/HFigZWlE2+TJtEiAMjWy0J0xU=";
|
||||
sha256 = "sha256-tKNU+gUcuZMjsQes/vpEpn216/0fWCgb0mgvJ8WWoDQ=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
76
pkgs/tools/text/diffsitter/default.nix
Normal file
76
pkgs/tools/text/diffsitter/default.nix
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, linkFarm
|
||||
, makeWrapper
|
||||
, rustPlatform
|
||||
, tree-sitter
|
||||
}:
|
||||
|
||||
let
|
||||
# based on https://github.com/NixOS/nixpkgs/blob/aa07b78b9606daf1145a37f6299c6066939df075/pkgs/development/tools/parsing/tree-sitter/default.nix#L85-L104
|
||||
withPlugins = grammarFn:
|
||||
let
|
||||
grammars = grammarFn tree-sitter.builtGrammars;
|
||||
in
|
||||
linkFarm "grammars"
|
||||
(map
|
||||
(drv:
|
||||
let
|
||||
name = lib.strings.getName drv;
|
||||
in
|
||||
{
|
||||
name =
|
||||
"lib" +
|
||||
(lib.strings.removeSuffix "-grammar" name)
|
||||
+ ".so";
|
||||
path = "${drv}/parser";
|
||||
}
|
||||
)
|
||||
grammars);
|
||||
|
||||
libPath = withPlugins (_: tree-sitter.allGrammars);
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "diffsitter";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "afnanenayet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fDuJMpMseGVKfgg/ERb7dHUZ9n5McYVJLBvuroLZDqE=";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-HmL7Xopj0gSokjyQY4Umy+5HKUKdRdBE7glMbrsk00c=";
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
"dynamic-grammar-libs"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/diffsitter" \
|
||||
--prefix LD_LIBRARY_PATH : "${libPath}"
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
# failures:
|
||||
# tests::diff_hunks_snapshot::_medium_cpp_cpp_false_expects
|
||||
# tests::diff_hunks_snapshot::_medium_cpp_cpp_true_expects
|
||||
# tests::diff_hunks_snapshot::_medium_rust_rs_false_expects
|
||||
# tests::diff_hunks_snapshot::_medium_rust_rs_true_expects
|
||||
# tests::diff_hunks_snapshot::_short_python_py_true_expects
|
||||
# tests::diff_hunks_snapshot::_short_rust_rs_true_expects
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/afnanenayet/diffsitter";
|
||||
description = "A tree-sitter based AST difftool to get meaningful semantic diffs";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bbigras ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5830,6 +5830,8 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
diffsitter = callPackage ../tools/text/diffsitter { };
|
||||
|
||||
diffstat = callPackage ../tools/text/diffstat { };
|
||||
|
||||
difftastic = callPackage ../tools/text/difftastic { };
|
||||
|
|
@ -14953,9 +14955,7 @@ with pkgs;
|
|||
cargo-udeps = callPackage ../development/tools/rust/cargo-udeps {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
|
||||
};
|
||||
cargo-ui = callPackage ../development/tools/rust/cargo-ui {
|
||||
inherit (darwin.apple_sdk.frameworks);
|
||||
};
|
||||
cargo-ui = darwin.apple_sdk_11_0.callPackage ../development/tools/rust/cargo-ui { };
|
||||
|
||||
cargo-tauri = callPackage ../development/tools/rust/cargo-tauri { };
|
||||
|
||||
|
|
@ -16642,7 +16642,9 @@ with pkgs;
|
|||
|
||||
dive = callPackage ../development/tools/dive { };
|
||||
|
||||
dioxus-cli = callPackage ../development/tools/rust/dioxus-cli { };
|
||||
dioxus-cli = callPackage ../development/tools/rust/dioxus-cli {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
||||
doclifter = callPackage ../development/tools/misc/doclifter { };
|
||||
|
||||
|
|
@ -33901,11 +33903,7 @@ with pkgs;
|
|||
|
||||
frozen-bubble = callPackage ../games/frozen-bubble { };
|
||||
|
||||
fsg = callPackage ../games/fsg {
|
||||
wxGTK = wxGTK28.override {
|
||||
unicode = false;
|
||||
};
|
||||
};
|
||||
fsg = callPackage ../games/fsg { };
|
||||
|
||||
galaxis = callPackage ../games/galaxis { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue