Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
680b13891d
42 changed files with 1588 additions and 1717 deletions
|
|
@ -15024,6 +15024,12 @@
|
|||
github = "rubyowo";
|
||||
githubId = 105302757;
|
||||
};
|
||||
rudolfvesely = {
|
||||
name = "Rudolf Vesely";
|
||||
email = "i@rudolfvesely.com";
|
||||
github = "rudolfvesely";
|
||||
githubId = 13966949;
|
||||
};
|
||||
Ruixi-rebirth = {
|
||||
name = "Ruixi-rebirth";
|
||||
email = "ruixirebirth@gmail.com";
|
||||
|
|
|
|||
|
|
@ -700,6 +700,7 @@ in {
|
|||
|
||||
environment.profiles = [
|
||||
"$HOME/.nix-profile"
|
||||
"\${XDG_STATE_HOME:-$HOME/.local/state}/nix/profile"
|
||||
"/etc/profiles/per-user/$USER"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ let
|
|||
mkLibretroCore =
|
||||
{ core
|
||||
, src ? (getCoreSrc core)
|
||||
, version ? "unstable-2023-03-13"
|
||||
, version ? "unstable-2023-09-24"
|
||||
, ...
|
||||
}@args:
|
||||
import ./mkLibretroCore.nix ({
|
||||
|
|
@ -410,7 +410,9 @@ in
|
|||
|
||||
flycast = mkLibretroCore {
|
||||
core = "flycast";
|
||||
extraNativeBuildInputs = [ cmake ];
|
||||
extraBuildInputs = [ libGL libGLU ];
|
||||
cmakeFlags = [ "-DLIBRETRO=ON" ];
|
||||
makefile = "Makefile";
|
||||
meta = {
|
||||
description = "Flycast libretro port";
|
||||
|
|
@ -502,10 +504,17 @@ in
|
|||
|
||||
mame = mkLibretroCore {
|
||||
core = "mame";
|
||||
extraBuildInputs = [ alsa-lib libGLU libGL portaudio python3 xorg.libX11 ];
|
||||
extraNativeBuildInputs = [ python3 ];
|
||||
extraBuildInputs = [ alsa-lib libGLU libGL ];
|
||||
meta = {
|
||||
description = "Port of MAME to libretro";
|
||||
license = with lib.licenses; [ bsd3 gpl2Plus ];
|
||||
# Build fail with errors:
|
||||
# gcc: warning: <arch>: linker input file unused because linking not done
|
||||
# gcc: error: <arch>: linker input file not found: No such file or directory
|
||||
# Removing it from platforms instead of marking as broken to allow
|
||||
# retroarchFull to be built
|
||||
platforms = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -626,6 +635,13 @@ in
|
|||
src = getCoreSrc "mupen64plus";
|
||||
extraBuildInputs = [ libGLU libGL libpng nasm xorg.libX11 ];
|
||||
makefile = "Makefile";
|
||||
makeFlags = [
|
||||
"HAVE_PARALLEL_RDP=1"
|
||||
"HAVE_PARALLEL_RSP=1"
|
||||
"HAVE_THR_AL=1"
|
||||
"LLE=1"
|
||||
"WITH_DYNAREC=${stdenv.hostPlatform.parsed.cpu.name}"
|
||||
];
|
||||
meta = {
|
||||
description = "Libretro port of Mupen64 Plus, GL only";
|
||||
license = lib.licenses.gpl3Only;
|
||||
|
|
@ -698,6 +714,11 @@ in
|
|||
core = "parallel-n64";
|
||||
extraBuildInputs = [ libGLU libGL libpng ];
|
||||
makefile = "Makefile";
|
||||
makeFlags = [
|
||||
"HAVE_PARALLEL=1"
|
||||
"HAVE_PARALLEL_RSP=1"
|
||||
"ARCH=${stdenv.hostPlatform.parsed.cpu.name}"
|
||||
];
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 ''
|
||||
sed -i -e '1 i\CPUFLAGS += -DARM_FIX -DNO_ASM -DARM_ASM -DDONT_WANT_ARM_OPTIMIZATIONS -DARM64' Makefile \
|
||||
&& sed -i -e 's,CPUFLAGS :=,,g' Makefile
|
||||
|
|
@ -852,19 +873,8 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
scummvm = mkLibretroCore rec {
|
||||
scummvm = mkLibretroCore {
|
||||
core = "scummvm";
|
||||
version = "unstable-2022-04-06";
|
||||
# Commit below introduces libretro platform, that uses libretro-{deps,common} as
|
||||
# submodules. We will probably need to introduce this as separate derivations,
|
||||
# but for now let's just use the last known version that does not use it.
|
||||
# https://github.com/libretro/scummvm/commit/36446fa6eb33e67cc798f56ce1a31070260e2ada
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = core;
|
||||
rev = "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3";
|
||||
hash = "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew=";
|
||||
};
|
||||
extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL ];
|
||||
makefile = "Makefile";
|
||||
preConfigure = "cd backends/platform/libretro/build";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
, alsa-lib
|
||||
, dbus
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, ffmpeg_4
|
||||
, flac
|
||||
, freetype
|
||||
|
|
@ -17,7 +16,6 @@
|
|||
, libGL
|
||||
, libGLU
|
||||
, libpulseaudio
|
||||
, libretro-core-info
|
||||
, libv4l
|
||||
, libX11
|
||||
, libXdmcp
|
||||
|
|
@ -32,10 +30,8 @@
|
|||
, pkg-config
|
||||
, python3
|
||||
, qtbase
|
||||
, retroarch-assets
|
||||
, SDL2
|
||||
, spirv-tools
|
||||
, substituteAll
|
||||
, udev
|
||||
, vulkan-loader
|
||||
, wayland
|
||||
|
|
@ -50,12 +46,12 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "retroarch-bare";
|
||||
version = "1.15.0";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "RetroArch";
|
||||
hash = "sha256-kJOR3p3fKqGM8a5rgDPkz43uuf5AtS5fVnvr3tJgWbc=";
|
||||
hash = "sha256-aP3/IDs18Q32efFlp4XYDKpdoAm2+QwzhrMxmt3pSvE=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
"atari800": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-atari800",
|
||||
"rev": "94033288b026fe699bc50703609807aa8075f4dd",
|
||||
"hash": "sha256-fTKFELELt1g7t3uPgnXIgeMkkSbl9GHr0/k2FHcpDFI="
|
||||
"rev": "20d59afb3f19065749549732f20845c3be82e68c",
|
||||
"hash": "sha256-5cxBubhw60Jmp1p5TQ/L6RLaLANctG0TdpzGnpCadIM="
|
||||
},
|
||||
"beetle-gba": {
|
||||
"owner": "libretro",
|
||||
|
|
@ -20,8 +20,8 @@
|
|||
"beetle-lynx": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-lynx-libretro",
|
||||
"rev": "3ca44fda26f27418c92ada1b0f38b948af2151ae",
|
||||
"hash": "sha256-f0A8gA3UT40UDaAkWQcPoDd6vAcM37tNtZ2hCOIyBJA="
|
||||
"rev": "fab3ac02d5622eb53a707bd392cc037282e9d8b4",
|
||||
"hash": "sha256-+MKH8LmqDqznDIca/Q129zIXYI23V7s38sCD6rKiZlk="
|
||||
},
|
||||
"beetle-ngp": {
|
||||
"owner": "libretro",
|
||||
|
|
@ -32,26 +32,26 @@
|
|||
"beetle-pce-fast": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-pce-fast-libretro",
|
||||
"rev": "e480f6388375f59fd3e7aeef8ef8531c20e5c73e",
|
||||
"hash": "sha256-uURt6rB0IngWzEpl0DjbckdaTIjNwVCm3auvy7AwUdA="
|
||||
"rev": "f2ff19e56fb33361793f9fdaf44c1ea28bce1da3",
|
||||
"hash": "sha256-w7weSz8HR4YNPiBPqa81s3/8b9oFijr6DxNeQ/+I9OE="
|
||||
},
|
||||
"beetle-pcfx": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-pcfx-libretro",
|
||||
"rev": "724bd21b4524f8cf376dbc29c3e5a12cb674c758",
|
||||
"hash": "sha256-xeIVZ8FWGbETWYRIBNs3Yum7FDit5fb77hhH+RU45BY="
|
||||
"rev": "47c355b6a515aef6dc57f57df1535570108a0e21",
|
||||
"hash": "sha256-ylFo/wmLQpQGYSrv9PF2DBmr/8rklmHF9R+3y8v93Rs="
|
||||
},
|
||||
"beetle-psx": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-psx-libretro",
|
||||
"rev": "fd812d4cf8f65644faef1ea8597f826ddc37c0a0",
|
||||
"hash": "sha256-yvMgnY2dGUk8TvvfDklN3f6b1ol7vDu6AJcYzdwy9pI="
|
||||
"rev": "f256cc3dc3ec2f6017f7088f056996f8f155db64",
|
||||
"hash": "sha256-McMV5p1qEvqkeTjqOaD+xHNRQly+CNen9YUJxqLpJzk="
|
||||
},
|
||||
"beetle-saturn": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-saturn-libretro",
|
||||
"rev": "9bd31a4a42d06ca0f6d30ee38a569e57c150c414",
|
||||
"hash": "sha256-RHvH9Jp6c4cgEMTo+p+dU7qgJqjPbRqJLURadjAysrM="
|
||||
"rev": "cd395e9e3ee407608450ebc565e871b24e7ffed6",
|
||||
"hash": "sha256-EIZRv1EydfLWFoBb8TzvAY3kkL9Qr2OrwrljOnnM92A="
|
||||
},
|
||||
"beetle-snes": {
|
||||
"owner": "libretro",
|
||||
|
|
@ -62,26 +62,26 @@
|
|||
"beetle-supafaust": {
|
||||
"owner": "libretro",
|
||||
"repo": "supafaust",
|
||||
"rev": "75c658cce454e58ae04ea252f53a31c60d61548e",
|
||||
"hash": "sha256-2fXarVfb5/SYXF8t25/fGNFvODpGas5Bi0hLIbXgB+0="
|
||||
"rev": "6b639c98372d1c9bac885c55d772c812d2a9d525",
|
||||
"hash": "sha256-EVXwjrxooZm1JqG4HswUe8zwN81Rm7SPB5Fr4WfpTnc="
|
||||
},
|
||||
"beetle-supergrafx": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-supergrafx-libretro",
|
||||
"rev": "1ff2daa9377114d5394142f75f1c388b706567ed",
|
||||
"hash": "sha256-0FCm9kURtUQpyPb8cSmRAxttnUJnhE3EWV8DPvlj8HE="
|
||||
"rev": "56261ccd56f576a42a2d22190c09eb326a4331da",
|
||||
"hash": "sha256-aoEq4o9uZIAsjQQsN+tJNhOuFA9SNb7RKIUwqUGPhJQ="
|
||||
},
|
||||
"beetle-vb": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-vb-libretro",
|
||||
"rev": "dd6393f76ff781df0f4e8c953f5b053b1e61b313",
|
||||
"hash": "sha256-C8OtTNdC7GNFsY2EH56in35IX8d6ou/1R04kMvM9674="
|
||||
"rev": "732a8f701e671bf032165730fdf8bd96fb5ca7bb",
|
||||
"hash": "sha256-M19+ZidqqDdohuAVPxGVFQDQqoMl2QYM+K1WToqeOWM="
|
||||
},
|
||||
"beetle-wswan": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-wswan-libretro",
|
||||
"rev": "81e8b2afd31b7f0f939a3df6d70c8723bcc8a701",
|
||||
"hash": "sha256-xmDtMC5pId5X4vf9kHO55HmRpp/4ZruOM8QJSl//9R8="
|
||||
"rev": "a0ddcd3f084f5b4eb06acb6e03b8c4707a2f6123",
|
||||
"hash": "sha256-FJfznSo/3YKecVSU9mZW6yzd4/8vf2qrX4xhWjptd+A="
|
||||
},
|
||||
"blastem": {
|
||||
"owner": "libretro",
|
||||
|
|
@ -92,20 +92,20 @@
|
|||
"bluemsx": {
|
||||
"owner": "libretro",
|
||||
"repo": "bluemsx-libretro",
|
||||
"rev": "acf358be18644a9df0ed9602d63c2f73d4fe605a",
|
||||
"hash": "sha256-K4mH+brakYZcVEeYMFUkFThqdZGt2+aP5DfpOgWSJxg="
|
||||
"rev": "e21bf74bddb79ad1bbe20b4d964e7515269c669b",
|
||||
"hash": "sha256-U58zJd7txOyd9jymVmogQMIH5Av2kjO5MOn49T2FmqQ="
|
||||
},
|
||||
"bsnes": {
|
||||
"owner": "libretro",
|
||||
"repo": "bsnes-libretro",
|
||||
"rev": "4da970a334ba4644cef72e560985ea3f31fa40f7",
|
||||
"hash": "sha256-Bu5j1wrMNVMmxQULZwTdXyWi2i6F5C6m8wFDxvtjYdI="
|
||||
"rev": "3fe4f9049f99ac71d038b3cb684ebfc8e6cef15a",
|
||||
"hash": "sha256-fUcJQGkLGTgxEGwWVoZ4Hys9kOKAft7CDTTdQ8j4+Do="
|
||||
},
|
||||
"bsnes-hd": {
|
||||
"owner": "DerKoun",
|
||||
"repo": "bsnes-hd",
|
||||
"rev": "04821703aefdc909a4fd66d168433fcac06c2ba7",
|
||||
"hash": "sha256-QmNthbWb92vel5PFwJRXeEEVZHIxfvZ0ls+csodpGbU="
|
||||
"rev": "f46b6d6368ea93943a30b5d4e79e8ed51c2da5e8",
|
||||
"hash": "sha256-Y3FhGtcz7BzwUSBy1SGMuylJdZti/JB8qQnabIkG/dI="
|
||||
},
|
||||
"bsnes-mercury": {
|
||||
"owner": "libretro",
|
||||
|
|
@ -123,8 +123,8 @@
|
|||
"desmume": {
|
||||
"owner": "libretro",
|
||||
"repo": "desmume",
|
||||
"rev": "fbd368c8109f95650e1f81bca1facd6d4d8687d7",
|
||||
"hash": "sha256-7MFa5zd1jdOCqSI+VPl5nAHE7Kfm/lA0lbSPFskzqaQ="
|
||||
"rev": "cf0fcc6ea4a85b7491bdf9adc7bf09748b4be7da",
|
||||
"hash": "sha256-ne4Tu8U/WSB4vlwBQMK7Ss3UEpDxsOFltpMk2hIx23M="
|
||||
},
|
||||
"desmume2015": {
|
||||
"owner": "libretro",
|
||||
|
|
@ -147,14 +147,14 @@
|
|||
"dosbox-pure": {
|
||||
"owner": "schellingb",
|
||||
"repo": "dosbox-pure",
|
||||
"rev": "035e01e43623f83a9e71f362364fd74091379455",
|
||||
"hash": "sha256-j7Or4yTK5l+ZVC5UFeym9sLx+88PRlofoBT1tMuf31A="
|
||||
"rev": "e8396b8564ed88d87702ee40b935dec6384c0e5a",
|
||||
"hash": "sha256-rD7b1uX/Wsu2ik06IiHKbUHT05IllCoBcPMN9OJ0+X4="
|
||||
},
|
||||
"eightyone": {
|
||||
"owner": "libretro",
|
||||
"repo": "81-libretro",
|
||||
"rev": "340a51b250fb8fbf1a9e5d3ad3924044250064e0",
|
||||
"hash": "sha256-Cz3gPwbME8lDMKju3dn8hM8O2u9h9+8EUg7Nf6a7epA="
|
||||
"rev": "6d1b4d26aa9870133616fcfb5a763ca138ae25d1",
|
||||
"hash": "sha256-KCtJvYWcS3DjAZfyP4sG496X9fOHji/ZwpjiZD0OFDY="
|
||||
},
|
||||
"fbalpha2012": {
|
||||
"owner": "libretro",
|
||||
|
|
@ -165,32 +165,33 @@
|
|||
"fbneo": {
|
||||
"owner": "libretro",
|
||||
"repo": "fbneo",
|
||||
"rev": "ffcd114b8ea3f3387b66997263ea5df358675aa5",
|
||||
"hash": "sha256-a4hXRluHQY5hC5jFU2mlqUAI5GmQk6Rbl1HNRA929CI="
|
||||
"rev": "9e22c4c7ac42d5f1e5ffacdecb26acae60c663eb",
|
||||
"hash": "sha256-obzPz5lPqcQzLbB7cFGI50W1rFnF8tqZkpocETSAH0Q="
|
||||
},
|
||||
"fceumm": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-fceumm",
|
||||
"rev": "1fa798b220a6df8417dcf7da0ab117533385d9c2",
|
||||
"hash": "sha256-B1iHZ7BVaM/GBgdD2jNZIEmXcRqKC6YaO9z1ByocMtE="
|
||||
"rev": "7fad08e5522e5396a1196055fc106be9b5d5de77",
|
||||
"hash": "sha256-XHutsAc2PD8INP2u8WTmr2+rxuklXjBruH/mNl5Ro34="
|
||||
},
|
||||
"flycast": {
|
||||
"owner": "libretro",
|
||||
"owner": "flyinghead",
|
||||
"repo": "flycast",
|
||||
"rev": "4c293f306bc16a265c2d768af5d0cea138426054",
|
||||
"hash": "sha256-9IxpRBY1zifhOebLJSDMA/wiOfcZj+KOiPrgmjiFxvo="
|
||||
"rev": "39a212140a159e7e7a183a40a201863c0560a945",
|
||||
"hash": "sha256-lvagJRedkh9m48yHo7ErsIyW9W2QXs6wnEjSgtrHE74=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"fmsx": {
|
||||
"owner": "libretro",
|
||||
"repo": "fmsx-libretro",
|
||||
"rev": "1360c9ff32b390383567774d01fbe5d6dfcadaa3",
|
||||
"hash": "sha256-LLGD29HKpV34IOJ2ygjHZZT7XQqHHXccnpGNfWCuabg="
|
||||
"rev": "1806eed4376fbe2fad82fa19271ea298cfbb7795",
|
||||
"hash": "sha256-nX0H/+iEq7eBN4tm1+dT6/3BYLCpoyiE/L6waDPmUZI="
|
||||
},
|
||||
"freeintv": {
|
||||
"owner": "libretro",
|
||||
"repo": "freeintv",
|
||||
"rev": "9a65ec6e31d48ad0dae1f381c1ec61c897f970cb",
|
||||
"hash": "sha256-ZeWw/K6i04XRympqZ6sQG/yjN8cJglVcIkxpyRHx424="
|
||||
"rev": "85bf25a39a34bbc39fe36677175d87c2b597dbe7",
|
||||
"hash": "sha256-4cU/YRZZb7EWNBJX8M91Lb+bCCIlks6xX2Cf6Iq/g9g="
|
||||
},
|
||||
"fuse": {
|
||||
"owner": "libretro",
|
||||
|
|
@ -201,62 +202,62 @@
|
|||
"gambatte": {
|
||||
"owner": "libretro",
|
||||
"repo": "gambatte-libretro",
|
||||
"rev": "ea563fac40e281b29d37f6b56657abef8f1aaf0d",
|
||||
"hash": "sha256-2jVbEsGkvdH1lA2//mb2Rm3xeh4EyFUcOUXdydSisvk="
|
||||
"rev": "64561b7e1b21dfa42eecb94963c1c495ba332466",
|
||||
"hash": "sha256-BRh357MGHlglGSs48LhhRNTTyAUD9O0QmGeqLnyYap0="
|
||||
},
|
||||
"genesis-plus-gx": {
|
||||
"owner": "libretro",
|
||||
"repo": "Genesis-Plus-GX",
|
||||
"rev": "f6a9bd72a56a11c2068be2d15fa52dda3e1e8027",
|
||||
"hash": "sha256-4siJGPRMpXHfP6mBPoDJArNaISTNjPKT69cvtGldadI="
|
||||
"rev": "141257e1e2104c4e4a49dc771d9f3c06e00292ec",
|
||||
"hash": "sha256-voNDwfwBIzuq9peNJ2CtF6UBnaJCDpiWmqPgtrPZplU="
|
||||
},
|
||||
"gpsp": {
|
||||
"owner": "libretro",
|
||||
"repo": "gpsp",
|
||||
"rev": "541adc9e1c6c9328c07058659594d6300ae0fa19",
|
||||
"hash": "sha256-2iv/gMOgTZReDgVzEc3WyOdAlYgfANK08CtpZIyPxgA="
|
||||
"rev": "c0d8ffaa384f724e1a0743e18cb042c29dd48f7f",
|
||||
"hash": "sha256-KKO0bBV+5+8UcSspZHfinntp/mxukcf6/P4kIi6doUs="
|
||||
},
|
||||
"gw": {
|
||||
"owner": "libretro",
|
||||
"repo": "gw-libretro",
|
||||
"rev": "19a1cb3105ca4a82139fb4994e7995fd956f6f8d",
|
||||
"hash": "sha256-luhKXzxrXVNAHw8ArF1I78Zch7XEPwI3aqe0f6WRgD0="
|
||||
"rev": "0ecff52b11c327af52b22ea94b268c90472b6732",
|
||||
"hash": "sha256-N/nZoo+duk7XhRtNdV1paWzxYUhv8nLUcnnOs2gbZuQ="
|
||||
},
|
||||
"handy": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-handy",
|
||||
"rev": "63db085af671bad2929078c55434623b7d4632a1",
|
||||
"hash": "sha256-N6M3KSU4NPJCqoG/UMrna9/6H5PsBBMUQLrvqiIdxpE="
|
||||
"rev": "0559d3397f689ea453b986311aeac8dbd33afb0b",
|
||||
"hash": "sha256-Nsp0jiOLWjTGJRURkwx8mj7bBG8nM5fRqE93Lo9n4ac="
|
||||
},
|
||||
"hatari": {
|
||||
"owner": "libretro",
|
||||
"repo": "hatari",
|
||||
"rev": "1ebf0a0488580ef95c0b28f02223b31813c867c5",
|
||||
"hash": "sha256-i6dr+fFWPatRCIY+ajIZ1p3ERPV5ktv0nxHKxbGE5ao="
|
||||
"rev": "d0903a9447323e647ed9756238ba1550cac92940",
|
||||
"hash": "sha256-kSdK7rkORgTkMg8kL56pNb+wU+m2413shEt7UQ9SCjM="
|
||||
},
|
||||
"mame": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame",
|
||||
"rev": "f7761a9902d59030882c58d4482446196e748c50",
|
||||
"hash": "sha256-g37WAMt9iBbAYq4DfeTlHWmdW5/Vl7g90v6vCLmMQ3g="
|
||||
"rev": "3d612fb19eb95c0ae322c3cab343857b14a65a9c",
|
||||
"hash": "sha256-ibd8HEKQJo7hrhzqYDu6LzMmIFncXCafod9VXBx9OU0="
|
||||
},
|
||||
"mame2000": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame2000-libretro",
|
||||
"rev": "0208517404e841fce0c094f1a2776a0e1c6c101d",
|
||||
"hash": "sha256-WEJd7wSzY32sqMpMrjCD0hrOyAQq1WMBaGiY/2QQ4BQ="
|
||||
"rev": "720b8ad4cbd76abd57b9aeced9ba541dc8476f7f",
|
||||
"hash": "sha256-3HnDsZQRjp7PqUdYTAEGsroP1paoTAcTBb1fd7/LBJA="
|
||||
},
|
||||
"mame2003": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame2003-libretro",
|
||||
"rev": "b1cc49cf1d8bbef88b890e1c2a315a39d009171b",
|
||||
"hash": "sha256-bc4uER92gHf20JjR/Qcetvlu89ZmldJ1DiQphJZt/EA="
|
||||
"rev": "105ca02fb85e92b9dd5d6ee43f7152d1199eb149",
|
||||
"hash": "sha256-zYv3OIgapglsyjWs69IhSJGVQ7CkviKJjKnVom5f9/c="
|
||||
},
|
||||
"mame2003-plus": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame2003-plus-libretro",
|
||||
"rev": "0b9309d9d86aea2457df74709e997bea37899475",
|
||||
"hash": "sha256-US0nkEH4EeKRejuN8UoDeLt5dhafuo7PEVx0FnpeUG0="
|
||||
"rev": "a1ff7485de011926ab21309ad1766f9cad3af58e",
|
||||
"hash": "sha256-Amp+Fcl2dWS1qDMaa/QL0X5loXRYmnByUjUzliQmLvY="
|
||||
},
|
||||
"mame2010": {
|
||||
"owner": "libretro",
|
||||
|
|
@ -279,14 +280,14 @@
|
|||
"melonds": {
|
||||
"owner": "libretro",
|
||||
"repo": "melonds",
|
||||
"rev": "0e1f06da626cbe67215c3f06f6bdf510dd4e4649",
|
||||
"hash": "sha256-ax9Vu8+1pNAHWPXrx5QA0n5EsmaJ2T7KJ5Otz8DSZwM="
|
||||
"rev": "c6488c88cb4c7583dbcd61609e0eef441572fae8",
|
||||
"hash": "sha256-kU0xPM6WBqK6UpMNMotHc3jRFTodahPJRrfbcjdCJTI="
|
||||
},
|
||||
"mesen": {
|
||||
"owner": "libretro",
|
||||
"repo": "mesen",
|
||||
"rev": "caa4e6f14373c40bd2805c600d1b476e7616444a",
|
||||
"hash": "sha256-cnPNBWXbnCpjgW/wJIboiRBzv3zrHWxpNM1kg09ShLU="
|
||||
"rev": "d25d60fc190f3f7603a1113ef1e11d9da65b7583",
|
||||
"hash": "sha256-C/05mkPHJ8Bsj+uZOqY6rhMc0qx33kSxAT5SNDUPRUU="
|
||||
},
|
||||
"mesen-s": {
|
||||
"owner": "libretro",
|
||||
|
|
@ -303,14 +304,14 @@
|
|||
"mgba": {
|
||||
"owner": "libretro",
|
||||
"repo": "mgba",
|
||||
"rev": "a69c3434afe8b26cb8f9463077794edfa7d5efad",
|
||||
"hash": "sha256-rmitsZzRWJ0VYzcNz/UtIK8OscQ4lkyuAwgfXOvSTzg="
|
||||
"rev": "314bf7b676f5b820f396209eb0c7d6fbe8103486",
|
||||
"hash": "sha256-Rk+glDgSa1J1IIe5NrJElX9zr59+LQynfDXuHWyZcEM="
|
||||
},
|
||||
"mupen64plus": {
|
||||
"owner": "libretro",
|
||||
"repo": "mupen64plus-libretro-nx",
|
||||
"rev": "5a63aadedc29655254d8fc7b4da3a325472e198b",
|
||||
"hash": "sha256-QNa8WGJFShO4vc4idUntCUaLik4xQXBA+X7z5sjZ2NE="
|
||||
"rev": "26fd1edd640ff3db49dd5ebb7e54f0de6600fc45",
|
||||
"hash": "sha256-JueRR2PheAz8sPG8OIpjp1Xih6z2Xp8f7WD+2MuBPo4="
|
||||
},
|
||||
"neocd": {
|
||||
"owner": "libretro",
|
||||
|
|
@ -321,8 +322,8 @@
|
|||
"nestopia": {
|
||||
"owner": "libretro",
|
||||
"repo": "nestopia",
|
||||
"rev": "16b14865caf1effca030630e2fc73d2d4271fc53",
|
||||
"hash": "sha256-dU9X8sK/qDA/Qj0x1GicmSAzQyRqVmLiTcfCPe8+BjM="
|
||||
"rev": "3dcbec4682e079312d6943e1357487645ec608c7",
|
||||
"hash": "sha256-+jWedFwuFwZzdYEyKR77AhEBoW6ecY7HAIYEKt9PRg8="
|
||||
},
|
||||
"np2kai": {
|
||||
"owner": "AZO234",
|
||||
|
|
@ -346,71 +347,71 @@
|
|||
"opera": {
|
||||
"owner": "libretro",
|
||||
"repo": "opera-libretro",
|
||||
"rev": "8a49bb8877611037438aeb857cb182f41ee0e3a1",
|
||||
"hash": "sha256-oH+sQi4D+xkqiJbq7fgGdHjgvyLt8UjlgXIo7K3wXZM="
|
||||
"rev": "100ae1e7decefe1f17d98cfcb9f2af4ff8452691",
|
||||
"hash": "sha256-GOabGs5JP4hg4y5xEATZMEWuqQxFxdc6ZMnO4oLC2yk="
|
||||
},
|
||||
"parallel-n64": {
|
||||
"owner": "libretro",
|
||||
"repo": "parallel-n64",
|
||||
"rev": "a03fdcba6b2e9993f050b50112f597ce2f44fa2c",
|
||||
"hash": "sha256-aJG+s+1OkHQHPvVzlJWU/VziQWj1itKkRwqcEBK+lgA="
|
||||
"rev": "49eadb4da85f7e3bd59b60f61e8fd5dbfb9f07d5",
|
||||
"hash": "sha256-S8gsPOgxdq0SwoYFua4ouT7XjT45d/mwCYmI3VVahdI="
|
||||
},
|
||||
"pcsx2": {
|
||||
"owner": "libretro",
|
||||
"repo": "pcsx2",
|
||||
"repo": "lrps2",
|
||||
"rev": "f3c8743d6a42fe429f703b476fecfdb5655a98a9",
|
||||
"hash": "sha256-0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4="
|
||||
},
|
||||
"pcsx_rearmed": {
|
||||
"owner": "libretro",
|
||||
"repo": "pcsx_rearmed",
|
||||
"rev": "4373e29de72c917dbcd04ec2a5fb685e69d9def3",
|
||||
"hash": "sha256-727//NqBNEo6RHNQr1RY5cxMrEvfuJczCo+cUJZVv7U="
|
||||
"rev": "ead6fd751369f6fe50cb5092ab5530fbf1d66b67",
|
||||
"hash": "sha256-JzvcM8T/xMP7MDn/58TDNrHN8bjU63/PBtj7JJYYiVo="
|
||||
},
|
||||
"picodrive": {
|
||||
"owner": "libretro",
|
||||
"repo": "picodrive",
|
||||
"rev": "7ab066aab84f15388a53433ea273420bcf917e00",
|
||||
"hash": "sha256-NK9ASiiIkGZmi2YfCqEzZallVfS7nprLRrBk4dlGyAI=",
|
||||
"rev": "570319349588288f64c676123244acdb0be33881",
|
||||
"hash": "sha256-KG5A5NBWi5jKpJOSdSQxjn+wm2F198AINKIU+figoqs=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"play": {
|
||||
"owner": "jpd002",
|
||||
"repo": "Play-",
|
||||
"rev": "b33834af08a4954f06be215eee80a72e7a378e91",
|
||||
"hash": "sha256-IxZk+kSdrkDAabbzdFM8QUrjaJUc1DHjSfAtDuwDJkw=",
|
||||
"rev": "f50566ffdf6a2f1d0cedfb900f1ee24b9c80fd8e",
|
||||
"hash": "sha256-G45UMzNh5I7beO8sBtwc80HPioB907UEPtfB1NSS4OY=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"ppsspp": {
|
||||
"owner": "hrydgard",
|
||||
"repo": "ppsspp",
|
||||
"rev": "7df51c3d060a780b7383c5c1380e346ad9304bb4",
|
||||
"hash": "sha256-GK3W0/yWaID3s0W0v6TcgJ0ZU984YspWMS6+XLyThjM=",
|
||||
"rev": "638192b0245e73a602c5f0d60e80dc7b78ff0793",
|
||||
"hash": "sha256-Ls9k563j8yEasu6dBs2cmWR+9twBKTolqTLkr3Nt7Uk=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"prboom": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-prboom",
|
||||
"rev": "d9c3975669b4aab5a1397e0174838bcbbc3c1582",
|
||||
"hash": "sha256-klSJ7QIpNjlfyjhfeEQZ3j8Gnp4agd0qKVp0vr+KHVA="
|
||||
"rev": "6ec854969fd9dec33bb2cab350f05675d1158969",
|
||||
"hash": "sha256-y0qZwYNwcO4ofWDZ7UXN9ZVMPFxjCnLDDZKBMdZLxEY="
|
||||
},
|
||||
"prosystem": {
|
||||
"owner": "libretro",
|
||||
"repo": "prosystem-libretro",
|
||||
"rev": "763ad22c7de51c8f06d6be0d49c554ce6a94a29b",
|
||||
"hash": "sha256-rE/hxP8hl9lLTNx/WympFDByjZs46ekyxLKRV4V8D9E="
|
||||
"rev": "4202ac5bdb2ce1a21f84efc0e26d75bb5aa7e248",
|
||||
"hash": "sha256-BR0DTWcB5g0rEoNSxBx+OxBmLELjdR2fgsmdPU7cK68="
|
||||
},
|
||||
"puae": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-uae",
|
||||
"rev": "ae58c0f226b654d643b9f2dce58f64657f57cb76",
|
||||
"hash": "sha256-6oMTwCYGdVhh+R853gOQRzZfa7slDwe6aGVCvdm6NDU="
|
||||
"rev": "7bdd798ef14dccafe283588cbf8eb303832a1858",
|
||||
"hash": "sha256-ML3hRYujyh7WPm9Sx6RzQAxaTqlhneVLDi6qcNJ+hi8="
|
||||
},
|
||||
"quicknes": {
|
||||
"owner": "libretro",
|
||||
"repo": "QuickNES_Core",
|
||||
"rev": "75d501a87ec2074e8d2f7256fb0359513c263c29",
|
||||
"hash": "sha256-yAHVTgOt8SGyPXihp4YNKKAvxl9VBBAvHyzLW86zSCw="
|
||||
"rev": "058d66516ed3f1260b69e5b71cd454eb7e9234a3",
|
||||
"hash": "sha256-eWnbx4NsxanvSls8lguKBijYZ4+uF97d9es9Yn+3PKs="
|
||||
},
|
||||
"same_cdi": {
|
||||
"owner": "libretro",
|
||||
|
|
@ -425,10 +426,10 @@
|
|||
"hash": "sha256-hQWIuNwCykkJR+6naNarR50kUvIFNny+bbZHR6/GA/4="
|
||||
},
|
||||
"scummvm": {
|
||||
"owner": "libretro",
|
||||
"owner": "libretro-mirrors",
|
||||
"repo": "scummvm",
|
||||
"rev": "ab2e5d59cd25dfa5943d45c2567e8330d67fad8b",
|
||||
"hash": "sha256-9IaQR0prbCT70iWA99NMgGAKPobifdWBX17p4zL0fEM="
|
||||
"rev": "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3",
|
||||
"hash": "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew="
|
||||
},
|
||||
"smsplus-gx": {
|
||||
"owner": "libretro",
|
||||
|
|
@ -439,8 +440,8 @@
|
|||
"snes9x": {
|
||||
"owner": "snes9xgit",
|
||||
"repo": "snes9x",
|
||||
"rev": "cc0a87711a7a208cabefc9fd1dbb90e31fe51684",
|
||||
"hash": "sha256-1m6QvYl5Z0WM1XeXCYLvQaXH8A15P3x8ZzwdFeVPeWo="
|
||||
"rev": "0e03a36847c2ab14d84963b0263e653aa4087ff4",
|
||||
"hash": "sha256-wRkBT80HBE1JXqNSvm0LhhUSjHe1DP3uMy3fKW71uZA="
|
||||
},
|
||||
"snes9x2002": {
|
||||
"owner": "libretro",
|
||||
|
|
@ -463,8 +464,8 @@
|
|||
"stella": {
|
||||
"owner": "stella-emu",
|
||||
"repo": "stella",
|
||||
"rev": "93ea39d6155f08c21707a85a0b04b33008a7ab15",
|
||||
"hash": "sha256-9dCBaLxb1CBbngBd3tJ0x5lT+dnzzhK2DO4Gk/S6WW4="
|
||||
"rev": "85f23044437a5da35d68f96045d363d0e339f872",
|
||||
"hash": "sha256-b/3cq+CdQ6MLFzzF/cFTbL0XCSqZFc0Rj9e+bNiN3WY="
|
||||
},
|
||||
"stella2014": {
|
||||
"owner": "libretro",
|
||||
|
|
@ -475,8 +476,8 @@
|
|||
"swanstation": {
|
||||
"owner": "libretro",
|
||||
"repo": "swanstation",
|
||||
"rev": "e24f21196cdcd50321475c4366b51af245a6bbe6",
|
||||
"hash": "sha256-DjAB0Z0yY9IGESeNNkkbdoAO5ItJ/8cZ5ycRofHG978="
|
||||
"rev": "376744746a6880b5eec7ac48b5c006c9ae8c6770",
|
||||
"hash": "sha256-5mKNypA0x/FkDZvWhuEr/J5WP7saR7cKo0DQ2DZ36ZE="
|
||||
},
|
||||
"tgbdual": {
|
||||
"owner": "libretro",
|
||||
|
|
@ -500,26 +501,26 @@
|
|||
"vba-m": {
|
||||
"owner": "libretro",
|
||||
"repo": "vbam-libretro",
|
||||
"rev": "640ce45325694d1dc574e90c95c55bc464368d7e",
|
||||
"hash": "sha256-aiIeleZHt95Y/kigLEbRaCb3KM0ezMB7yzO16FbuBNM="
|
||||
"rev": "a2378f05f600a5a9cf450c60a87976b80d6a895a",
|
||||
"hash": "sha256-vWm28cSEGex5h7JkJjzNPqEGtQWHK0dpK2gVDlQ3NbM="
|
||||
},
|
||||
"vba-next": {
|
||||
"owner": "libretro",
|
||||
"repo": "vba-next",
|
||||
"rev": "0c310082a6345790124e9348861b300bcccbeced",
|
||||
"hash": "sha256-RQx/WR83EtPcQkx0ft4Y0/5LaKIOST3L/fh4qoPxz78="
|
||||
"rev": "ee92625d2f1666496be4f5662508a2430e846b00",
|
||||
"hash": "sha256-r3FKBD4GUUkobMJ33VceseyTyqxm/Wsa5Er6XcfGL2Q="
|
||||
},
|
||||
"vecx": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-vecx",
|
||||
"rev": "8e932c1d585ae9e467186dea9e73ce38fe1490f7",
|
||||
"hash": "sha256-2Vo30yiP6SfUt3XHCfQTKTKEtCywdRIoUe6d0Or21WM="
|
||||
"rev": "a401c268e425dc8ae6a301e7fdb9a9e96f39b8ea",
|
||||
"hash": "sha256-24/bcQ5mgLl7zKvpnnSYr5SoLG02al6dP27KoOtnua4="
|
||||
},
|
||||
"virtualjaguar": {
|
||||
"owner": "libretro",
|
||||
"repo": "virtualjaguar-libretro",
|
||||
"rev": "2cc06899b839639397b8b30384a191424b6f529d",
|
||||
"hash": "sha256-7FiU5/n1hVePttkz7aVfXXx88+zX06/5SJk3EaRYvhQ="
|
||||
"rev": "8126e5c504ac7217a638f38e4cd9190822c8abdd",
|
||||
"hash": "sha256-U/qdKApE0OU3jc6ekfgEZ7VCaIqCc2h+Y+IHe7PIRY0="
|
||||
},
|
||||
"yabause": {
|
||||
"owner": "libretro",
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "libretro-core-info";
|
||||
version = "1.15.0";
|
||||
version = "unstable-2023-07-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "libretro-core-info";
|
||||
hash = "sha256-WIgcHuZgAOrlg+WyOS4TyzWziNzjyQB2sPDM9fR6kwA=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VdFsrLiJ+Wu1OKvwX9fMI96CxTareOTK8x6OfksBuYs=";
|
||||
rev = "dacae85b406131feb12395a415fdf57fc4745201";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "retroarch-assets";
|
||||
version = "unstable-2022-10-24";
|
||||
version = "unstable-2023-09-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "retroarch-assets";
|
||||
rev = "4ec80faf1b5439d1654f407805bb66141b880826";
|
||||
hash = "sha256-j1npVKEknq7hpFr/XfST2GNHI5KnEYjZAM0dw4tMsYk=";
|
||||
rev = "7b735ef18bcc6508b1c9a626eb237779ff787179";
|
||||
hash = "sha256-S9wWag9fNpCTMKY8yQaF7jFuX1P5XLy/Z4vjtVDK7lg=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "retroarch-joypad-autoconfig";
|
||||
version = "1.15.0";
|
||||
version = "unstable-2023-08-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "retroarch-joypad-autoconfig";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/F2Y08uDA/pIIeLiLfOQfGVjX2pkuOqPourlx2RbZ28=";
|
||||
rev = "5666e46bb89caf4e9af358fdb97a2b384cb62f36";
|
||||
hash = "sha256-5Po0v0E/dc+nVHnHlJRZzv66B/DKYarwqTkS9+/ktC4=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ CORES = {
|
|||
"fbalpha2012": {"repo": "fbalpha2012"},
|
||||
"fbneo": {"repo": "fbneo"},
|
||||
"fceumm": {"repo": "libretro-fceumm"},
|
||||
"flycast": {"repo": "flycast"},
|
||||
"flycast": {"repo": "flycast", "owner": "flyinghead", "fetch_submodules": True},
|
||||
"fmsx": {"repo": "fmsx-libretro"},
|
||||
"freeintv": {"repo": "freeintv"},
|
||||
"fuse": {"repo": "fuse-libretro"},
|
||||
|
|
@ -71,7 +71,10 @@ CORES = {
|
|||
"o2em": {"repo": "libretro-o2em"},
|
||||
"opera": {"repo": "opera-libretro"},
|
||||
"parallel-n64": {"repo": "parallel-n64"},
|
||||
"pcsx2": {"repo": "pcsx2"},
|
||||
# libretro/lrps2 is a hard-fork of pcsx2 with simplified code to target
|
||||
# only libretro, while libretro/pcsx2 is supposedly closer to upstream.
|
||||
# TODO: switch to libretro/pcsx2 since this is more up-to-date
|
||||
"pcsx2": {"repo": "lrps2"},
|
||||
"pcsx_rearmed": {"repo": "pcsx_rearmed"},
|
||||
"picodrive": {"repo": "picodrive", "fetch_submodules": True},
|
||||
"play": {"repo": "Play-", "owner": "jpd002", "fetch_submodules": True},
|
||||
|
|
@ -82,7 +85,12 @@ CORES = {
|
|||
"quicknes": {"repo": "QuickNES_Core"},
|
||||
"sameboy": {"repo": "sameboy"},
|
||||
"same_cdi": {"repo": "same_cdi"},
|
||||
"scummvm": {"repo": "scummvm"},
|
||||
# This is the old source code before they upstreamed the source code,
|
||||
# so now the libretro related code lives in the scummvm/scummvm repository.
|
||||
# However this broke the old way we were doing builds, so for now point
|
||||
# to a mirror with the old source code until this issue is fixed.
|
||||
# TODO: switch to libretro/scummvm since this is more up-to-date
|
||||
"scummvm": {"repo": "scummvm", "owner": "libretro-mirrors"},
|
||||
"smsplus-gx": {"repo": "smsplus-gx"},
|
||||
"snes9x": {"repo": "snes9x", "owner": "snes9xgit"},
|
||||
"snes9x2002": {"repo": "snes9x2002"},
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osmium-tool";
|
||||
version = "1.15.0";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmcode";
|
||||
repo = "osmium-tool";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xV/1LFby0L/o648XEQQ9gS9/eHssWhMIG7R1E8bfIDU=";
|
||||
sha256 = "sha256-DObqbzdPA4RlrlcZhqA0MQtWBE+D6GRD1pd9U4DARIk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
475
pkgs/applications/misc/owmods-cli/Cargo.lock
generated
475
pkgs/applications/misc/owmods-cli/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "owmods-cli";
|
||||
version = "0.10.0";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ow-mods";
|
||||
repo = "ow-mod-man";
|
||||
rev = "cli_v${version}";
|
||||
hash = "sha256-kumYLlp2LRqTQz23N9lriJJf7x2pPXbqqUvkiAhyMDY=";
|
||||
hash = "sha256-kjHGuVYX9pKy2I+m347cEdPj6MjCDz8vz2Cnce9+z90=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
|
|||
38
pkgs/applications/misc/owmods-cli/update.sh
Executable file
38
pkgs/applications/misc/owmods-cli/update.sh
Executable file
|
|
@ -0,0 +1,38 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl gnused nix-prefetch nix-prefetch-github jq wget
|
||||
|
||||
#modified version of https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/servers/readarr/update.sh
|
||||
set -e
|
||||
|
||||
dirname="$(dirname "$0")"
|
||||
|
||||
updateHash()
|
||||
{
|
||||
version=$1
|
||||
|
||||
url="https://github.com/ow-mods/ow-mod-man/releases/cli_v$version"
|
||||
prefetchJson=$(nix-prefetch-github ow-mods ow-mod-man --rev cli_v$version)
|
||||
sha256="$(echo $prefetchJson | jq -r ".sha256")"
|
||||
echo "sha256=${sha256}"
|
||||
|
||||
sed -i "s/hash = \"[a-zA-Z0-9\/+-=]*\";/hash = \"sha256-$sha256\";/g" "$dirname/default.nix"
|
||||
|
||||
#downloads and replaces .lock file
|
||||
wget https://raw.githubusercontent.com/ow-mods/ow-mod-man/cli_v$version/Cargo.lock -q -O $dirname/Cargo.lock
|
||||
|
||||
}
|
||||
|
||||
updateVersion()
|
||||
{
|
||||
sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix"
|
||||
}
|
||||
|
||||
latestTag=$(curl https://api.github.com/repos/ow-mods/ow-mod-man/releases | jq -r ".[0].tag_name")
|
||||
latestVersion="$(expr $latestTag : 'gui_v\(.*\)')"
|
||||
echo "latest version: ${latestVersion}"
|
||||
|
||||
echo "updating..."
|
||||
updateVersion $latestVersion
|
||||
|
||||
updateHash $latestVersion
|
||||
echo "updated cli"
|
||||
|
|
@ -4,6 +4,7 @@
|
|||
, copyDesktopItems
|
||||
, writeText
|
||||
, makeDesktopItem
|
||||
, wrapGAppsHook
|
||||
, xvfb-run
|
||||
, qt6
|
||||
}:
|
||||
|
|
@ -61,7 +62,8 @@ python3Packages.buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ];
|
||||
dontWrapGApps = true;
|
||||
makeWrapperArgs = [ "\${qtWrapperArgs[@]}" "\${gappsWrapperArgs[@]}"];
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -69,6 +71,7 @@ python3Packages.buildPythonApplication rec {
|
|||
python3Packages.poetry-core
|
||||
copyDesktopItems
|
||||
qt6.wrapQtAppsHook
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -52,7 +52,8 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name="${baseName}-${channel}-${version}";
|
||||
pname="${baseName}-${channel}";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.microsoft.com/repos/edge/pool/main/m/${baseName}-${channel}/${baseName}-${channel}_${version}-${revision}_amd64.deb";
|
||||
|
|
@ -181,12 +182,14 @@ stdenv.mkDerivation rec {
|
|||
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}"
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.py;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.microsoft.com/en-us/edge";
|
||||
description = "The web browser from Microsoft";
|
||||
license = licenses.unfree;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ zanculmarktum kuwii ];
|
||||
maintainers = with maintainers; [ zanculmarktum kuwii rhysmdnz ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,9 @@ from urllib import request
|
|||
from collections import OrderedDict
|
||||
from debian.deb822 import Packages
|
||||
from debian.debian_support import Version
|
||||
from os.path import abspath, dirname
|
||||
|
||||
PIN_PATH = dirname(abspath(__file__)) + '/default.nix'
|
||||
|
||||
def packages():
|
||||
packages_url = 'https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages'
|
||||
|
|
@ -60,7 +63,7 @@ def write_expression():
|
|||
latest = latest_packages(packages())
|
||||
channel_strs = nix_expressions(latest)
|
||||
nix_expr = '{\n' + textwrap.indent('\n'.join(channel_strs), ' ') + '\n}\n'
|
||||
with open('default.nix', 'w') as f:
|
||||
with open(PIN_PATH, 'w') as f:
|
||||
f.write(nix_expr)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -45,14 +45,14 @@ let
|
|||
|
||||
pname = "slack";
|
||||
|
||||
x86_64-darwin-version = "4.34.115";
|
||||
x86_64-darwin-sha256 = "1l2swrjxm47xyb8skwzy7clmr3qdckx9xs1x204jbrz1xk7yd7l5";
|
||||
x86_64-darwin-version = "4.34.119";
|
||||
x86_64-darwin-sha256 = "17ssha6a8iyvan3k7mbg2cdyy1y7gmlwrh4dlkgcc63bqqxsavy1";
|
||||
|
||||
x86_64-linux-version = "4.34.115";
|
||||
x86_64-linux-sha256 = "0gyyjyvrvn13i5308fg34z6b3yzr7vmmh1148a9xh79ngq2pqv47";
|
||||
x86_64-linux-version = "4.34.120";
|
||||
x86_64-linux-sha256 = "0wldnj6hyzqxyc9p365gb46pyqq0im1ayl12mrc8xkrikx9phb7y";
|
||||
|
||||
aarch64-darwin-version = "4.34.115";
|
||||
aarch64-darwin-sha256 = "09qcz57yxjfw8sdqbvmkd25hs4c7frmpf6v94hr4d1szy1rfv11k";
|
||||
aarch64-darwin-version = "4.34.119";
|
||||
aarch64-darwin-sha256 = "0xa39l4ynjmzq6811vprxxz8znwckmxcss9aa7v68cja8vj033vj";
|
||||
|
||||
version = {
|
||||
x86_64-darwin = x86_64-darwin-version;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ in customEmacsPackages.withPackages (epkgs: [ epkgs.evil epkgs.magit ])
|
|||
|
||||
*/
|
||||
|
||||
{ lib, lndir, makeWrapper, runCommand, gcc }:
|
||||
{ lib, lndir, makeBinaryWrapper, runCommand, gcc }:
|
||||
self:
|
||||
let
|
||||
inherit (self) emacs;
|
||||
|
|
@ -50,7 +50,7 @@ runCommand
|
|||
(lib.appendToName "with-packages" emacs).name
|
||||
{
|
||||
inherit emacs explicitRequires;
|
||||
nativeBuildInputs = [ emacs lndir makeWrapper ];
|
||||
nativeBuildInputs = [ emacs lndir makeBinaryWrapper ];
|
||||
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
|
|
@ -201,6 +201,11 @@ runCommand
|
|||
--subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \
|
||||
--subst-var prog
|
||||
chmod +x $out/bin/$progname
|
||||
# Create a “NOP” binary wrapper for the pure sake of it becoming a
|
||||
# non-shebang, actual binary. See the makeBinaryWrapper docs for rationale
|
||||
# (summary: it allows you to use emacs as a shebang itself on Darwin,
|
||||
# e.g. #!$ {emacs}/bin/emacs --script)
|
||||
wrapProgramBinary $out/bin/$progname
|
||||
done
|
||||
|
||||
# Wrap MacOS app
|
||||
|
|
@ -220,6 +225,7 @@ runCommand
|
|||
--subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \
|
||||
--subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs"
|
||||
chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs
|
||||
wrapProgramBinary $out/Applications/Emacs.app/Contents/MacOS/Emacs
|
||||
fi
|
||||
|
||||
mkdir -p $out/share
|
||||
|
|
|
|||
|
|
@ -10,6 +10,10 @@
|
|||
, withOneDNN ? false, oneDNN
|
||||
, withOpenblas ? true, openblas
|
||||
, withRuy ? true
|
||||
|
||||
# passthru tests
|
||||
, libretranslate
|
||||
, wyoming-faster-whisper
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -17,13 +21,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ctranslate2";
|
||||
version = "3.18.0";
|
||||
version = "3.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenNMT";
|
||||
repo = "CTranslate2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ipCUiCyWubKTUB0jDOsRN+DSg3S84hbj8Xum/2NsrKc=";
|
||||
hash = "sha256-PdCjzLyc5O1rrTtPz8JD08unY7uMNS5fcD3ZLHJDeYg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -57,6 +61,13 @@ stdenv.mkDerivation rec {
|
|||
darwin.apple_sdk.frameworks.CoreVideo
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
inherit
|
||||
libretranslate
|
||||
wyoming-faster-whisper
|
||||
;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast inference engine for Transformer models";
|
||||
homepage = "https://github.com/OpenNMT/CTranslate2";
|
||||
|
|
|
|||
|
|
@ -11,8 +11,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = lib.optional stdenv.isDarwin darwin.cctools;
|
||||
|
||||
configureFlags = lib.optionals disablePosixThreads
|
||||
[ "--disable-posix-threads" ];
|
||||
configureFlags = lib.optionals disablePosixThreads [ "--disable-posix-threads" ]
|
||||
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
# AC_FUNC_MALLOC is broken on cross builds.
|
||||
"ac_cv_func_malloc_0_nonnull=yes"
|
||||
"ac_cv_func_realloc_0_nonnull=yes"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Replacement for the old crypt() package and crypt(1) command, with extensions";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libosmium";
|
||||
version = "2.19.0";
|
||||
version = "2.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmcode";
|
||||
repo = "libosmium";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-R7kOhQFfGYuHNkIZV4BTE+WKjHnCJwKeIWjCJNrvyTQ=";
|
||||
sha256 = "sha256-QM6Nj2cmrhUysR2enFKhTWXdBXNqM21/Yqdn/zXEfYE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -2,21 +2,25 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "psqlodbc";
|
||||
version = "09.01.0200";
|
||||
version = "13.02.0000";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.postgresql.org/pub/odbc/versions/src/${pname}-${version}.tar.gz";
|
||||
sha256 = "0b4w1ahfpp34jpscfk2kv9050lh3xl9pvcysqvaigkcd0vsk1hl9";
|
||||
url = "https://ftp.postgresql.org/pub/odbc/versions/src/psqlodbc-${version}.tar.gz";
|
||||
hash = "sha256-s5t+XEH9ZHXFUREvpyS/V8SkRhdexBiKkOKETMFhJYU=";
|
||||
};
|
||||
|
||||
buildInputs = [ libiodbc postgresql openssl ];
|
||||
|
||||
configureFlags = [ "--with-iodbc=${libiodbc}" ];
|
||||
configureFlags = [
|
||||
"--with-iodbc=${libiodbc}"
|
||||
"--with-libpq=${lib.getDev postgresql}/bin/pg_config"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://odbc.postgresql.org/";
|
||||
description = "ODBC driver for PostgreSQL";
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,19 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake, pkg-config, gtest
|
||||
, withZlibCompat ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zlib-ng";
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zlib-ng";
|
||||
repo = "zlib-ng";
|
||||
rev = version;
|
||||
sha256 = "sha256-6IEH9IQsBiNwfAZAemmP0/p6CTOzxEKyekciuH6pLhw=";
|
||||
hash = "sha256-DC4KPPaMuqML0HEhWJmWjyox4WEbExPDfNnpnWzoaHc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/zlib-ng/zlib-ng/pull/1519.patch";
|
||||
hash = "sha256-itobS8kJ2Hj3RfjslVkvEVdQ4t5eeIrsA9muRZt03pE=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -1,35 +1,24 @@
|
|||
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
|
||||
{ lib, php, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "box";
|
||||
version = "4.3.8";
|
||||
in
|
||||
mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/box-project/box/releases/download/${version}/box.phar";
|
||||
sha256 = "sha256-g9Y92yTsyXU4NWuQwyB3PRrKJxLRSBO9J77jumXPOxg=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "box-project";
|
||||
repo = "box";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-v1J84nqaX36DrLLH5kld+8NIymqtt5/5nJWJNCBVFRE=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
vendorHash = "sha256-LWggAUBMKljxa7HNdJMqOD/sx3IWCOQSqbYEnGntjN0=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -D $src $out/libexec/box/box.phar
|
||||
makeWrapper ${php}/bin/php $out/bin/box \
|
||||
--add-flags "-d phar.readonly=0 $out/libexec/box/box.phar"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/box-project/box/releases/tag/${version}";
|
||||
meta = {
|
||||
changelog = "https://github.com/box-project/box/releases/tag/${finalAttrs.version}";
|
||||
description = "An application for building and managing Phars";
|
||||
license = licenses.mit;
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://github.com/box-project/box";
|
||||
maintainers = with maintainers; [ ] ++ teams.php.members;
|
||||
maintainers = lib.teams.php.members;
|
||||
mainProgram = "box";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,60 +1,50 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, makeBinaryWrapper
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, php
|
||||
, nix-update-script
|
||||
, testers
|
||||
, castor
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "castor";
|
||||
version = "0.8.0";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jolicode/castor/releases/download/v${finalAttrs.version}/castor.linux-amd64.phar";
|
||||
hash = "sha256-0lnn4mS1/DgUoRoMFvCjwQ0j9CX9XWlskbtX9roFCfc=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jolicode";
|
||||
repo = "castor";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-rJz4BY74BI8gyT4ZlABc4PA+SCsd8guM0m2MTej350g=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
vendorHash = "sha256-Jh4mNNYEM9sy0Dp+dZtD+xrMICjAuspe9D9BDXcfUPM=";
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper installShellFiles ];
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
install -D $src $out/libexec/castor/castor.phar
|
||||
makeWrapper ${php}/bin/php $out/bin/castor \
|
||||
--add-flags "$out/libexec/castor/castor.phar"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# castor requires to be initialized to generate completion files
|
||||
# install shell completions
|
||||
postInstall = ''
|
||||
echo "yes" | ${php}/bin/php $src
|
||||
echo "yes" | ${php}/bin/php $out/share/php/castor/bin/castor
|
||||
installShellCompletion --cmd castor \
|
||||
--bash <($out/bin/castor completion bash) \
|
||||
--fish <($out/bin/castor completion fish) \
|
||||
--zsh <($out/bin/castor completion zsh)
|
||||
--bash <(${php}/bin/php $out/share/php/castor/bin/castor completion bash) \
|
||||
--fish <(${php}/bin/php $out/share/php/castor/bin/castor completion fish) \
|
||||
--zsh <(${php}/bin/php $out/share/php/castor/bin/castor completion zsh)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
inherit (finalAttrs) version;
|
||||
package = castor;
|
||||
command = "castor --version";
|
||||
package = php.packages.castor;
|
||||
version = "v${finalAttrs.version}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
changelog = "https://github.com/jolicode/castor/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
description = "DX oriented task runner and command launcher built with PHP";
|
||||
homepage = "https://github.com/jolicode/castor";
|
||||
changelog = "https://github.com/jolicode/castor/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gaelreyrol ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ gaelreyrol ];
|
||||
mainProgram = "castor";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "autofaiss";
|
||||
version = "2.15.5";
|
||||
version = "2.15.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "criteo";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-IcAlvFlCERnw1UQWPRpSWpscOuPx0wd1MXOfoXZhvCU=";
|
||||
hash = "sha256-vB906xbpEjNNzc8Dc8i3ENgl9lCPOgB9vs7QVRS7UcM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
# tests
|
||||
, pytestCheckHook
|
||||
, tensorflow
|
||||
, tensorflow-bin
|
||||
, torch
|
||||
, transformers
|
||||
, wurlitzer
|
||||
|
|
@ -49,7 +49,7 @@ buildPythonPackage rec {
|
|||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
tensorflow
|
||||
tensorflow-bin
|
||||
torch
|
||||
transformers
|
||||
wurlitzer
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, python
|
||||
, libosmium
|
||||
, protozero
|
||||
, boost
|
||||
|
|
@ -32,6 +32,14 @@ buildPythonPackage rec {
|
|||
hash = "sha256-+YJQGPQm2FGOPhNzlXX2GM+ad4QdipJhwViOKGHtqBk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Compatibility with recent pybind versions
|
||||
(fetchpatch {
|
||||
url = "https://github.com/osmcode/pyosmium/commit/31b1363389b423f49e14140ce868ecac83e92f69.patch";
|
||||
hash = "sha256-maBuwzyZ4/wVLLGVr4gZFZDKvJckUXiBluxZRPGETag=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fx";
|
||||
version = "30.0.3";
|
||||
version = "30.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antonmedv";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-bTXxzGf7mXQ0VfAQhaKAOYtOVAEVC71R3eRJej0zfJs=";
|
||||
hash = "sha256-SqD3NPaeJB/bxb47PO39mwJGnSg2WBQ3RyA6PRn7z10=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FyV3oaI4MKl0LKJf23XIeUmvFsa1DvQw2pq5Heza3Ws=";
|
||||
vendorHash = "sha256-6wVcdzTYnB0Bd/YLPcbryKxCXu5genzQQ96znbn2ahw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal JSON viewer";
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "act";
|
||||
version = "0.2.50";
|
||||
version = "0.2.51";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nektos";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-NVzONabM1EUsA+PUyJ7hBOZmqs5RYfE0teNO6BMBu7M=";
|
||||
hash = "sha256-p41bb7g66FI9RTznmpJuP/Sk46VL2bkloYNcDxf/vjc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+MQofGGja4JUSWCctY0CWQ2aYpVrXj4/knqd/TW0PtI=";
|
||||
vendorHash = "sha256-/etFC27kw4qvfzyut13ISLYKWl2b5k8cTgKn+ygAT8I=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
1904
pkgs/development/tools/mongosh/package-lock.json
generated
1904
pkgs/development/tools/mongosh/package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"version": "1.10.6",
|
||||
"integrity": "sha512-rReUz89EF5eERhPZo29nYpKAux1u5iK3ug74wtsr7kE9SOJs5XGWS2gh8LKSMK9uieeDKRYX8+nFIa4bl1Ls2Q==",
|
||||
"filename": "mongosh-1.10.6.tgz",
|
||||
"deps": "sha256-j1l6PVPkp5Ju0uBB6dKfQP8fbwttWpPR3VPviu4a/Zg="
|
||||
"version": "2.0.1",
|
||||
"integrity": "sha512-Xvlzso5vJAYfbO/N/6CCmcEnpHAv/PF4D6RqAvr8BFoPjCmYFwKDjOHEHjaPtrJYY1gWEDN5gaukZfqcAxiDFg==",
|
||||
"filename": "mongosh-2.0.1.tgz",
|
||||
"deps": "sha256-wICy0PoMQ6ypiZL/4Yf2l9KNXC9LNNdzy8EmhwK3kws="
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,6 +36,11 @@
|
|||
, libxkbcommon
|
||||
, libdrm
|
||||
, mesa
|
||||
# It's unknown which version of openssl that postman expects but it seems that
|
||||
# OpenSSL 3+ seems to work fine (cf.
|
||||
# https://github.com/NixOS/nixpkgs/issues/254325). If postman breaks apparently
|
||||
# around OpenSSL stuff then try changing this dependency version.
|
||||
, openssl
|
||||
, xorg
|
||||
, pname
|
||||
, version
|
||||
|
|
@ -149,5 +154,6 @@ stdenv.mkDerivation rec {
|
|||
patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:$ORIGIN" $file
|
||||
done
|
||||
popd
|
||||
wrapProgram $out/bin/postman --set PATH ${lib.makeBinPath [ openssl ]}
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
version = "1.0.0.4080";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pubdl.clonehero.net/clonehero-v${finalAttrs.version}-final/clonehero-linux.tar.xz";
|
||||
url = "https://github.com/clonehero-game/releases/releases/download/V${finalAttrs.version}/CloneHero-linux.tar.xz";
|
||||
hash = "sha256-YWLV+wgQ9RfKRSSWh/x0PMjB6tFA4YpHb9WtYOOgZZI=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hop-cli";
|
||||
version = "0.2.53";
|
||||
version = "0.2.54";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hopinc";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DyM8OEgO2OtD/PD/I6Ys2Yg0gQMB21OnjFdDkWKw+Io=";
|
||||
hash = "sha256-0BIPN4+XYZgUdxygpKpWZq6VkWWNCFD8v5egXOYfC64=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-R6Dbje6OEndJxyWJ8cR/QcfdIBw88Vfbve+EYGozWNc=";
|
||||
cargoHash = "sha256-KE7AAyArRang/EZrpgv+vlNZaAP/Y2pCltiPMgZ5vFA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
303
pkgs/tools/graphics/gifski/Cargo.lock
generated
303
pkgs/tools/graphics/gifski/Cargo.lock
generated
|
|
@ -20,31 +20,39 @@ dependencies = [
|
|||
]
|
||||
|
||||
[[package]]
|
||||
name = "anstream"
|
||||
version = "0.3.1"
|
||||
name = "aho-corasick"
|
||||
version = "1.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6342bd4f5a1205d7f41e94a41a901f5647c938cdfa96036338e8533c9d6c2450"
|
||||
checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anstream"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
|
||||
dependencies = [
|
||||
"anstyle",
|
||||
"anstyle-parse",
|
||||
"anstyle-query",
|
||||
"anstyle-wincon",
|
||||
"colorchoice",
|
||||
"is-terminal",
|
||||
"utf8parse",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anstyle"
|
||||
version = "1.0.0"
|
||||
version = "1.0.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
|
||||
checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46"
|
||||
|
||||
[[package]]
|
||||
name = "anstyle-parse"
|
||||
version = "0.2.0"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
|
||||
checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
|
||||
dependencies = [
|
||||
"utf8parse",
|
||||
]
|
||||
|
|
@ -60,9 +68,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "anstyle-wincon"
|
||||
version = "1.0.1"
|
||||
version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
|
||||
checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
|
||||
dependencies = [
|
||||
"anstyle",
|
||||
"windows-sys",
|
||||
|
|
@ -70,9 +78,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "arrayvec"
|
||||
version = "0.7.2"
|
||||
version = "0.7.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
|
||||
checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
|
|
@ -108,15 +116,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
|||
|
||||
[[package]]
|
||||
name = "bytemuck"
|
||||
version = "1.13.1"
|
||||
version = "1.14.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
|
||||
checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.0.79"
|
||||
version = "1.0.83"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
|
||||
checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cexpr"
|
||||
|
|
@ -146,38 +157,30 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.2.5"
|
||||
version = "4.4.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8a1f23fa97e1d1641371b51f35535cb26959b8e27ab50d167a8b996b5bada819"
|
||||
checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.2.5"
|
||||
version = "4.4.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab"
|
||||
checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
"bitflags",
|
||||
"clap_lex",
|
||||
"once_cell",
|
||||
"strsim",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_lex"
|
||||
version = "0.4.1"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
|
||||
|
||||
[[package]]
|
||||
name = "color_quant"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
|
||||
checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
|
||||
|
||||
[[package]]
|
||||
name = "colorchoice"
|
||||
|
|
@ -217,9 +220,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "crossbeam-epoch"
|
||||
version = "0.9.14"
|
||||
version = "0.9.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
|
||||
checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"cfg-if",
|
||||
|
|
@ -230,9 +233,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "crossbeam-utils"
|
||||
version = "0.8.15"
|
||||
version = "0.8.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
|
||||
checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
|
@ -245,36 +248,15 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
|
|||
|
||||
[[package]]
|
||||
name = "either"
|
||||
version = "1.8.1"
|
||||
version = "1.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
|
||||
dependencies = [
|
||||
"errno-dragonfly",
|
||||
"libc",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "errno-dragonfly"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
]
|
||||
checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
|
||||
|
||||
[[package]]
|
||||
name = "fallible_collections"
|
||||
version = "0.4.7"
|
||||
version = "0.4.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9acf77205554f3cfeca94a4b910e159ad9824e8c2d164de02b3f12495cc1074d"
|
||||
checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd"
|
||||
dependencies = [
|
||||
"hashbrown",
|
||||
]
|
||||
|
|
@ -305,9 +287,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "flate2"
|
||||
version = "1.0.26"
|
||||
version = "1.0.27"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
|
||||
checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
|
||||
dependencies = [
|
||||
"crc32fast",
|
||||
"miniz_oxide",
|
||||
|
|
@ -319,15 +301,14 @@ version = "0.12.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
|
||||
dependencies = [
|
||||
"color_quant",
|
||||
"weezl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gif-dispose"
|
||||
version = "4.0.0"
|
||||
version = "4.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a40dfdf5be59e0cbbf77cb7c6a91a18ee6d398b70fc54ad900e2bcba1860cb50"
|
||||
checksum = "347afae04a03ca25a3a76d130abb63e7e6e7367b895470fdc3d996aec916c3d7"
|
||||
dependencies = [
|
||||
"gif",
|
||||
"imgref",
|
||||
|
|
@ -346,7 +327,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gifski"
|
||||
version = "1.11.0"
|
||||
version = "1.12.2"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"crossbeam-channel",
|
||||
|
|
@ -387,24 +368,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.2.6"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
|
||||
checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
|
||||
|
||||
[[package]]
|
||||
name = "imagequant"
|
||||
version = "4.2.0"
|
||||
version = "4.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fc3c62f251799ae51bbd7a94fc00a83fcb796d8dd14876280e3063e8341138dc"
|
||||
checksum = "9427afad20d287aad11e5981db8beb68d0a20e2e4cbd8280e05f95e05b31668a"
|
||||
dependencies = [
|
||||
"arrayvec",
|
||||
"num_cpus",
|
||||
|
|
@ -420,29 +392,6 @@ version = "1.9.4"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b2cf49df1085dcfb171460e4592597b84abe50d900fb83efb6e41b20fefd6c2c"
|
||||
|
||||
[[package]]
|
||||
name = "io-lifetimes"
|
||||
version = "1.0.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
|
||||
dependencies = [
|
||||
"hermit-abi 0.3.1",
|
||||
"libc",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "is-terminal"
|
||||
version = "0.4.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
|
||||
dependencies = [
|
||||
"hermit-abi 0.3.1",
|
||||
"io-lifetimes",
|
||||
"rustix",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.4.0"
|
||||
|
|
@ -457,9 +406,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
|
|||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.142"
|
||||
version = "0.2.148"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
|
||||
checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
|
||||
|
||||
[[package]]
|
||||
name = "libloading"
|
||||
|
|
@ -471,17 +420,11 @@ dependencies = [
|
|||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.3.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c"
|
||||
|
||||
[[package]]
|
||||
name = "lodepng"
|
||||
version = "3.7.2"
|
||||
version = "3.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f0ad39f75bbaa4b10bb6f2316543632a8046a5bcf9c785488d79720b21f044f8"
|
||||
checksum = "73c81862c9e16a943631de5160969379758f13fb3c788110db4ab49430b4feab"
|
||||
dependencies = [
|
||||
"crc32fast",
|
||||
"fallible_collections",
|
||||
|
|
@ -492,24 +435,24 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "loop9"
|
||||
version = "0.1.3"
|
||||
version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a703804431e5927454bcaf2b2a162595e95db931130c2728c18d050090f69940"
|
||||
checksum = "81a837f917de41d61ab531ba255d1913208d02325cab0d6a66a706e0dbaa699d"
|
||||
dependencies = [
|
||||
"imgref",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.5.0"
|
||||
version = "2.6.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
||||
checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
version = "0.8.0"
|
||||
version = "0.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
|
||||
checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
|
@ -547,28 +490,28 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.15"
|
||||
version = "0.2.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
|
||||
checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num_cpus"
|
||||
version = "1.15.0"
|
||||
version = "1.16.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
|
||||
checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
|
||||
dependencies = [
|
||||
"hermit-abi 0.2.6",
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.17.1"
|
||||
version = "1.18.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
|
||||
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
|
||||
|
||||
[[package]]
|
||||
name = "pbr"
|
||||
|
|
@ -589,15 +532,15 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
|
|||
|
||||
[[package]]
|
||||
name = "pkg-config"
|
||||
version = "0.3.26"
|
||||
version = "0.3.27"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
|
||||
checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.56"
|
||||
version = "1.0.67"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
|
||||
checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
|
@ -610,18 +553,18 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
|
|||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.26"
|
||||
version = "1.0.33"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
|
||||
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rayon"
|
||||
version = "1.7.0"
|
||||
version = "1.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
|
||||
checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
|
||||
dependencies = [
|
||||
"either",
|
||||
"rayon-core",
|
||||
|
|
@ -629,38 +572,50 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "rayon-core"
|
||||
version = "1.11.0"
|
||||
version = "1.12.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
|
||||
checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
|
||||
dependencies = [
|
||||
"crossbeam-channel",
|
||||
"crossbeam-deque",
|
||||
"crossbeam-utils",
|
||||
"num_cpus",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.8.1"
|
||||
version = "1.9.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
|
||||
checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-automata",
|
||||
"regex-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex-automata"
|
||||
version = "0.3.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.7.1"
|
||||
version = "0.7.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
|
||||
checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
|
||||
|
||||
[[package]]
|
||||
name = "resize"
|
||||
version = "0.7.4"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87e7bdfff05e26408cf8f82fe896ce3d7624f0c0b06c84b2f1009c50452ead41"
|
||||
checksum = "8ce43c0220eff4793a20c120ff89ee01499ba3c882957021dcdc12f5e4ca97c8"
|
||||
dependencies = [
|
||||
"fallible_collections",
|
||||
"rayon",
|
||||
"rgb",
|
||||
]
|
||||
|
||||
|
|
@ -679,31 +634,17 @@ version = "1.1.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.37.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"errno",
|
||||
"io-lifetimes",
|
||||
"libc",
|
||||
"linux-raw-sys",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
version = "1.1.0"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
||||
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
|
||||
|
||||
[[package]]
|
||||
name = "shlex"
|
||||
version = "1.1.0"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
|
||||
checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
|
|
@ -734,9 +675,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.8"
|
||||
version = "1.0.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
|
||||
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
|
||||
|
||||
[[package]]
|
||||
name = "utf8parse"
|
||||
|
|
@ -764,9 +705,9 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
|
|||
|
||||
[[package]]
|
||||
name = "wild"
|
||||
version = "2.1.0"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "05b116685a6be0c52f5a103334cbff26db643826c7b3735fc0a3ba9871310a74"
|
||||
checksum = "10d01931a94d5a115a53f95292f51d316856b68a035618eb831bbba593a30b67"
|
||||
dependencies = [
|
||||
"glob",
|
||||
]
|
||||
|
|
@ -804,9 +745,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.48.0"
|
||||
version = "0.48.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
|
||||
checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
|
|
@ -819,42 +760,42 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.48.0"
|
||||
version = "0.48.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
|
||||
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.48.0"
|
||||
version = "0.48.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
|
||||
checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.48.0"
|
||||
version = "0.48.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
|
||||
checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.48.0"
|
||||
version = "0.48.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
|
||||
checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.48.0"
|
||||
version = "0.48.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
|
||||
checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.48.0"
|
||||
version = "0.48.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
|
||||
checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.48.0"
|
||||
version = "0.48.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
|
||||
checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
|
||||
|
|
|
|||
|
|
@ -1,20 +1,19 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, ffmpeg
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gifski";
|
||||
version = "1.11.0";
|
||||
version = "1.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageOptim";
|
||||
repo = "gifski";
|
||||
rev = version;
|
||||
hash = "sha256-sPsq/hntNqOdPJcoob1jrDUrLLiBEnfRoDANyFUjOuM=";
|
||||
hash = "sha256-KiedPhlPcFkTiZZfOBlTKqtzU2ND1HXdsfhq+F1MtdU=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
@ -45,11 +44,6 @@ rustPlatform.buildRustPackage rec {
|
|||
#
|
||||
checkType = "debug";
|
||||
|
||||
# error: linker `/usr/bin/x86_64-linux-gnu-gcc` not found
|
||||
postPatch = ''
|
||||
rm .cargo/config.toml;
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GIF encoder based on libimagequant (pngquant)";
|
||||
homepage = "https://gif.ski/";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "calamares-nixos-extensions";
|
||||
version = "0.3.12";
|
||||
version = "0.3.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "calamares-nixos-extensions";
|
||||
rev = version;
|
||||
sha256 = "qNRlUz4+xxNNzyswKHOjbkaLx0qi8fiAly94fMOlryE=";
|
||||
sha256 = "YCtm7OzPdhtV7/fQijJfZvZyX7oEk92F34CK2lnRHnI=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mloader";
|
||||
version = "1.1.9";
|
||||
version = "1.1.11";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "81e4dc7117999d502e3345f8e32df8b16cca226b8b508976dde2de81a4cc2b19";
|
||||
sha256 = "sha256-SFFjv4RWh1JZtxkDmaun35gKi5xty1ifIItwaz3lot4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
, boost
|
||||
, cimg
|
||||
, postgresql
|
||||
, python3
|
||||
, withLuaJIT ? false
|
||||
, lua
|
||||
, luajit
|
||||
|
|
@ -21,13 +22,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "osm2pgsql";
|
||||
version = "1.9.0";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openstreetmap";
|
||||
owner = "osm2pgsql-dev";
|
||||
repo = "osm2pgsql";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ZIjT4uKJas5RgxcMSoR8hWCM9pdu3hSzWwfIn1ZvU8Y=";
|
||||
hash = "sha256-RzJpaOEpgKm2IN6CK2Z67CUG0WU2ELvCpGhdQehjGKU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -49,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
potrace
|
||||
proj
|
||||
protozero
|
||||
(python3.withPackages (p: with p; [ psycopg2 pyosmium ]))
|
||||
zlib
|
||||
] ++ lib.optional withLuaJIT luajit
|
||||
++ lib.optional (!withLuaJIT) lua;
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "websocat";
|
||||
version = "1.11.0";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FomP5ykHc5oAA7zF7r+PXHf30KaTmYTmVm6Mwf/tPdQ=";
|
||||
sha256 = "sha256-wyVys+1g2klgwFHlKHI0ztd2qSlWyNXJoFvFCd1PGjo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-YVI1+WsDMoznRTjnzwlPTdJMRPsQFYtzssoU0sQwQfA=";
|
||||
cargoHash = "sha256-fakXOPQOEaKEt+AeOYlhumULJyjRHHXFKz4o9AD7WE0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
buildInputs = [ openssl ]
|
||||
|
|
|
|||
|
|
@ -47,8 +47,7 @@ let
|
|||
inherit lib pkgs;
|
||||
};
|
||||
|
||||
emacsWithPackages = { pkgs, lib }: import ../build-support/emacs/wrapper.nix {
|
||||
inherit (pkgs) makeWrapper runCommand gcc;
|
||||
emacsWithPackages = { pkgs, lib }: pkgs.callPackage ../build-support/emacs/wrapper.nix {
|
||||
inherit (pkgs.xorg) lndir;
|
||||
inherit lib;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue