Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
2d77c6ead6
27 changed files with 138 additions and 142 deletions
|
|
@ -1,46 +1,57 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, copper
|
||||
, ruby
|
||||
, python3
|
||||
, qtbase
|
||||
, gtk3
|
||||
, pkg-config
|
||||
, withQt ? false
|
||||
, withGtk ? false, wrapQtAppsHook ? null
|
||||
, withQt ? false, qtbase ? null, wrapQtAppsHook ? null
|
||||
, withGtk2 ? false, gtk2
|
||||
, withGtk3 ? false, gtk3
|
||||
, mkDerivation ? stdenv.mkDerivation
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
let onlyOneEnabled = xs: 1 == builtins.length (builtins.filter lib.id xs);
|
||||
in assert onlyOneEnabled [ withQt withGtk2 withGtk3 ];
|
||||
mkDerivation rec {
|
||||
pname = "code-browser";
|
||||
version = "7.1.20";
|
||||
version = "8.0";
|
||||
src = fetchurl {
|
||||
url = "https://tibleiz.net/download/code-browser-${version}-src.tar.gz";
|
||||
sha256 = "1svi0v3h42h2lrb8c7pjvqc8019v1p20ibsnl48pfhl8d96mmdnz";
|
||||
sha256 = "sha256-beCp4lx4MI1+hVgWp2h3piE/zu51zfwQdB5g7ImgmwY=";
|
||||
};
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace "LFLAGS=-no-pie" "LFLAGS=-no-pie -L."
|
||||
substituteInPlace libs/copper-ui/Makefile --replace "moc -o" "${qtbase.dev}/bin/moc -o"
|
||||
patchShebangs .
|
||||
'';
|
||||
''
|
||||
+ lib.optionalString withQt ''
|
||||
substituteInPlace libs/copper-ui/Makefile --replace "moc -o" "${qtbase.dev}/bin/moc -o"
|
||||
substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: qt"
|
||||
''
|
||||
+ lib.optionalString withGtk2 ''
|
||||
substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: gtk2"
|
||||
''
|
||||
+ lib.optionalString withGtk3 ''
|
||||
substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: gtk"
|
||||
''
|
||||
;
|
||||
nativeBuildInputs = [ copper
|
||||
python3
|
||||
ruby
|
||||
qtbase
|
||||
gtk3
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals withQt [ wrapQtAppsHook ];
|
||||
++ lib.optionals withGtk2 [ gtk2 ]
|
||||
++ lib.optionals withGtk3 [ gtk3 ]
|
||||
++ lib.optionals withQt [ qtbase wrapQtAppsHook ];
|
||||
buildInputs = lib.optionals withQt [ qtbase ]
|
||||
++ lib.optionals withGtk [ gtk3 ];
|
||||
++ lib.optionals withGtk2 [ gtk2 ]
|
||||
++ lib.optionals withGtk3 [ gtk3 ];
|
||||
makeFlags = [
|
||||
"prefix=$(out)"
|
||||
"COPPER=${copper}/bin/copper-elf64"
|
||||
"with-local-libs"
|
||||
"QINC=${qtbase.dev}/include"
|
||||
]
|
||||
++ lib.optionals withQt [ "UI=qt" ]
|
||||
++ lib.optionals withGtk [ "UI=gtk" ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
++ lib.optionals withQt [ "QINC=${qtbase.dev}/include"
|
||||
"UI=qt"
|
||||
]
|
||||
++ lib.optionals withGtk2 [ "UI=gtk2" ]
|
||||
++ lib.optionals withGtk3 [ "UI=gtk" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code";
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "96.0.4664.93",
|
||||
"sha256": "14rlm91pzpdll6x2r1sxdswiv19h1ykxcq0csi9k9g0a9s71yyvw",
|
||||
"sha256bin64": "15233njj6ln7q3c112ssfh9s4m3shhp920zw8648z9dr7k8512qb",
|
||||
"version": "96.0.4664.110",
|
||||
"sha256": "1s3ilq0ik36qgqp7l88gfd1yx97zscn8yr2kprsrjfp9q8lrva9n",
|
||||
"sha256bin64": "17cyj1jx47fz6y26f196xhlngrw5gnjgcvapvgkgswlwd7y67jcb",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-09-24",
|
||||
|
|
@ -55,8 +55,8 @@
|
|||
"sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "96.0.4664.93-1",
|
||||
"sha256": "0r8cwriaxbmzy9sxa6mx71h8n1a0x7pdx3kmqc1sg97b2qwmg15r"
|
||||
"rev": "96.0.4664.110-1",
|
||||
"sha256": "098mfcd1lr2hhlic0i1l5gxsq71axvqnn4gayr4r9j6nbj9byf4h"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.25.1"; # Please backport all updates to the stable channel.
|
||||
version = "5.26.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
|
|
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "1b634sy2bac5i548g1z1fd5qqy8jr6abl5kbhq50d1kmwnqy1a5l";
|
||||
sha256 = "1l61m976x2pha3bvlcjppkgwn6b8ws1nqfa9zk7xwq4c5qz9mpj2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@ assert !(pulseaudioSupport && portaudioSupport);
|
|||
|
||||
gnuradio3_8Minimal.pkgs.mkDerivation rec {
|
||||
pname = "gqrx";
|
||||
version = "2.14.6";
|
||||
version = "2.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "csete";
|
||||
owner = "gqrx-sdr";
|
||||
repo = "gqrx";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DMmQXcGPudAVOwuc+LVrcIzfwMMQVBZPbM6Bt1w56D8=";
|
||||
sha256 = "sha256-m3YV5Hbu5+3eS+LOy+x6HjpdiJo1iObbeEKuQXXmAak=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,16 +4,15 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "copper";
|
||||
version = "4.4";
|
||||
version = "4.6";
|
||||
src = fetchurl {
|
||||
url = "https://tibleiz.net/download/copper-${version}-src.tar.gz";
|
||||
sha256 = "1nf0bw143rjhd019yms3k6k531rahl8anidwh6bif0gm7cngfwfw";
|
||||
sha256 = "sha256-tyxAMJp4H50eBz8gjt2O3zj5fq6nOIXKX47wql8aUUg=";
|
||||
};
|
||||
buildInputs = [
|
||||
libffi
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace "-s scripts/" "scripts/"
|
||||
patchShebangs .
|
||||
'';
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -212,6 +212,7 @@ let
|
|||
;
|
||||
|
||||
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
|
||||
SKIP_PERF_SENSITIVE = 1;
|
||||
|
||||
configureFlags =
|
||||
# Disable all extensions
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spglib";
|
||||
version = "1.16.2";
|
||||
version = "1.16.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atztogo";
|
||||
repo = "spglib";
|
||||
rev = "v${version}";
|
||||
sha256 = "1sbrk26xyvlhqxxv9cq2ycxwbiafgmh7lf221377zpqq8q3iavd7";
|
||||
sha256 = "sha256-sM6+RBAVc2aJYlWatdD4nYZkFnaTFVjBzd/VDSSA+kk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "mdx";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz";
|
||||
sha256 = "1hk8ffh3d9hiibrj6691khnbmjnfs9psmiawnrbgi0577bw030wx";
|
||||
sha256 = "sha256:1q6169gmynnbrvlnzlmx7lpd6hwv6vwxg5j8ibc88wgs5s0r0fb0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cppo ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchurl, buildDunePackage
|
||||
{ lib, fetchurl, buildDunePackage, ocaml
|
||||
, dune-configurator
|
||||
, bos, ctypes, fmt, logs, rresult
|
||||
, mdx, alcotest, crowbar, junit_alcotest, ezjsonm
|
||||
|
|
@ -17,7 +17,9 @@ buildDunePackage rec {
|
|||
|
||||
buildInputs = [ dune-configurator ];
|
||||
propagatedBuildInputs = [ bos ctypes rresult ];
|
||||
checkInputs = [ fmt logs mdx alcotest crowbar junit_alcotest ezjsonm ];
|
||||
# crowbar is not available for OCaml < 4.08
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
checkInputs = [ fmt logs mdx.bin alcotest crowbar junit_alcotest ezjsonm ];
|
||||
|
||||
meta = {
|
||||
description = "Parse and generate YAML 1.1 files";
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, packaging
|
||||
# Check Inputs
|
||||
, pytestCheckHook
|
||||
, pytest-subtests
|
||||
, numpy
|
||||
, matplotlib
|
||||
, uncertainties
|
||||
|
|
@ -14,12 +15,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pint";
|
||||
version = "0.14";
|
||||
version = "0.18";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "Pint";
|
||||
sha256 = "0wkzb7g20wzpqr3xaqpq96dlfv6irw202icsz81ys8npp7mm194s";
|
||||
sha256 = "sha256-jEvOiEwmkFH+t6vGnb/RhAPAx2SryD2hMuinIi+LqAE=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -32,6 +33,7 @@ buildPythonPackage rec {
|
|||
# Test suite explicitly requires pytest
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-subtests
|
||||
numpy
|
||||
matplotlib
|
||||
uncertainties
|
||||
|
|
@ -42,7 +44,7 @@ buildPythonPackage rec {
|
|||
description = "Physical quantities module";
|
||||
license = licenses.bsd3;
|
||||
homepage = "https://github.com/hgrecco/pint/";
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc doronbehar ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -96,9 +96,9 @@ rec {
|
|||
# https://docs.gradle.org/current/userguide/compatibility.html
|
||||
|
||||
gradle_7 = gen {
|
||||
version = "7.3.1";
|
||||
version = "7.3.2";
|
||||
nativeVersion = "0.22-milestone-21";
|
||||
sha256 = "0rkb9pdmvq0zidv8lv4im2j7gs949lg35r79l1hwf4pwi2k3ryws";
|
||||
sha256 = "14jk1mhk59flzml55alwi9r5picmf8657q1nhd5mygrnmj79zf13";
|
||||
defaultJava = jdk17;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-c-sharp",
|
||||
"rev": "69921685a7688361626600543a2beaf82b67a64d",
|
||||
"date": "2021-11-03T12:36:17+00:00",
|
||||
"path": "/nix/store/f4rd6avwf2flqr9yv0dvy9288qrgn2bs-tree-sitter-c-sharp",
|
||||
"sha256": "18yzr0yvkbp5wf2slcfn04fc23jn0ray72ica0jyv92jkp5pxc03",
|
||||
"rev": "3104df21065af0f3d51e05a96cd0e2ff16a6f982",
|
||||
"date": "2021-12-09T21:13:54+00:00",
|
||||
"path": "/nix/store/1xgrz7rm6mc6j2svaidj4x0zyda0ahz4-tree-sitter-c-sharp",
|
||||
"sha256": "14g8x5q4xc87s2wpycws6r6ci083j7pk1jdw6sr8qp96zyzs17pp",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-go",
|
||||
"rev": "7f6bfd0161b2fe97f03564edad3287ebea0494a3",
|
||||
"date": "2021-10-04T13:10:27-04:00",
|
||||
"path": "/nix/store/64xzxzc8z4fmwhfb7wbdkcxlk7r3bia2-tree-sitter-go",
|
||||
"sha256": "12naks95vzb0sf219i39myvfpkycr2dh3lv7i7i6kwddmlhqsjnl",
|
||||
"rev": "1203c11e422c73350e672445c5c32b8c0f79266d",
|
||||
"date": "2021-12-03T14:22:11-08:00",
|
||||
"path": "/nix/store/5h584m7qgvlh0s5k10503zj3idggandz-tree-sitter-go",
|
||||
"sha256": "03i63mh5g21y424pf9whl42p7shqp9xlrx90xpyrd12dlc9zhh2j",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/cstrahan/tree-sitter-nix",
|
||||
"rev": "83ee5993560bf15854c69b77d92e34456f8fb655",
|
||||
"date": "2021-07-21T20:36:40-05:00",
|
||||
"path": "/nix/store/n5pq9gba570874akpwpvs052d7vyalhh-tree-sitter-nix",
|
||||
"sha256": "03jhvyrsxq49smk9p2apjj839wmzjmrzy045wcxawz1g7xssp9pr",
|
||||
"rev": "6d6aaa50793b8265b6a8b6628577a0083d3b923d",
|
||||
"date": "2021-11-29T00:27:21-06:00",
|
||||
"path": "/nix/store/6cjadxvqbrh205lsqnk2rnzq3badxdxv-tree-sitter-nix",
|
||||
"sha256": "0cbk6dqppasrvnm87pwfgm718z6b0xmy9m7zj8ysil0h8bklz1w9",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/nvim-neorg/tree-sitter-norg",
|
||||
"rev": "995d7e0be4dc2a9655d2285405c0ef3fededf63c",
|
||||
"date": "2021-11-05T21:28:42+01:00",
|
||||
"path": "/nix/store/1l5dq21x6sln1gvixf20gx3pkadjad4d-tree-sitter-norg",
|
||||
"sha256": "181y8p91hl5j7mrff0pmnx91d9vr24nvklgx12qvc0297vdp8c5v",
|
||||
"rev": "665736e400cfd52ae92ead244ca9f5d44db98151",
|
||||
"date": "2021-12-14T15:04:57+01:00",
|
||||
"path": "/nix/store/crbl24rj54f8c9pjq8igadz3wqcw6qrw-tree-sitter-norg",
|
||||
"sha256": "0hxar07a7n3ghqagr0qjxbz4sgzcpyxwgd4dbj1vvy4xnk07i0br",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-php",
|
||||
"rev": "435fa00006c0d1515c37fbb4dd6a9de284af75ab",
|
||||
"date": "2021-10-17T09:05:36+02:00",
|
||||
"path": "/nix/store/0vgi25jrbc6fks97sxkya80dvwa0gzbk-tree-sitter-php",
|
||||
"sha256": "05k4h58gi616gv41r0qqdb1x4rs8y94vghn2r10yczisgzq4vbad",
|
||||
"rev": "57f855461aeeca73bd4218754fb26b5ac143f98f",
|
||||
"date": "2021-11-19T17:22:11+01:00",
|
||||
"path": "/nix/store/lxl3r0lykb9b3r0sdqb3sqixlnaf6015-tree-sitter-php",
|
||||
"sha256": "1v7xzc8w8nilmgnx6whdvq03dbi1z8j57aarwwzx9xbb86z2qhvc",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-ruby",
|
||||
"rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd",
|
||||
"date": "2021-03-03T16:54:30-08:00",
|
||||
"path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby",
|
||||
"sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v",
|
||||
"rev": "888e2e563ed3b43c417f17e57f7e29c39ce9aeea",
|
||||
"date": "2021-12-03T16:33:06+01:00",
|
||||
"path": "/nix/store/6g101r5pwy6iqicch9srlhwfz9xdrvzd-tree-sitter-ruby",
|
||||
"sha256": "0xfcqafslxlpkw7agw4a179w3c6k6ivi3fzlf32pqfd5bjrlx9d7",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/tree-sitter/tree-sitter-rust",
|
||||
"rev": "cc7bdd3e6d14677e8aa77da64f6a3f57b6f8b00a",
|
||||
"date": "2021-08-17T11:21:11-07:00",
|
||||
"path": "/nix/store/aw8bi91hz7a26swc5qrfqwn2lrdmiymr-tree-sitter-rust",
|
||||
"sha256": "15qz4rwz1fkpcy78g0aspfgk9pgykvzv5sxmhgm37nfpgyi7vlg1",
|
||||
"rev": "d045b04b66d51c0ba8671e7ce1ee23a9f286b7d7",
|
||||
"date": "2021-12-12T10:08:54-08:00",
|
||||
"path": "/nix/store/2h6vkl05jxqgp4738a0dxccmg40yhqvj-tree-sitter-rust",
|
||||
"sha256": "0ckyaw1ll3yazyg18wd40kc09h6f0zmwqmahsm07bwgfyc2nvf3h",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"url": "https://github.com/maxxnino/tree-sitter-zig",
|
||||
"rev": "63e8a11f1858c7351a299223b231c8134ed61612",
|
||||
"date": "2021-10-13T22:25:30+09:00",
|
||||
"path": "/nix/store/2dy3wrmjss5mnmdv6xf50cjj3k9bfpp0-tree-sitter-zig",
|
||||
"sha256": "1izvw3dv5ydklqlh8n4fslyzqdal9n8kark0g4xslcrnji3q71wg",
|
||||
"rev": "cf93353d5682c3e9d8112d448ff24d4de7b2304e",
|
||||
"date": "2021-11-25T20:46:40+09:00",
|
||||
"path": "/nix/store/jwrs3fdgdqymjkrni6mlz1j0f0ai6h9y-tree-sitter-zig",
|
||||
"sha256": "04ja9w28zprw575s4734d02ibi498whh3z7cxm3m1fdydhjsdlrj",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "starsector";
|
||||
version = "0.95a-RC15";
|
||||
version = "0.95.1a-RC5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://s3.amazonaws.com/fractalsoftworks/starsector/starsector_linux-${version}.zip";
|
||||
sha256 = "sha256-/5ij/079aOad7otXSFFcmVmiYQnMX/0RXGOr1j0rkGY=";
|
||||
sha256 = "sha256-V8/WQPvPIrF3Tg7JVO+GfeYqWhkWWrnHSVcFXGQqDAA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ in rec {
|
|||
};
|
||||
|
||||
unifi6 = generic {
|
||||
version = "6.5.54";
|
||||
sha256 = "sha256-M2gYqKZi0czFgfWx0tTW43b+aUVqS6Mg+misRB9/Fes=";
|
||||
version = "6.5.55";
|
||||
sha256 = "sha256-NUGRO+f6JzWvYPwiitZsgp+LQwnGSncnost03mgNVxA=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,35 @@
|
|||
{ lib, stdenv, fetchurl, flac, fuse, lame, libid3tag, pkg-config }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, flac
|
||||
, fuse
|
||||
, lame
|
||||
, libid3tag
|
||||
, libvorbis
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, pandoc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mp3fs";
|
||||
version = "0.91";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/khenriks/mp3fs/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "14ngiqg24p3a0s6hp33zjl4i46d8qn4v9id36psycq3n3csmwyx4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "khenriks";
|
||||
repo = "mp3fs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dF+DfkNKvYOucS6KjYR1MMGxayM+1HVS8mbmaavmgKM=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-statfs-operation.patch ];
|
||||
postPatch = ''
|
||||
substituteInPlace src/mp3fs.cc \
|
||||
--replace "#include <fuse_darwin.h>" "" \
|
||||
--replace "osxfuse_version()" "fuse_version()"
|
||||
'';
|
||||
|
||||
buildInputs = [ flac fuse lame libid3tag ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ flac fuse lame libid3tag libvorbis ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config pandoc ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
@ -20,13 +37,14 @@ stdenv.mkDerivation rec {
|
|||
description = "FUSE file system that transparently transcodes to MP3";
|
||||
longDescription = ''
|
||||
A read-only FUSE filesystem which transcodes between audio formats
|
||||
(currently only FLAC to MP3) on the fly when files are opened and read.
|
||||
It can let you use a FLAC collection with software and/or hardware
|
||||
which only understands the MP3 format, or transcode files through
|
||||
simple drag-and-drop in a file browser.
|
||||
(currently FLAC and Ogg Vorbis to MP3) on the fly when opened and read.
|
||||
This can let you use a FLAC or Ogg Vorbis collection with software
|
||||
and/or hardware which only understands the MP3 format, or transcode
|
||||
files through simple drag-and-drop in a file browser.
|
||||
'';
|
||||
homepage = "https://khenriks.github.io/mp3fs/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ Luflosi ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
From fea072084ff9d7c4d2c688059a2462bb0e59a2ec Mon Sep 17 00:00:00 2001
|
||||
From: K Henriksson <kthenriksson@gmail.com>
|
||||
Date: Wed, 27 Aug 2014 21:55:18 -0700
|
||||
Subject: [PATCH] Fix statfs operation
|
||||
|
||||
The statfs implementation does not properly translate names back to the
|
||||
original, since the major encoding rewrite. This corrects that, and
|
||||
should fix issue #27.
|
||||
---
|
||||
src/fuseops.c | 15 +++++++++++++--
|
||||
1 file changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/fuseops.c b/src/fuseops.c
|
||||
index e7b4e7e..c333cbd 100644
|
||||
--- a/src/fuseops.c
|
||||
+++ b/src/fuseops.c
|
||||
@@ -337,9 +337,20 @@ static int mp3fs_statfs(const char *path, struct statvfs *stbuf) {
|
||||
if (!origpath) {
|
||||
goto translate_fail;
|
||||
}
|
||||
-
|
||||
+
|
||||
+ /* pass-through for regular files */
|
||||
+ if (statvfs(origpath, stbuf) == 0) {
|
||||
+ goto passthrough;
|
||||
+ } else {
|
||||
+ /* Not really an error. */
|
||||
+ errno = 0;
|
||||
+ }
|
||||
+
|
||||
+ find_original(origpath);
|
||||
+
|
||||
statvfs(origpath, stbuf);
|
||||
-
|
||||
+
|
||||
+passthrough:
|
||||
free(origpath);
|
||||
translate_fail:
|
||||
return -errno;
|
||||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zellij";
|
||||
version = "0.22.0";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zellij-org";
|
||||
repo = "zellij";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bia1q2IPrlVeSLsD/HGkWwAUW8THAuzXQR2Iw0v8TKM=";
|
||||
sha256 = "sha256-BOUZ26XeBwWZezSS38Dek1Zgu7TyTqMkCb7UHLZBkrI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ptM0QrrWFy9rb/CpLYuzRE48Wr429lcE9xnV8uA8mGs=";
|
||||
cargoSha256 = "sha256-oDFq6+RZ6ubBAnEq2l21EhJlUiKAQtaoO6U1UjY4RPY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitwarden";
|
||||
version = "1.29.1";
|
||||
version = "1.30.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bitwarden/desktop/releases/download/v${version}/Bitwarden-${version}-amd64.deb";
|
||||
sha256 = "0rxy19bazi7a6m2bpx6wadg5d9p0k324h369vgr5ppmxb69d6zp8";
|
||||
sha256 = "sha256-x0i7MUVr0nhPy8M/dTVtRjaLfJQlzqhzLQ/JHLRmL6E=";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
|
|
|||
|
|
@ -4289,11 +4289,9 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
};
|
||||
|
||||
code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true;
|
||||
};
|
||||
code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk = true;
|
||||
qtbase = qt5.qtbase;
|
||||
};
|
||||
code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true; };
|
||||
code-browser-gtk2 = callPackage ../applications/editors/code-browser { withGtk2 = true; };
|
||||
code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk3 = true; };
|
||||
|
||||
c14 = callPackage ../applications/networking/c14 { };
|
||||
|
||||
|
|
|
|||
|
|
@ -107,7 +107,11 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
(dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}")
|
||||
internalDeps}
|
||||
'';
|
||||
checkPhase = "runHook preCheck; NO_INTERACTON=yes make test; runHook postCheck";
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
NO_INTERACTON=yes SKIP_PERF_SENSITIVE=yes make test
|
||||
runHook postCheck
|
||||
'';
|
||||
outputs = [ "out" "dev" ];
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/php/extensions
|
||||
|
|
|
|||
Loading…
Reference in a new issue