mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-20 12:42:24 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
03b5b0daac
|
|
@ -535,12 +535,8 @@
|
|||
</para>
|
||||
|
||||
<para>
|
||||
If <option>--build-host</option> is not explicitly specified,
|
||||
<option>--build-host</option> will implicitly be set to the same value as
|
||||
<option>--target-host</option>. So, if you only specify
|
||||
<option>--target-host</option> both building and activation will take
|
||||
place remotely (and no build artifacts will be copied to the local
|
||||
machine).
|
||||
If <option>--build-host</option> is not explicitly specified, building
|
||||
will take place locally.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
|
|
|
|||
1
nixos/modules/system/boot/stage-2-init.sh
Normal file → Executable file
1
nixos/modules/system/boot/stage-2-init.sh
Normal file → Executable file
|
|
@ -172,4 +172,5 @@ echo "starting systemd..."
|
|||
|
||||
PATH=/run/current-system/systemd/lib/systemd:@fsPackagesPath@ \
|
||||
LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive @systemdUnitPathEnvVar@ \
|
||||
TZDIR=/etc/zoneinfo \
|
||||
exec @systemdExecutable@
|
||||
|
|
|
|||
|
|
@ -31,6 +31,13 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
umount /tmp/shared
|
||||
'';
|
||||
|
||||
systemd.services.oncalendar-test = {
|
||||
description = "calendar test";
|
||||
# Japan does not have DST which makes the test a little bit simpler
|
||||
startAt = "Wed 10:00 Asia/Tokyo";
|
||||
script = "true";
|
||||
};
|
||||
|
||||
systemd.services.testservice1 = {
|
||||
description = "Test Service 1";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
|
@ -69,6 +76,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
# wait for user services
|
||||
machine.wait_for_unit("default.target", "alice")
|
||||
|
||||
# Regression test for https://github.com/NixOS/nixpkgs/issues/105049
|
||||
with subtest("systemd reads timezone database in /etc/zoneinfo"):
|
||||
timer = machine.succeed("TZ=UTC systemctl show --property=TimersCalendar oncalendar-test.timer")
|
||||
assert re.search("next_elapse=Wed ....-..-.. 01:00:00 UTC", timer), f"got {timer.strip()}"
|
||||
|
||||
# Regression test for https://github.com/NixOS/nixpkgs/issues/35415
|
||||
with subtest("configuration files are recognized by systemd"):
|
||||
machine.succeed("test -e /system_conf_read")
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lite-xl";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lite-xl";
|
||||
repo = "lite-xl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8Hw2zDYynWG/NwxtWgbEVUCzrtRVkOhwtsisURNqUn8=";
|
||||
sha256 = "sha256-yMdfJ8qE2Tv+CtvbPN6todzY/pDrYo+vaBeppuUt5F4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "okteta";
|
||||
version = "0.26.5";
|
||||
version = "0.26.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-n8ft//c+ewWDr1QLDAUvkiHKPxHqP8NgTCvO2wnCmpc=";
|
||||
sha256 = "sha256-xWnNW1VQPkbfGltckWKwiIjEJqpSxvPy+SbGWL7gFEw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
|
||||
|
|
|
|||
|
|
@ -55,11 +55,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "digikam";
|
||||
version = "7.3.0";
|
||||
version = "7.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-la6pO+HP05u1IzO4Kz5Xv2gIDH0TGddU0WeiD22+RVE=";
|
||||
url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz";
|
||||
sha256 = "sha256-0Iq2bacyu0SbwQEG7BHdne+ls1Yt7TdBsEHbuqcVUEo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "f3d";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "f3d-app";
|
||||
repo = "f3d";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gIxtCwVbfbIh6OtibxEQRufrBOpXJzhslwhI0yt0XEY=";
|
||||
sha256 = "sha256-Yn1IcGWAbXjG0wJQjRimvreozFu9mf0FMwyGNYc4P+U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
mkDerivation {
|
||||
pname = "bovo";
|
||||
meta = with lib; {
|
||||
homepage = "https://kde.org/applications/en/games/org.kde.bovo";
|
||||
homepage = "https://apps.kde.org/bovo/";
|
||||
description = "Five in a row application";
|
||||
longDescription = ''
|
||||
Bovo is a Gomoku (from Japanese 五目並べ - lit. "five points") like game for two players,
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gremlin-console";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
src = fetchzip {
|
||||
url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip";
|
||||
sha256 = "sha256-aVhDbOYhgYaWjttGjJvBKbov7OGWh2/llBTePFPGXDM=";
|
||||
sha256 = "sha256-66krBK5mSMT0scCgMmiaigT/9nmYfItxe1OTzSbX+kE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -87,11 +87,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appgate-sdp";
|
||||
version = "5.5.0";
|
||||
version = "5.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bin.appgate-sdp.com/${versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";
|
||||
sha256 = "sha256-lWInks3DBkSpKQh+dcNyn43iY5vvE67FLadohBbF6n4=";
|
||||
sha256 = "sha256-gN9UAdn61qUZBJLi/9QiHjNRohbQQDV1uVHgcpuXq+Y=";
|
||||
};
|
||||
|
||||
# just patch interpreter
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "istioctl";
|
||||
version = "1.11.5";
|
||||
version = "1.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "istio";
|
||||
repo = "istio";
|
||||
rev = version;
|
||||
sha256 = "sha256-GngjZnE6G/7Iz/BFUKciZAnk/FjcSngt9H+M23E3hHk=";
|
||||
sha256 = "sha256-oMf60mxreBSlgxVInTFM8kozYVZz5RdgzV3rYUnadnA=";
|
||||
};
|
||||
vendorSha256 = "sha256-MzlDChyuEVfcfS0DLf/FqKXk3qzsqwO3ZBVJlZqrNhg=";
|
||||
vendorSha256 = "sha256-e8qh8J745TXUo6c1uMS8GyawEG9YFlMYl/nHpWIFK1Q=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
44
pkgs/applications/video/stremio/default.nix
Normal file
44
pkgs/applications/video/stremio/default.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ lib, stdenv, fetchurl, fetchFromGitHub, qmake, wrapQtAppsHook
|
||||
, mpv, qtwebengine, qtwebchannel, nodejs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stremio-shell";
|
||||
version = "4.4.142";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stremio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-OyuTFmEIC8PH4PDzTMn8ibLUAzJoPA/fTILee0xpgQI=";
|
||||
};
|
||||
|
||||
server = fetchurl {
|
||||
url = "https://s3-eu-west-1.amazonaws.com/stremio-artifacts/four/v${version}/server.js";
|
||||
sha256 = "sha256-YYeD3SEbLgNQHGP5AI9WiHUU6xLkTeFAqYIuWsIsYSs=";
|
||||
};
|
||||
|
||||
buildInputs = [ qtwebengine mpv ];
|
||||
|
||||
nativeBuildInputs = [ qmake wrapQtAppsHook ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/{bin,share/applications}
|
||||
ln -s $out/opt/stremio/stremio $out/bin/stremio
|
||||
mv $out/opt/stremio/smartcode-stremio.desktop $out/share/applications
|
||||
ln -s ${nodejs}/bin/node $out/opt/stremio/node
|
||||
ln -s $server $out/opt/stremio/server.js
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modern media center that gives you the freedom to watch everything you want.";
|
||||
homepage = "https://www.stremio.com/";
|
||||
# (Server-side) web UI is closed source now, apparently they work on open-sourcing it.
|
||||
# server.js appears to be MIT-licensed, but I can't find how they actually build it.
|
||||
# https://www.reddit.com/r/StremioAddons/comments/n2ob04/a_summary_of_how_stremio_works_internally_and/
|
||||
license = with licenses; [ gpl3 mit ];
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "phosh";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects
|
||||
sha256 = "sha256-pN2IWJDsQoTSOUki5gKhIucFYlYchzrqKHQYq6o4EkI=";
|
||||
sha256 = "sha256-FILSNVBYpWSPXeDb1Vc4jZ7zJMg0Gj6EY5yoc81gUr0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, fetchurl, libarchive }:
|
||||
|
||||
let
|
||||
version = "0.34.7";
|
||||
version = "0.35.2";
|
||||
in fetchurl {
|
||||
name = "sarasa-gothic-${version}";
|
||||
|
||||
# Use the 'ttc' files here for a smaller closure size.
|
||||
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
|
||||
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
|
||||
sha256 = "0fzbqj32jiffqsr4s0i8fignk01v5d1rik6ldg2q7dgl1298sgk8";
|
||||
sha256 = "sha256-ts6GM09Z7hYHVx/JGxVPze5X1sZ/22TTdxHBGiYMn5I=";
|
||||
|
||||
recursiveHash = true;
|
||||
downloadToTemp = true;
|
||||
|
|
|
|||
|
|
@ -1,38 +1,45 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
, libtool, autoconf, automake
|
||||
, gmp, mpfr, libffi, makeWrapper
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, libtool
|
||||
, autoconf
|
||||
, automake
|
||||
, gmp
|
||||
, mpfr
|
||||
, libffi
|
||||
, makeWrapper
|
||||
, noUnicode ? false
|
||||
, gcc
|
||||
, threadSupport ? false
|
||||
, useBoehmgc ? true, boehmgc
|
||||
, useBoehmgc ? true
|
||||
, boehmgc
|
||||
}:
|
||||
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="ecl";
|
||||
version="16.1.2";
|
||||
name="${baseName}-${version}";
|
||||
url="https://common-lisp.net/project/ecl/static/files/release/ecl-${version}.tgz";
|
||||
sha256="16ab8qs3awvdxy8xs8jy82v8r04x4wr70l9l2j45vgag18d2nj1d";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ecl";
|
||||
version = "16.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://common-lisp.net/project/ecl/static/files/release/ecl-${version}.tgz";
|
||||
sha256 = "sha256-LUgrGgpPvV2IFDRRcDInnYCMtkBeIt2R721zNTRGS5k=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libtool autoconf automake makeWrapper
|
||||
libtool
|
||||
autoconf
|
||||
automake
|
||||
makeWrapper
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
libffi gmp mpfr gcc
|
||||
libffi
|
||||
gmp
|
||||
mpfr
|
||||
gcc
|
||||
] ++ lib.optionals useBoehmgc [
|
||||
# replaces ecl's own gc which other packages can depend on, thus propagated
|
||||
boehmgc
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
inherit buildInputs propagatedBuildInputs;
|
||||
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
(if threadSupport then "--enable-threads" else "--disable-threads")
|
||||
|
|
@ -40,8 +47,8 @@ stdenv.mkDerivation {
|
|||
"--with-gmp-libdir=${lib.getLib gmp}/lib"
|
||||
# -incdir, -libdir doesn't seem to be supported for libffi
|
||||
"--with-libffi-prefix=${lib.getDev libffi}"
|
||||
] ++ lib.optional (! noUnicode) "--enable-unicode"
|
||||
;
|
||||
] ++ lib.optional (! noUnicode) "--enable-unicode"
|
||||
;
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
|
|
@ -80,17 +87,16 @@ stdenv.mkDerivation {
|
|||
# create the variables with suffixSalt (which seems to be necessary for
|
||||
# NIX_CFLAGS_COMPILE even).
|
||||
+ lib.optionalString useBoehmgc ''
|
||||
--prefix NIX_CFLAGS_COMPILE_${gcc.suffixSalt} ' ' "-I${lib.getDev boehmgc}/include" \
|
||||
--prefix NIX_LDFLAGS_BEFORE_${gcc.bintools.suffixSalt} ' ' "-L${lib.getLib boehmgc}/lib" \
|
||||
--prefix NIX_CFLAGS_COMPILE_${gcc.suffixSalt} ' ' "-I${lib.getDev boehmgc}/include" \
|
||||
--prefix NIX_LDFLAGS_BEFORE_${gcc.bintools.suffixSalt} ' ' "-L${lib.getLib boehmgc}/lib" \
|
||||
'' + ''
|
||||
--prefix NIX_LDFLAGS_BEFORE_${gcc.bintools.suffixSalt} ' ' "-L${lib.getLib libffi}/lib"
|
||||
--prefix NIX_LDFLAGS_BEFORE_${gcc.bintools.suffixSalt} ' ' "-L${lib.getLib libffi}/lib"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit (s) version;
|
||||
description = "Lisp implementation aiming to be small, fast and easy to embed";
|
||||
license = licenses.mit ;
|
||||
maintainers = [ maintainers.raskin ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,40 +1,48 @@
|
|||
{lib, stdenv, fetchurl, fetchpatch
|
||||
, libtool, autoconf, automake
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, libtool
|
||||
, autoconf
|
||||
, automake
|
||||
, texinfo
|
||||
, gmp, mpfr, libffi, makeWrapper
|
||||
, gmp
|
||||
, mpfr
|
||||
, libffi
|
||||
, makeWrapper
|
||||
, noUnicode ? false
|
||||
, gcc
|
||||
, threadSupport ? true
|
||||
, useBoehmgc ? false, boehmgc
|
||||
, useBoehmgc ? false
|
||||
, boehmgc
|
||||
}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="ecl";
|
||||
version="21.2.1";
|
||||
name="${baseName}-${version}";
|
||||
url="https://common-lisp.net/project/ecl/static/files/release/${name}.tgz";
|
||||
sha256="000906nnq25177bgsfndiw3iqqgrjc9spk10hzk653sbz3f7anmi";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ecl";
|
||||
version = "21.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://common-lisp.net/project/ecl/static/files/release/ecl-${version}.tgz";
|
||||
sha256 = "sha256-sVp13PhLj2LmhyDMqxOT+WEcB4/NOv3WOaEIbK0BCQA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
libtool autoconf automake texinfo makeWrapper
|
||||
libtool
|
||||
autoconf
|
||||
automake
|
||||
texinfo
|
||||
makeWrapper
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
libffi gmp mpfr gcc
|
||||
libffi
|
||||
gmp
|
||||
mpfr
|
||||
gcc
|
||||
# replaces ecl's own gc which other packages can depend on, thus propagated
|
||||
] ++ lib.optionals useBoehmgc [
|
||||
# replaces ecl's own gc which other packages can depend on, thus propagated
|
||||
boehmgc
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) version;
|
||||
pname = s.baseName;
|
||||
inherit nativeBuildInputs propagatedBuildInputs;
|
||||
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1
|
||||
|
|
@ -70,9 +78,9 @@ stdenv.mkDerivation {
|
|||
meta = with lib; {
|
||||
description = "Lisp implementation aiming to be small, fast and easy to embed";
|
||||
homepage = "https://common-lisp.net/project/ecl/";
|
||||
license = licenses.mit ;
|
||||
maintainers = [ maintainers.raskin ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.unix;
|
||||
changelog = "https://gitlab.com/embeddable-common-lisp/ecl/-/raw/${s.version}/CHANGELOG";
|
||||
changelog = "https://gitlab.com/embeddable-common-lisp/ecl/-/raw/${version}/CHANGELOG";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
url https://common-lisp.net/project/ecl/
|
||||
version_link '[.]tgz$'
|
||||
|
|
@ -65,6 +65,7 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres sternenseemann ];
|
||||
inherit (jdk.meta) platforms;
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dbqn-native.x86_64-darwin
|
||||
};
|
||||
}
|
||||
# TODO: Processing app
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# How to obtain `sha256`:
|
||||
# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
|
||||
mkDerivation {
|
||||
version = "1.13.0";
|
||||
sha256 = "1rkrx9kbs2nhkmzydm02r4wkb8wxwmg8iv0nqilpzj0skkxd6k8w";
|
||||
version = "1.13.1";
|
||||
sha256 = "0z0b1w2vvw4vsnb99779c2jgn9bgslg7b1pmd9vlbv02nza9qj5p";
|
||||
minimumOTPVersion = "22";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,41 +1,45 @@
|
|||
{ lib, stdenv, fetchurl, gperf, pkg-config, librevenge, libxml2, boost, icu
|
||||
, cppunit, zlib, liblangtag
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, gperf
|
||||
, pkg-config
|
||||
, librevenge
|
||||
, libxml2
|
||||
, boost
|
||||
, icu
|
||||
, cppunit
|
||||
, zlib
|
||||
, liblangtag
|
||||
}:
|
||||
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="libe-book";
|
||||
version="0.1.3";
|
||||
name="${baseName}-${version}";
|
||||
hash="1yg1vws1wggzhjw672bpgh2x541g5i9wryf67g51m0r79zrqz3by";
|
||||
url="https://kent.dl.sourceforge.net/project/libebook/libe-book-0.1.3/libe-book-0.1.3.tar.xz";
|
||||
sha256="1yg1vws1wggzhjw672bpgh2x541g5i9wryf67g51m0r79zrqz3by";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libe-book";
|
||||
version = "0.1.3";
|
||||
src = fetchurl {
|
||||
url = "https://kent.dl.sourceforge.net/project/libebook/libe-book-${version}/libe-book-${version}.tar.xz";
|
||||
sha256 = "sha256-fo2P808ngxrKO8b5zFMsL5DSBXx3iWO4hP89HjTf4fk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
gperf librevenge libxml2 boost icu cppunit zlib liblangtag
|
||||
gperf
|
||||
librevenge
|
||||
libxml2
|
||||
boost
|
||||
icu
|
||||
cppunit
|
||||
zlib
|
||||
liblangtag
|
||||
];
|
||||
|
||||
# Boost 1.59 compatability fix
|
||||
# Attempt removing when updating
|
||||
postPatch = ''
|
||||
sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
|
||||
'';
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
inherit nativeBuildInputs buildInputs postPatch;
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
};
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=unused-function";
|
||||
meta = {
|
||||
inherit (s) version;
|
||||
meta = with lib; {
|
||||
description = "Library for import of reflowable e-book formats";
|
||||
license = lib.licenses.lgpl21Plus ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.unix;
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
url https://sourceforge.net/projects/libebook/files/
|
||||
SF_version_dir libe-book-
|
||||
version_link '[.]tar.xz/download$'
|
||||
SF_redirect
|
||||
|
|
@ -1,32 +1,29 @@
|
|||
{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="libmwaw";
|
||||
version="0.3.21";
|
||||
name="${baseName}-${version}";
|
||||
hash="sha256-6HUBI6eNYblDzveLdzbIp/ILsKZJqhEkAhJPunlPwhw=";
|
||||
url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.21/libmwaw-0.3.21.tar.xz";
|
||||
sha256="sha256-6HUBI6eNYblDzveLdzbIp/ILsKZJqhEkAhJPunlPwhw=";
|
||||
{ lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmwaw";
|
||||
version = "0.3.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libmwaw/libmwaw/libmwaw-${version}/libmwaw-${version}.tar.xz";
|
||||
sha256 = "sha256-6HUBI6eNYblDzveLdzbIp/ILsKZJqhEkAhJPunlPwhw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
boost cppunit zlib libwpg libwpd librevenge
|
||||
boost
|
||||
cppunit
|
||||
zlib
|
||||
libwpg
|
||||
libwpd
|
||||
librevenge
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
inherit nativeBuildInputs buildInputs;
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
};
|
||||
enableParallelBuilding = true;
|
||||
meta = {
|
||||
inherit (s) version;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Import library for some old mac text documents";
|
||||
license = lib.licenses.mpl20 ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.unix;
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
url https://sourceforge.net/projects/libmwaw/files/libmwaw/
|
||||
SF_version_dir libmwaw-
|
||||
version_link '[.]tar.xz/download$'
|
||||
SF_redirect
|
||||
|
|
@ -1,30 +1,28 @@
|
|||
{lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge}:
|
||||
let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="libodfgen";
|
||||
version="0.1.7";
|
||||
name="${baseName}-${version}";
|
||||
hash="0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij";
|
||||
url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.7/libodfgen-0.1.7.tar.xz";
|
||||
sha256="0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij";
|
||||
{ lib, stdenv, fetchurl, boost, pkg-config, cppunit, zlib, libwpg, libwpd, librevenge }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libodfgen";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/libwpd/libodfgen/libodfgen-${version}/libodfgen-${version}.tar.xz";
|
||||
sha256 = "sha256-Mj5JH5VsjKKrsSyZjjUGcJMKMjF7+WYrBhXdSzkiuDE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
boost cppunit zlib libwpg libwpd librevenge
|
||||
boost
|
||||
cppunit
|
||||
zlib
|
||||
libwpg
|
||||
libwpd
|
||||
librevenge
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit (s) name version;
|
||||
inherit nativeBuildInputs buildInputs;
|
||||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
};
|
||||
meta = {
|
||||
inherit (s) version;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A base library for generating ODF documents";
|
||||
license = lib.licenses.mpl20 ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
platforms = lib.platforms.unix;
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
url https://sourceforge.net/projects/libwpd/files/libodfgen/
|
||||
SF_version_dir libodfgen-
|
||||
version_link '[.]tar.xz/download$'
|
||||
SF_redirect
|
||||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "umockdev";
|
||||
version = "0.17.0";
|
||||
version = "0.17.1";
|
||||
|
||||
outputs = [ "bin" "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-rrZtftnvKWJ8f8qIjAOcudn2uvE1upwgByoLrtv1leY=";
|
||||
sha256 = "sha256-lq8lVQlSZpFGDL7nGV8pPe+AClK8PjzWoPmhfWvHpJs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ assert enableGeoLocation -> geoclue2 != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webkitgtk";
|
||||
version = "2.34.1";
|
||||
version = "2.34.3";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-RDwTFnBd4CR0F0joX+MjJNKZ2e5o5v6zQLieSgQHPe4=";
|
||||
sha256 = "sha256-DS83qjLiGjbk3Vpc565c4nQ1wp1oA7liuMkMsMxJxS0=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "parany";
|
||||
version = "12.1.1";
|
||||
version = "12.1.2";
|
||||
|
||||
useDune2 = true;
|
||||
minimumOCamlVersion = "4.03.0";
|
||||
|
|
@ -11,7 +11,7 @@ buildDunePackage rec {
|
|||
owner = "UnixJunkie";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0s2sbmywy4yyh69dcrcqd85hd8jcd7qgfczy79nam4bvn87bjm72";
|
||||
sha256 = "yOeJzb2Wr6jA4efI9/fuqDCl/Tza3zxT3YjAiJmhHHg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ocamlnet cpu ];
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymatgen";
|
||||
version = "2022.0.16";
|
||||
version = "2022.0.17";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fb4db7d547f062266a1a113d898fb0626ded5a1f9101ef79681e171b7e45fad0";
|
||||
sha256 = "7103b89b889bb940709eea53226d3c9298584ad9ab42ab8c8f9de3872d7d969b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glibcLocales ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pystray";
|
||||
version = "0.17.4";
|
||||
version = "0.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moses-palmer";
|
||||
repo = "pystray";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Rg2bbFTXLc1hXdShUmFxPcJtlcyWhspcjZtJYDSQ6vQ=";
|
||||
sha256 = "sha256-7w3odneRfDQ7K965ffJ+xSaGvg/KM0vTrSIj0ee13Uk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ sphinx ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vultr-cli";
|
||||
version = "2.11.2";
|
||||
version = "2.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vultr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-v5RbStmQX7D+i+oyekilLPsl6lta5rkJV4Uf0mjIF8Y=";
|
||||
sha256 = "sha256-UI7D5bvfyGsNa6Gd1XuFu1VgiIQJ/b0g6DQlsJbaocI=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ let
|
|||
, platform ? null
|
||||
, extraMakeFlags ? []
|
||||
, extraMeta ? {}
|
||||
, version ? "2.5"
|
||||
, version ? "2.6"
|
||||
, ... } @ args:
|
||||
stdenv.mkDerivation ({
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ let
|
|||
owner = "ARM-software";
|
||||
repo = "arm-trusted-firmware";
|
||||
rev = "v${version}";
|
||||
sha256 = "0w3blkqgmyb5bahlp04hmh8abrflbzy0qg83kmj1x9nv4mw66f3b";
|
||||
sha256 = "sha256-qT9DdTvMcUrvRzgmVf2qmKB+Rb1WOB4p1rM+fsewGcg=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ lib, stdenv, writeScriptBin, fetchFromGitLab, autoreconfHook, pkg-config
|
||||
, autoconf-archive, libxslt, boost , gtkmm2 , imagemagick, sane-backends
|
||||
, tesseract4, udev, libusb1 }:
|
||||
{ lib, stdenv, writeScriptBin, fetchpatch, fetchFromGitLab, autoreconfHook, pkg-config
|
||||
, autoconf-archive, libxslt, boost, gtkmm2, imagemagick, sane-backends
|
||||
, tesseract4, udev, libusb1
|
||||
, withNetworkScan ? false, utsushi-networkscan
|
||||
}:
|
||||
|
||||
|
||||
let
|
||||
|
|
@ -10,17 +12,29 @@ let
|
|||
[ -r .rev ] && cat .rev || true
|
||||
fi
|
||||
'';
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "utsushi";
|
||||
version = "unstable-2021-01-01";
|
||||
pname = "imagescan";
|
||||
version = "3.65.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = pname;
|
||||
owner = "utsushi";
|
||||
repo = pname;
|
||||
rev = "1646d7d301f3d2aeb24930696688853fed5f0d43";
|
||||
sha256 = "1g9m00qljhlw56h3hgfq67ywf4r92nl37m7x5mxa7ygaxc0dyb14";
|
||||
rev = version;
|
||||
sha256 = "sha256-CrN9F/WJKmlDN7eozEHtKgGUQBWVwTqwjnrfiATk7lI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/iscan/files/iscan-3.63.0-autoconf-2.70.patch?id=4fe8a9e6c60f9163cadad830ba4935c069c67b10";
|
||||
sha256 = "sha256-2V4cextjcEQrywe4tvvD5KaVYdXnwdNhTiY/aSNx3mM=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/iscan/files/iscan-3.61.0-imagemagick-7.patch?id=985c92af4730d864e86fa87746185b0246e9db93";
|
||||
sha256 = "sha256-dfdVMp3ZfclYeRxYjMIvl+ZdlLn9S+IwQ+OmlHW8318=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
|
|
@ -49,8 +63,8 @@ in stdenv.mkDerivation rec {
|
|||
# create fake udev and sane config
|
||||
mkdir -p $out/etc/{sane.d,udev/rules.d}
|
||||
touch $out/etc/sane.d/dll.conf
|
||||
|
||||
# absolute paths to convert & tesseract
|
||||
sed -i '/\[AC_DEFINE(\[HAVE_IMAGE_MAGICK\], \[1\])/a \ MAGICK_CONVERT="${imagemagick}/bin/convert"' configure.ac
|
||||
substituteInPlace filters/magick.cpp \
|
||||
--replace 'convert ' '${imagemagick}/bin/convert '
|
||||
substituteInPlace filters/reorient.cpp \
|
||||
|
|
@ -77,6 +91,10 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
doInstallCheck = false;
|
||||
|
||||
postInstall = lib.optionalString withNetworkScan ''
|
||||
ln -s ${utsushi-networkscan}/libexec/utsushi/networkscan $out/libexec/utsushi
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "SANE utsushi backend for some Epson scanners";
|
||||
longDescription = ''
|
||||
|
|
|
|||
31
pkgs/misc/drivers/utsushi/networkscan.nix
Normal file
31
pkgs/misc/drivers/utsushi/networkscan.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib, stdenv, fetchurl, rpmextract }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imagescan-plugin-networkscan";
|
||||
imagescanVersion = "3.65.0";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download2.ebz.epson.net/imagescanv3/fedora/latest1/rpm/x64/imagescan-bundle-fedora-32-${imagescanVersion}.x64.rpm.tar.gz";
|
||||
sha256 = "sha256-fxi63sV+YJOlv1aVTfCPIXOPfNAo+R7zNPvA11sFmMk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ rpmextract ];
|
||||
|
||||
installPhase = ''
|
||||
rpmextract plugins/imagescan-plugin-networkscan-${version}-*.x86_64.rpm
|
||||
install -Dm755 usr/libexec/utsushi/networkscan $out/libexec/utsushi/networkscan
|
||||
patchelf \
|
||||
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
|
||||
--set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc ]} \
|
||||
$out/libexec/utsushi/networkscan
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://support.epson.net/linux/en/imagescanv3.php";
|
||||
description = "Network scan plugin for ImageScan v3";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -4906,6 +4906,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/andsild/peskcolor.vim/";
|
||||
};
|
||||
|
||||
pgsql-vim = buildVimPluginFrom2Nix {
|
||||
pname = "pgsql.vim";
|
||||
version = "2021-12-03";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lifepillar";
|
||||
repo = "pgsql.vim";
|
||||
rev = "b4518baca45a556ab8b1ad6daee78f8d4744f635";
|
||||
sha256 = "0jzzbsg73p6p0fjivix5bn8h6n1rz759bq8z1ilj2m6wz14c1ilm";
|
||||
};
|
||||
meta.homepage = "https://github.com/lifepillar/pgsql.vim/";
|
||||
};
|
||||
|
||||
pig-vim = buildVimPluginFrom2Nix {
|
||||
pname = "pig.vim";
|
||||
version = "2017-06-08";
|
||||
|
|
@ -5196,6 +5208,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/rafaqz/ranger.vim/";
|
||||
};
|
||||
|
||||
rcshell-vim = buildVimPluginFrom2Nix {
|
||||
pname = "rcshell.vim";
|
||||
version = "2014-12-29";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-scripts";
|
||||
repo = "rcshell.vim";
|
||||
rev = "6b307c6e6e6948fbb27146b0f41b5fb2ddf8e1a8";
|
||||
sha256 = "0dj6gjq213ljshnncal3ywzv8ply2lzqmvpzaf7vdsd6r6vss3ch";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-scripts/rcshell.vim/";
|
||||
};
|
||||
|
||||
readline-vim = buildVimPluginFrom2Nix {
|
||||
pname = "readline.vim";
|
||||
version = "2019-12-28";
|
||||
|
|
@ -6256,6 +6280,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/itchyny/thumbnail.vim/";
|
||||
};
|
||||
|
||||
timestamp-vim = buildVimPluginFrom2Nix {
|
||||
pname = "timestamp.vim";
|
||||
version = "2010-11-06";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-scripts";
|
||||
repo = "timestamp.vim";
|
||||
rev = "0437f9bddd4e699e8e9de176daacec234d42b56c";
|
||||
sha256 = "1dvssbmz7xm4p83jmsqalkshbrk67cacsjvxjpnlw870zf2hqc8p";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-scripts/timestamp.vim/";
|
||||
};
|
||||
|
||||
tlib_vim = buildVimPluginFrom2Nix {
|
||||
pname = "tlib_vim";
|
||||
version = "2021-07-17";
|
||||
|
|
@ -6941,6 +6977,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/haya14busa/vim-asterisk/";
|
||||
};
|
||||
|
||||
vim-asymptote = buildVimPluginFrom2Nix {
|
||||
pname = "vim-asymptote";
|
||||
version = "2014-06-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hura";
|
||||
repo = "vim-asymptote";
|
||||
rev = "2c59b7d173bf3837c1378e60b0c51d911cdbe15c";
|
||||
sha256 = "0j4hrirssgnh37crl3yvy2vxf7wigdir860z1qvn1m72hld8n32y";
|
||||
};
|
||||
meta.homepage = "https://github.com/hura/vim-asymptote/";
|
||||
};
|
||||
|
||||
vim-auto-save = buildVimPluginFrom2Nix {
|
||||
pname = "vim-auto-save";
|
||||
version = "2021-10-15";
|
||||
|
|
@ -9068,6 +9116,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/simnalamburt/vim-mundo/";
|
||||
};
|
||||
|
||||
vim-mustache-handlebars = buildVimPluginFrom2Nix {
|
||||
pname = "vim-mustache-handlebars";
|
||||
version = "2021-11-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mustache";
|
||||
repo = "vim-mustache-handlebars";
|
||||
rev = "0153fe03a919add2d6cf2d41b2d5b6e1188bc0e0";
|
||||
sha256 = "0dnafs9bcfm539plx5hq6nzq6k8li3xbkizdhv71cpmfcbw2srln";
|
||||
};
|
||||
meta.homepage = "https://github.com/mustache/vim-mustache-handlebars/";
|
||||
};
|
||||
|
||||
vim-nerdtree-syntax-highlight = buildVimPluginFrom2Nix {
|
||||
pname = "vim-nerdtree-syntax-highlight";
|
||||
version = "2021-01-11";
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ alvarosevilla95/luatab.nvim
|
|||
alx741/vim-hindent
|
||||
alx741/vim-stylishask
|
||||
amiorin/ctrlp-z
|
||||
andersevenrud/compe-tmux@cmp
|
||||
andersevenrud/cmp-tmux@cmp
|
||||
andrep/vimacs
|
||||
andreshazard/vim-logreview
|
||||
AndrewRadev/sideways.vim
|
||||
|
|
@ -247,6 +247,7 @@ hrsh7th/vim-vsnip
|
|||
hrsh7th/vim-vsnip-integ
|
||||
hsanson/vim-android
|
||||
hsitz/VimOrganizer
|
||||
hura/vim-asymptote
|
||||
iamcco/coc-spell-checker
|
||||
iamcco/markdown-preview.nvim
|
||||
ianks/vim-tsx
|
||||
|
|
@ -392,6 +393,7 @@ lewis6991/gitsigns.nvim
|
|||
lf-lang/lingua-franca.vim
|
||||
lfe-support/vim-lfe
|
||||
lfilho/cosco.vim
|
||||
lifepillar/pgsql.vim
|
||||
lifepillar/vim-gruvbox8
|
||||
lifepillar/vim-mucomplete
|
||||
lighttiger2505/deoplete-vim-lsp
|
||||
|
|
@ -485,7 +487,8 @@ motus/pig.vim
|
|||
mpickering/hlint-refactor-vim
|
||||
ms-jpq/chadtree@chad
|
||||
mtikekar/vim-bsv
|
||||
MunifTanjim/nui.nvim
|
||||
MunifTanjim/nui.nvim@main
|
||||
mustache/vim-mustache-handlebars
|
||||
mzlogin/vim-markdown-toc
|
||||
mzlogin/vim-smali
|
||||
nacro90/numb.nvim
|
||||
|
|
@ -879,11 +882,13 @@ vim-scripts/mayansmoke
|
|||
vim-scripts/PreserveNoEOL
|
||||
vim-scripts/prev_indent
|
||||
vim-scripts/random.vim
|
||||
vim-scripts/rcshell.vim
|
||||
vim-scripts/Rename
|
||||
vim-scripts/ReplaceWithRegister
|
||||
vim-scripts/ShowMultiBase
|
||||
vim-scripts/tabmerge
|
||||
vim-scripts/taglist.vim
|
||||
vim-scripts/timestamp.vim
|
||||
vim-scripts/utl.vim
|
||||
vim-scripts/vis
|
||||
vim-scripts/wombat256.vim
|
||||
|
|
|
|||
|
|
@ -819,8 +819,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-pull-request-github";
|
||||
publisher = "github";
|
||||
version = "0.22.0";
|
||||
sha256 = "13p3z86vkra26npp5a78pxdwa4z6jqjzsd38arhgdnjgwmi6bnrw";
|
||||
version = "0.35.2021122109";
|
||||
sha256 = "1n7vjwxm92ibwhgn2n57p54dqpi0vvyllmcgjxilgnr14irg5457";
|
||||
};
|
||||
meta = { license = lib.licenses.mit; };
|
||||
};
|
||||
|
|
@ -950,8 +950,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "influxdata";
|
||||
name = "flux";
|
||||
version = "0.6.5";
|
||||
sha256 = "sha256-rKkZ7Sg8buryFtbIuKsrf3V3Rf7PP8hnbEIRFf4FvSM=";
|
||||
version = "0.6.13";
|
||||
sha256 = "0myl7rppzcz7hxy9zjs81vs9p66lnbfcrdr6s5qb4i6929gmywfy";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "blueman";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-Ge1ZsaE09YT8AF9HKV/vZAqXCf2bmyMHOI4RKjLs0PY=";
|
||||
sha256 = "sha256-bt15Haav2PYQ/7CNUTjPz1DmJXrTDvrWhih/OivhBuk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ksnip";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ksnip";
|
||||
repo = "ksnip";
|
||||
rev = "v${version}";
|
||||
sha256 = "1izsk586n9fbm0di0hj6pxs7r0a6w554gpad1ghf247icr0pfc1l";
|
||||
sha256 = "sha256-4EIb1cHmScnFN7IralBR5hnvPBCHNQRcTWEWYezoOcQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2021.15";
|
||||
version = "1.2021.16";
|
||||
pname = "plantuml";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
|
||||
sha256 = "sha256-wVwPPAIR7oDIe+vPh/NZJazX/CU4yAxzafDrst0YSBI=";
|
||||
sha256 = "sha256-0yN/29VKWiqp2Hi9aIN6GMlfMJPxrewsCQyyPVy6RAM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
"--enable-shared"
|
||||
"--enable-tcpreplay-edit"
|
||||
"--with-libpcap=${libpcap}"
|
||||
"--with-tcpdump=${tcpdump}/bin"
|
||||
"--with-tcpdump=${tcpdump}/bin/tcpdump"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vopono";
|
||||
version = "0.8.8";
|
||||
version = "0.8.10";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-7VTx52V70i4N7ZmprX9cLrYu7xCSmb+m+Yaphs94c4w";
|
||||
sha256 = "sha256-+ZRvuUA7BvM8YW1QZQ7iJrLvleitl1hqEOrTkrLVSes";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-is9O0fQacE+j9gyZDIWgo3AXMs4ZGUVE5EKUO4ntjq8";
|
||||
cargoHash = "sha256-zM5JufS0qEYPEEwl6iPZYge3cssrsLu835AhAd8F3vc";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Run applications through VPN connections in network namespaces";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
let
|
||||
pname = "jadx";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skylot";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dEtmn6d7B+0p3SOmnpJigBCDjfnyY1qazXdmwtvoWwE=";
|
||||
hash = "sha256-6I8pK1DZkjAf6XljREMasoZQGR9YGDxn6+sdQ/nf31A=";
|
||||
};
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
|
|
@ -40,7 +40,7 @@ let
|
|||
'';
|
||||
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "sha256-t2kfih5JbIZvJMSHcCsTteDJ9MWJK/wUiqmHU5odMdY=";
|
||||
outputHash = "sha256-5QJPMC/lk0C3nVCpGLE4r6rnchwttIbdHmcySnpNmF8=";
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
inherit pname version src;
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stress-ng";
|
||||
version = "0.13.08";
|
||||
version = "0.13.09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ColinIanKing";
|
||||
repo = pname;
|
||||
rev = "V${version}";
|
||||
sha256 = "sha256-LHGtx7H8Cv9ZM5hRNrC1mjsl1k9lNx/5k7V8lqvJ7yw=";
|
||||
hash = "sha256-BOOB5fA/Cy1gsRA4j8aj3lVY2y4OvIfoiRqOIY9nZzM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ugrep";
|
||||
version = "3.3.12";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Genivia";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gQWLHZPU3pWgMpnl4BdgiWsml+meoN6lLP7KU9KluCc=";
|
||||
sha256 = "sha256-G9MM5dIc1B8tggCQKIk+f39cv/Xb0rTLOqDYEsHwI4A=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -9779,6 +9779,8 @@ with pkgs;
|
|||
|
||||
stm32loader = with python3Packages; toPythonApplication stm32loader;
|
||||
|
||||
stremio = qt5.callPackage ../applications/video/stremio { };
|
||||
|
||||
stubby = callPackage ../tools/networking/stubby { };
|
||||
|
||||
sunwait = callPackage ../applications/misc/sunwait { };
|
||||
|
|
@ -32671,6 +32673,8 @@ with pkgs;
|
|||
|
||||
utsushi = callPackage ../misc/drivers/utsushi { };
|
||||
|
||||
utsushi-networkscan = callPackage ../misc/drivers/utsushi/networkscan.nix { };
|
||||
|
||||
idsk = callPackage ../tools/filesystems/idsk { };
|
||||
|
||||
colima = callPackage ../applications/virtualization/colima {};
|
||||
|
|
|
|||
Loading…
Reference in a new issue