Merge release-21.05 into staging-next-21.05
This commit is contained in:
github-actions[bot]
GitHub
commit
d4458f0116
|
|
@ -63,6 +63,7 @@ in {
|
|||
description = "Slimserver daemon user";
|
||||
home = cfg.dataDir;
|
||||
group = "slimserver";
|
||||
isSystemUser = true;
|
||||
};
|
||||
groups.slimserver = {};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -55,7 +55,16 @@ in
|
|||
(mkIf enableBtrfs {
|
||||
system.fsPackages = [ pkgs.btrfs-progs ];
|
||||
|
||||
boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" "crc32c" ];
|
||||
boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" ];
|
||||
boot.initrd.availableKernelModules = mkIf inInitrd (
|
||||
[ "crc32c" ]
|
||||
++ optionals (config.boot.kernelPackages.kernel.kernelAtLeast "5.5") [
|
||||
# Needed for mounting filesystems with new checksums
|
||||
"xxhash_generic"
|
||||
"blake2b_generic"
|
||||
"sha256_generic" # Should be baked into our kernel, just to be sure
|
||||
]
|
||||
);
|
||||
|
||||
boot.initrd.extraUtilsCommands = mkIf inInitrd
|
||||
''
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "helio-workstation";
|
||||
version = "3.4";
|
||||
version = "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helio-fm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-zXsDu/xi7OV6VtnZK9ZJ8uwPeA5uTgNpAQsqe90iwG4=";
|
||||
sha256 = "sha256-qW39g6rQ5VPQ3Hx9NmwLbpZiITnzFZDZlcLkE+pJKPc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, autoconf
|
||||
, autoreconfHook
|
||||
, gtk2
|
||||
, alsaLib
|
||||
, SDL
|
||||
|
|
@ -12,21 +12,43 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "soundtracker";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
# Past releases get moved to the "old releases" directory.
|
||||
# Only the latest release is at the top level.
|
||||
# Nonetheless, only the name of the file seems to affect which file is
|
||||
# downloaded, so this path should be fine both for old and current releases.
|
||||
url = "mirror://sourceforge/soundtracker/soundtracker-${version}.tar.bz2";
|
||||
sha256 = "0m5iiqccch6w53khpvdldz59zymw13vmwqc5ggx3sn41riwbd6ks";
|
||||
url = "mirror://sourceforge/soundtracker/soundtracker-${version}.tar.xz";
|
||||
sha256 = "0nh0dwz8nldc040q6n06vlazhss8ms42r2dffhjcrqj3hbrvfx82";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# Darwin binutils don't support D option for ar
|
||||
# ALSA macros are missing on Darwin, causing error
|
||||
substituteInPlace configure.ac \
|
||||
--replace ARFLAGS=crD ARFLAGS=cru \
|
||||
--replace AM_PATH_ALSA '#AM_PATH_ALSA'
|
||||
# Avoid X11-specific workaround code on more than just Windows
|
||||
substituteInPlace app/keys.c \
|
||||
--replace '!defined(_WIN32)' '!defined(_WIN32) && !defined(__APPLE__)'
|
||||
# "The application with bundle ID (null) is running setugid(), which is not allowed."
|
||||
sed -i -e '/seteuid/d' -e '/setegid/d' app/main.c
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-graphics-backend=gdk"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"--disable-alsa"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
autoconf
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk2
|
||||
SDL
|
||||
|
|
@ -35,8 +57,6 @@ stdenv.mkDerivation rec {
|
|||
goocanvas
|
||||
] ++ lib.optional stdenv.isLinux alsaLib;
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A music tracking tool similar in design to the DOS program FastTracker and the Amiga legend ProTracker";
|
||||
longDescription = ''
|
||||
|
|
@ -51,7 +71,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.all;
|
||||
# gdk/gdkx.h not found
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,43 +1,41 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, readline }:
|
||||
|
||||
let
|
||||
patchPrefix = "https://github.com/samuelgrf/kjv/commit/";
|
||||
|
||||
patch-base = "https://github.com/LukeSmithxyz/kjv/commit/";
|
||||
|
||||
add-apocrypha = fetchpatch {
|
||||
url = patch-base + "b92b7622285d10464f9274f11e740bef90705bbc.patch";
|
||||
sha256 = "0n4sj8p9m10fcair4msc129jxkkx5whqzhjbr5k4lfgp6nb1zk8k";
|
||||
};
|
||||
|
||||
add-install-target = fetchpatch {
|
||||
url = patch-base + "f4ad73539eb73f1890f4b791d8d38dd95900a4a4.patch";
|
||||
sha256 = "1yzj72i5fkzn2i4wl09q6jx7nwn2h4jwm49fc23nxfwchzar9m1q";
|
||||
};
|
||||
add-apocrypha = fetchpatch {
|
||||
url = patchPrefix + "0856fa0d37b45de0d6b47d163b5ea9a0b7f2c061.patch";
|
||||
sha256 = "1jkajdg4wvpbbwc5mn37i4c8nfis4z0pv5rl7gqs0laj0gpj7jn8";
|
||||
};
|
||||
|
||||
add-install-target = fetchpatch {
|
||||
url = patchPrefix + "50a83256ee45430fb06b7aea1945dd91c6813bc3.patch";
|
||||
sha256 = "0bv9yma67jdj496a6vn6y007c9gwjpg3rzld1i9m9y9xmlzq4yzv";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "kjv";
|
||||
version = "unstable-2018-12-25";
|
||||
version = "unstable-2021-03-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bontibon";
|
||||
repo = pname;
|
||||
rev = "fda81a610e4be0e7c5cf242de655868762dda1d4";
|
||||
sha256 = "1favfcjvd3pzz1ywwv3pbbxdg7v37s8vplgsz8ag016xqf5ykqqf";
|
||||
repo = "kjv";
|
||||
rev = "108595dcbb9bb12d40e0309f029b6fb3ccd81309";
|
||||
hash = "sha256-Z6myd9Xn23pYizG+IZVDrP988pYU06QIcpqXtWTcPiw=";
|
||||
};
|
||||
|
||||
patches = [ add-apocrypha add-install-target ];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
buildInputs = [ readline ];
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Bible, King James Version";
|
||||
homepage = "https://github.com/bontibon/kjv";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = [ maintainers.jtobin ];
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ jtobin samuelgrf ];
|
||||
mainProgram = "kjv";
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "stretchly";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz";
|
||||
sha256 = "1q0ihp6cd65lnscbr7xj3yyb06qds77r4s6m1xbk5l9vs2rw923d";
|
||||
sha256 = "sha256-F6p+g0yuDMpNq+cVgA3ZhUwCIiIU1QfYM90lmaNnRWw=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"stable": {
|
||||
"version": "92.0.4515.107",
|
||||
"sha256": "04khamgxwzgbm2rn7is53j5g55vm5qfyz7zwxqc51sd429jsqlbf",
|
||||
"sha256bin64": "0vfg8wjf9i1yz8nlxsij8fmqq7qr4nsccaihppqm3axpk91mmdsj",
|
||||
"version": "92.0.4515.131",
|
||||
"sha256": "0fnfyh61w6dmavvfbf2x1zzrby0xpx4jd4ifjsgyc39rsl789b5n",
|
||||
"sha256bin64": "04ykc7vgq47m595j0g0gl28n5rkki6aic7ck8xr08r5cia46gk3g",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-05-07",
|
||||
|
|
@ -12,9 +12,9 @@
|
|||
}
|
||||
},
|
||||
"chromedriver": {
|
||||
"version": "92.0.4515.43",
|
||||
"sha256_linux": "1s22y892py99kzcb2j3gafmbz9jrr2lfhhh8hp3ggn2i37yxs8bw",
|
||||
"sha256_darwin": "1cjg4r4z5m74c2si4m25rj3z44n0iimhqzb1l3l3y0a3q024bi8f"
|
||||
"version": "92.0.4515.107",
|
||||
"sha256_linux": "12yckzjhlhxp14j7aphnvlw4xv713vllj44h5pba181ivxavmky3",
|
||||
"sha256_darwin": "0gm0zazwy053rip9h0ma2s53rc65b8pzy57x48ch0fpq7rrsbycp"
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
|
|
|
|||
|
|
@ -1,111 +0,0 @@
|
|||
{ stdenv
|
||||
, fetchgit
|
||||
, fetchurl
|
||||
|
||||
# common
|
||||
, zip
|
||||
|
||||
# HTTPS Everywhere
|
||||
, git
|
||||
, libxml2 # xmllint
|
||||
, python27
|
||||
, python27Packages
|
||||
, rsync
|
||||
}:
|
||||
|
||||
{
|
||||
https-everywhere = stdenv.mkDerivation rec {
|
||||
pname = "https-everywhere";
|
||||
version = "2017.10.4";
|
||||
|
||||
extid = "https-everywhere-eff@eff.org";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.torproject.org/https-everywhere.git";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "1g7971xygnhagnb25xjdf6mli6091ai9igx42d0ww88g8i0cqfzj";
|
||||
fetchSubmodules = true; # for translations, TODO: remove
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
libxml2 # xmllint
|
||||
python27
|
||||
python27Packages.lxml
|
||||
rsync
|
||||
zip
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
$shell ./makexpi.sh ${version} --no-recurse
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -m 444 -D pkg/https-everywhere-$version-eff.xpi "$out/$extid.xpi"
|
||||
'';
|
||||
};
|
||||
|
||||
noscript = stdenv.mkDerivation rec {
|
||||
pname = "noscript";
|
||||
version = "5.1.2";
|
||||
|
||||
extid = "{73a6fe31-595d-460b-a920-fcc0f8843232}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.informaction.com/download/releases/noscript-${version}.xpi";
|
||||
sha256 = "1fzspdiwhjabwz1yxb3gzj7giz9jbc1xxm65i93rvhzcp537cs42";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
install -m 444 -D $src "$out/$extid.xpi"
|
||||
'';
|
||||
};
|
||||
|
||||
torbutton = stdenv.mkDerivation rec {
|
||||
pname = "torbutton";
|
||||
version = "1.9.8.1";
|
||||
|
||||
extid = "torbutton@torproject.org";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.torproject.org/torbutton.git";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "1amp0c9ky0a7fsa0bcbi6n6ginw7s2g3an4rj7kvc1lxmrcsm65l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ zip ];
|
||||
|
||||
buildPhase = ''
|
||||
$shell ./makexpi.sh
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -m 444 -D pkg/torbutton-$version.xpi "$out/$extid.xpi"
|
||||
'';
|
||||
};
|
||||
|
||||
tor-launcher = stdenv.mkDerivation rec {
|
||||
pname = "tor-launcher";
|
||||
version = "0.2.13";
|
||||
|
||||
extid = "tor-launcher@torproject.org";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.torproject.org/tor-launcher.git";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "1f98v88y2clwvjiw77kxqc9cacp5h0489a540nc2wmsx7vnskrq0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ zip ];
|
||||
|
||||
buildPhase = ''
|
||||
make package
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -m 444 -D pkg/tor-launcher-$version.xpi "$out/$extid.xpi"
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -17,10 +17,10 @@ in
|
|||
mkFranzDerivation' rec {
|
||||
pname = "ferdi";
|
||||
name = "Ferdi";
|
||||
version = "5.6.0-beta.6";
|
||||
version = "5.6.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
|
||||
sha256 = "sha256-Q1HSAEVcaxFyOq7oWqa6AJJpsBKRxbsKb9ydyK/gH/A=";
|
||||
sha256 = "sha256-yaAYNQAvbtArw9qAtbTDD11a9nH2OQEPE8QLg1E79Yc=";
|
||||
};
|
||||
extraBuildInputs = [ xorg.libxshmfence ];
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder,
|
||||
attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus,
|
||||
prompt_toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3,
|
||||
setuptools, fetchpatch,
|
||||
setuptools, fetchpatch, installShellFiles,
|
||||
|
||||
pytest, faker, pytest-aiohttp, aioresponses,
|
||||
|
||||
|
|
@ -56,6 +56,10 @@ buildPythonApplication rec {
|
|||
aioresponses
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
# darwin has difficulty communicating with server, fails some integration tests
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
|
|
@ -63,6 +67,10 @@ buildPythonApplication rec {
|
|||
pytest
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installManPage docs/man/*.[1-9]
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An end-to-end encryption aware Matrix reverse proxy daemon";
|
||||
homepage = "https://github.com/matrix-org/pantalaimon";
|
||||
|
|
|
|||
|
|
@ -1,24 +1,40 @@
|
|||
{ spellChecking ? true
|
||||
, lib, stdenv, fetchurl, pkg-config, gtk3, gtkspell3 ? null
|
||||
, gmime2, gettext, intltool, itstool, libxml2, libnotify, gnutls
|
||||
, makeWrapper, gnupg
|
||||
, gnomeSupport ? true, libsecret, gcr
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, gtkspell3
|
||||
, gmime2
|
||||
, gettext
|
||||
, intltool
|
||||
, itstool
|
||||
, libxml2
|
||||
, libnotify
|
||||
, gnutls
|
||||
, makeWrapper
|
||||
, gnupg
|
||||
, gnomeSupport ? true
|
||||
, libsecret
|
||||
, gcr
|
||||
}:
|
||||
|
||||
assert spellChecking -> gtkspell3 != null;
|
||||
|
||||
let version = "0.146"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pan";
|
||||
inherit version;
|
||||
version = "0.146";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
|
||||
url = "https://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
|
||||
sha256 = "17agd27sn4a7nahvkpg0w39kv74njgdrrygs74bbvpaj8rk2hb55";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Take <glib.h>, <gmime.h>, "gtk-compat.h" out of extern "C"
|
||||
./move-out-of-extern-c.diff
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config gettext intltool itstool libxml2 makeWrapper ];
|
||||
|
||||
buildInputs = [ gtk3 gmime2 libnotify gnutls ]
|
||||
++ lib.optional spellChecking gtkspell3
|
||||
++ lib.optionals gnomeSupport [ libsecret gcr ];
|
||||
|
|
@ -29,7 +45,7 @@ stdenv.mkDerivation {
|
|||
"--with-gnutls"
|
||||
"--enable-libnotify"
|
||||
] ++ lib.optional spellChecking "--with-gtkspell"
|
||||
++ lib.optional gnomeSupport "--enable-gkr";
|
||||
++ lib.optional gnomeSupport "--enable-gkr";
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin
|
||||
|
|
@ -42,6 +58,6 @@ stdenv.mkDerivation {
|
|||
homepage = "http://pan.rebelbase.com/";
|
||||
maintainers = [ maintainers.eelco ];
|
||||
platforms = platforms.linux;
|
||||
license = with licenses; [ gpl2 fdl11 ];
|
||||
license = with licenses; [ gpl2Only fdl11 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -476,11 +476,11 @@
|
|||
md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "language-subtag-registry-2020-12-18.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-12-18.tar.bz2";
|
||||
sha256 = "62ce680d5db0f28001b64bd57db47f388c13629cdefc9af8e8af0fbe93689ba1";
|
||||
name = "language-subtag-registry-2021-03-05.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-03-05.tar.bz2";
|
||||
sha256 = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a";
|
||||
md5 = "";
|
||||
md5name = "62ce680d5db0f28001b64bd57db47f388c13629cdefc9af8e8af0fbe93689ba1-language-subtag-registry-2020-12-18.tar.bz2";
|
||||
md5name = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a-language-subtag-registry-2021-03-05.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "JLanguageTool-1.7.0.tar.bz2";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ rec {
|
|||
|
||||
major = "7";
|
||||
minor = "1";
|
||||
patch = "3";
|
||||
patch = "4";
|
||||
tweak = "2";
|
||||
|
||||
subdir = "${major}.${minor}.${patch}";
|
||||
|
|
@ -17,13 +17,13 @@ rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
||||
sha256 = "1gr9c8kv7nc9kaag1sw9r36843pfba1my80afx7p0lxj0k8pzbrm";
|
||||
sha256 = "1jsskhnlyra7q6d12kkc8dxq5fgrnd8grl32bdck7j9hkwv6d13m";
|
||||
};
|
||||
|
||||
# FIXME rename
|
||||
translations = fetchSrc {
|
||||
name = "translations";
|
||||
sha256 = "09xkr6jmnwq55savw9xjsy8l8zcyflnsg4nfwhknvm3ls8sqj4w6";
|
||||
sha256 = "0cslzhp5ic1w7hnl6wbyxrxhczdmap1g1hh1nj9sgpw9iqdryqj7";
|
||||
};
|
||||
|
||||
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
|
||||
|
|
@ -31,6 +31,6 @@ rec {
|
|||
|
||||
help = fetchSrc {
|
||||
name = "help";
|
||||
sha256 = "0dc981vmxfdwlyfgq84axkr99d8chm1ypknj39v0cmaqn56lpwg0";
|
||||
sha256 = "091yhm1qkxgvv130a1yzmmikchvxvp8109mcdrlpybp4gc276l8q";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
, uhd
|
||||
, SDL
|
||||
, gsl
|
||||
, soapysdr
|
||||
, libsodium
|
||||
, libsndfile
|
||||
, libunwind
|
||||
|
|
@ -44,14 +45,14 @@
|
|||
, pname ? "gnuradio"
|
||||
, versionAttr ? {
|
||||
major = "3.9";
|
||||
minor = "1";
|
||||
minor = "2";
|
||||
patch = "0";
|
||||
}
|
||||
, fetchSubmodules ? false
|
||||
}:
|
||||
|
||||
let
|
||||
sourceSha256 = "0zydmrr3gkaqiv4jv8f42awrfzs177bqb349q34rnr6j3d32z2vp";
|
||||
sourceSha256 = "01wyqazrpphmb0fl69j93k0w4vm4d1l4177m1fyg7qx8hzia0aaq";
|
||||
featuresInfo = {
|
||||
# Needed always
|
||||
basic = {
|
||||
|
|
@ -205,6 +206,12 @@ let
|
|||
gr-network = {
|
||||
cmakeEnableFlag = "GR_NETWORK";
|
||||
};
|
||||
gr-soapy = {
|
||||
cmakeEnableFlag = "GR_SOAPY";
|
||||
runtime = [
|
||||
soapysdr
|
||||
];
|
||||
};
|
||||
};
|
||||
shared = (import ./shared.nix {
|
||||
inherit
|
||||
|
|
@ -233,6 +240,7 @@ stdenv.mkDerivation rec {
|
|||
src
|
||||
nativeBuildInputs
|
||||
buildInputs
|
||||
cmakeFlags
|
||||
disallowedReferences
|
||||
stripDebugList
|
||||
doCheck
|
||||
|
|
@ -248,25 +256,9 @@ stdenv.mkDerivation rec {
|
|||
} // lib.optionalAttrs (hasFeature "gr-qtgui" features) {
|
||||
inherit (libsForQt5) qwt;
|
||||
};
|
||||
cmakeFlags = shared.cmakeFlags
|
||||
# From some reason, if these are not set, libcodec2 and gsm are not
|
||||
# detected properly.
|
||||
++ lib.optionals (hasFeature "gr-vocoder" features) [
|
||||
"-DLIBCODEC2_FOUND=TRUE"
|
||||
"-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so"
|
||||
"-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include"
|
||||
"-DLIBCODEC2_HAS_FREEDV_API=ON"
|
||||
"-DLIBGSM_FOUND=TRUE"
|
||||
"-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so"
|
||||
"-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm"
|
||||
]
|
||||
;
|
||||
|
||||
postInstall = shared.postInstall
|
||||
# This is the only python reference worth removing, if needed.
|
||||
# Even if python support is enabled, and we don't care about this
|
||||
# reference, pybind's path is not properly set. See:
|
||||
# https://github.com/gnuradio/gnuradio/issues/4380
|
||||
+ lib.optionalString (!hasFeature "python-support" features) ''
|
||||
${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake
|
||||
${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime.so)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, git, lib, makeWrapper, nettools, perl }:
|
||||
{ stdenv, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, perlPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gitolite";
|
||||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/gitolite-shell \
|
||||
--prefix PATH : ${lib.makeBinPath [ git perl ]}
|
||||
--prefix PATH : ${lib.makeBinPath [ git (perl.withPackages (p: [ p.JSON ])) ]}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "1.5.2";
|
||||
version = "1.5.4";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ buildGoModule rec {
|
|||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RDLAmPBjDHCx9al+gstUTrvKc/L0vAm8IEd/mvX5Als=";
|
||||
sha256 = "sha256-VV1cxA8tDRiPDxKV8OGu3T7sgutmyL+VPNqTeFcVjJA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ const gchar *create_tmpdir() {
|
|||
void pivot_host(const gchar *guest) {
|
||||
g_autofree gchar *point = g_build_filename(guest, "host", NULL);
|
||||
fail_if(g_mkdir(point, 0755));
|
||||
fail_if(mount(0, "/", 0, MS_PRIVATE | MS_REC, 0));
|
||||
fail_if(pivot_root(guest, point));
|
||||
}
|
||||
|
||||
|
|
@ -122,6 +121,9 @@ int main(gint argc, gchar **argv) {
|
|||
fail("unshare", unshare_errno);
|
||||
}
|
||||
|
||||
// hide all mounts we do from the parent
|
||||
fail_if(mount(0, "/", 0, MS_PRIVATE | MS_REC, 0));
|
||||
|
||||
if (uid != 0) {
|
||||
spit("/proc/self/setgroups", "deny");
|
||||
spit("/proc/self/uid_map", "%d %d 1", uid, uid);
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ in rec {
|
|||
gnomeExtensions = lib.recurseIntoAttrs (
|
||||
(mapReadableNames (produceExtensionsList "40"))
|
||||
// (callPackage ./manuallyPackaged.nix {})
|
||||
// lib.optionalAttrs (config.allowAliases or false) {
|
||||
// lib.optionalAttrs (config.allowAliases or true) {
|
||||
unite-shell = gnomeExtensions.unite; # added 2021-01-19
|
||||
arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
, config
|
||||
, glib
|
||||
, libxml2
|
||||
, ffmpeg_3
|
||||
, ffmpeg
|
||||
, libxslt
|
||||
, libGL
|
||||
, freetype
|
||||
|
|
@ -168,7 +168,7 @@ let result = stdenv.mkDerivation rec {
|
|||
* libXt is only needed on amd64
|
||||
*/
|
||||
libraries =
|
||||
[stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
|
||||
[stdenv.cc.libc glib libxml2 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
|
||||
lib.optionals swingSupport [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc];
|
||||
|
||||
rpath = lib.strings.makeLibraryPath libraries;
|
||||
|
|
|
|||
|
|
@ -8,18 +8,22 @@
|
|||
, cppunit
|
||||
, log4cpp
|
||||
, osmosdr
|
||||
, gmp
|
||||
, mpir
|
||||
, fftwFloat
|
||||
, icu
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "gr-ais";
|
||||
version = "2015-12-20";
|
||||
version = "2020-08-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bistromath";
|
||||
repo = "gr-ais";
|
||||
rev = "cdc1f52745853f9c739c718251830eb69704b26e";
|
||||
sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6";
|
||||
rev = "2162103226f3dae43c8c2ab23b79483b84346665";
|
||||
sha256 = "1vackka34722d8pcspfwj0j6gc9ic7dqq64sgkrpjm94sh3bmb0b";
|
||||
};
|
||||
disabledForGRafter = "3.8";
|
||||
disabledForGRafter = "3.9";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
@ -32,6 +36,10 @@ mkDerivation rec {
|
|||
osmosdr
|
||||
boost
|
||||
log4cpp
|
||||
gmp
|
||||
mpir
|
||||
fftwFloat
|
||||
icu
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, nix-update-script, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "editline";
|
||||
version = "1.17.0";
|
||||
version = "1.17.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "troglobit";
|
||||
repo = "editline";
|
||||
rev = version;
|
||||
sha256 = "0vjm42y6zjmi6hdcng0l7wkksw7s50agbmk5dxsc3292q8mvq8v6";
|
||||
sha256 = "sha256-0FeDUVCUahbweH24nfaZwa7j7lSfZh1TnQK7KYqO+3g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-for-multiline-as-one-line.patch";
|
||||
url = "https://github.com/troglobit/editline/commit/ceee039cfc819c8e09eebbfca192091b0cf8df75.patch";
|
||||
sha256 = "149fmfva05ghzwkd0bq1sahdbkys3qyyky28ssqb5jq7q9hw3ddm";
|
||||
name = "fix-for-home-end-in-tmux.patch";
|
||||
url = "https://github.com/troglobit/editline/commit/265c1fb6a0b99bedb157dc7c320f2c9629136518.patch";
|
||||
sha256 = "sha256-9fhQH0hT8BcykGzOUoT18HBtWjjoXnePSGDJQp8GH30=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -22,11 +22,15 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "out" "dev" "man" "doc" ];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://troglobit.com/editline.html";
|
||||
homepage = "https://troglobit.com/projects/editline/";
|
||||
description = "A readline() replacement for UNIX without termcap (ncurses)";
|
||||
license = licenses.bsdOriginal;
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
maintainers = with maintainers; [ dtzWill oxalica ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -226,6 +226,28 @@ stdenv.mkDerivation ({
|
|||
libc_cv_c_cleanup=yes
|
||||
libc_cv_gnu89_inline=yes
|
||||
EOF
|
||||
|
||||
# ./configure has logic like
|
||||
#
|
||||
# AR=`$CC -print-prog-name=ar`
|
||||
#
|
||||
# This searches various directories in the gcc and its wrapper. In nixpkgs,
|
||||
# this returns the bare string "ar", which is build ar. This can result as
|
||||
# a build failure with the following message:
|
||||
#
|
||||
# libc_pic.a: error adding symbols: archive has no index; run ranlib to add one
|
||||
#
|
||||
# (Observed cross compiling from aarch64-linux -> armv7l-linux).
|
||||
#
|
||||
# Nixpkgs passes a correct value for AR and friends, so to use the correct
|
||||
# set of tools, we only need to delete this special handling.
|
||||
sed -i \
|
||||
-e '/^AR=/d' \
|
||||
-e '/^AS=/d' \
|
||||
-e '/^LD=/d' \
|
||||
-e '/^OBJCOPY=/d' \
|
||||
-e '/^OBJDUMP=/d' \
|
||||
$configureScript
|
||||
'';
|
||||
|
||||
preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH";
|
||||
|
|
|
|||
|
|
@ -18,21 +18,21 @@ let
|
|||
url = "https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${arpaVer}.tar.bz2";
|
||||
sha256 = "0bqy3l7mif0yygjrcm65qallszgn17mvgyxhvz7a54zaamyan6vm";
|
||||
};
|
||||
dictVer = "20200715";
|
||||
dictVer = "20210402";
|
||||
dict = fetchurl {
|
||||
url = "https://download.fcitx-im.org/data/dict.utf8-${dictVer}.tar.xz";
|
||||
sha256 = "1ln7r64j8mc7wz4j0q4v8wd68wy7qqz4bz1dpxk7zqbdvza6rhr3";
|
||||
sha256 = "sha256-gYz7tama5bQMJwe2FYc09KEBlkRIU0AMvWsUUFWS2A0=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libime";
|
||||
version = "1.0.3";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "libime";
|
||||
rev = version;
|
||||
sha256 = "sha256-Ykj4/3yKUqK0BRqW1E2zFYNgeUOXQ1DsotmKU6c8vEg=";
|
||||
sha256 = "sha256-q/SXS6pT4vBkCkCTarPVHrZPXijYnc2t51YGRvzQ0FY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xcb-imdkit";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "xcb-imdkit";
|
||||
rev = version;
|
||||
sha256 = "sha256-ISaVsMtDsyfhbhsAwDSWkQ7ZcpNtvC7M9NFQsWA5ju8=";
|
||||
sha256 = "sha256-IPuTRSgmrnCJRgGWcE4JRaxd0sGCcHrKRnn2B1OdDMU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
}:
|
||||
let
|
||||
pname = "github-actions-runner";
|
||||
version = "2.278.0";
|
||||
version = "2.279.0";
|
||||
|
||||
deps = (import ./deps.nix { inherit fetchurl; });
|
||||
nugetPackages = map
|
||||
|
|
@ -41,6 +41,10 @@ let
|
|||
# Online tests
|
||||
(x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}")
|
||||
[
|
||||
"CompositeActionWithActionfile_CompositeContainerNested"
|
||||
"CompositeActionWithActionfile_CompositePrestepNested"
|
||||
"CompositeActionWithActionfile_MaxLimit"
|
||||
"CompositeActionWithActionfile_Node"
|
||||
"DownloadActionFromGraph"
|
||||
"DownloadActionFromGraph_Legacy"
|
||||
"NotPullOrBuildImagesMultipleTimes"
|
||||
|
|
@ -80,8 +84,8 @@ stdenv.mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "actions";
|
||||
repo = "runner";
|
||||
rev = "62d926efce35d3ea16d7624a25aaa5b300737def"; # v${version}
|
||||
sha256 = "sha256-KAb14739DYnuNIf7ZNZk5CShye6XFGn8aLu8BAcuT/c=";
|
||||
rev = "6b75179ec79e2041b3b5b4e9206b73db2d206aac"; # v${version}
|
||||
sha256 = "sha256-d7LAHL8Ff7R++d1HuLxWjtiBZRogySe7xHY/xJAcFms=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -123,6 +127,11 @@ stdenv.mkDerivation rec {
|
|||
--replace 'dotnet test Test/Test.csproj' \
|
||||
"dotnet test Test/Test.csproj --filter '${testFilterXml}'"
|
||||
|
||||
# We don't use a Git checkout
|
||||
substituteInPlace src/dir.proj \
|
||||
--replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \
|
||||
'echo Patched out.'
|
||||
|
||||
# Fix FHS path
|
||||
substituteInPlace src/Test/L0/Util/IOUtilL0.cs \
|
||||
--replace '/bin/ln' '${coreutils}/bin/ln'
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ mkDerivation, base, containers, fetchgit, hedgehog
|
||||
, optparse-applicative, parsec, lib, template-haskell, text
|
||||
{ mkDerivation, base, containers, fetchgit, hedgehog, lib
|
||||
, optparse-applicative, parsec, template-haskell, text
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "dconf2nix";
|
||||
version = "0.0.7";
|
||||
version = "0.0.8";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/gvolpe/dconf2nix.git";
|
||||
sha256 = "04p8di1ckv5fkfa61pjg5xp8vcw091lz1kw39lh4w8ks2zjwaha1";
|
||||
rev = "34c523e920b79208c3b4c0ad371900b0948799f7";
|
||||
sha256 = "19jk3p0ys3lbqk21lm37a7alkg2vhnmkvcffjqfxrw8p4737hxid";
|
||||
rev = "6bf3d7d4ca9f553a9e1ba4a70a65640114d230b2";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
isLibrary = true;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metals";
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${pname}-deps-${version}";
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "1psmsiwd3xlbrvkdvr2zgs2b66kw8w2jvvqa399g7jhixh2fpbx4";
|
||||
outputHash = "0pjgnm5argmc92872vblsz0pw2wniggvkw4w2346ps09ybdv9r3q";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
# Sourcetrail attempts to copy clang headers from the LLVM store path
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "\''${LLVM_BINARY_DIR}" '${llvmPackages.clang-unwrapped}'
|
||||
--replace "\''${LLVM_BINARY_DIR}" '${lib.getLib llvmPackages.clang-unwrapped}'
|
||||
|
||||
patchShebangs script
|
||||
ln -sf ${installJavaIndexer} script/update_java_indexer.sh
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,10 +1,17 @@
|
|||
{ rustPlatform, fetchFromGitHub, lib, openssl, pkg-config, stdenv, curl, Security
|
||||
{ rustPlatform
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, openssl
|
||||
, pkg-config
|
||||
, stdenv
|
||||
, curl
|
||||
, Security
|
||||
, runCommand
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasm-bindgen-cli";
|
||||
version = "0.2.73";
|
||||
version = "0.2.74";
|
||||
|
||||
src =
|
||||
let
|
||||
|
|
@ -12,9 +19,10 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "rustwasm";
|
||||
repo = "wasm-bindgen";
|
||||
rev = version;
|
||||
sha256 = "sha256-JrfS9Z/ZqhoZXJxrxMSLpl2NiktTUkjW6q3xN9AU2zw=";
|
||||
hash = "sha256-GsraYfWzUZjFpPpufTyXF0i2llBzjh04iTKio6m4NRA=";
|
||||
};
|
||||
in runCommand "source" { } ''
|
||||
in
|
||||
runCommand "source" { } ''
|
||||
cp -R ${tarball} $out
|
||||
chmod -R +w $out
|
||||
cp ${./Cargo.lock} $out/Cargo.lock
|
||||
|
|
@ -23,7 +31,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
cargoSha256 = "sha256-GUdoOms4FrNmPkELFX1PXcU/ww7CSN8JGHoCvnm73PQ=";
|
||||
cargoHash = "sha256-djeI7kSGRHMpXnsbVlM2CDek02u5tFAsyAdHwbKC0y8=";
|
||||
cargoBuildFlags = [ "-p" pname ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, nixosTests, jre_headless }:
|
||||
stdenv.mkDerivation {
|
||||
pname = "minecraft-server";
|
||||
version = "1.16.5";
|
||||
version = "1.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar";
|
||||
url = "https://launcher.mojang.com/v1/objects/0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e/server.jar";
|
||||
# sha1 because that comes from mojang via api
|
||||
sha1 = "1b557e7b033b583cd9f66746b7a9ab1ec1673ced";
|
||||
sha1 = "0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e";
|
||||
};
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,58 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, autoconf
|
||||
, automake
|
||||
, SDL
|
||||
, SDL_mixer
|
||||
, libpng
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "powermanga";
|
||||
version = "0.93.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://linux.tlk.fr/games/Powermanga/download/powermanga-${version}.tgz";
|
||||
sha256 = "sha256-2nU/zoOQWm2z/Y6mXHDFfWYjYshsQp1saVRBcUT5Q+g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL
|
||||
SDL_mixer
|
||||
libpng
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
./bootstrap
|
||||
'';
|
||||
|
||||
installFlags = [
|
||||
# Default is $(out)/games
|
||||
"gamesdir=$(out)/bin"
|
||||
# We set the scoredir to $TMPDIR.
|
||||
# Otherwise it will try to write in /var/games at install time
|
||||
"scoredir=$(TMPDIR)"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://linux.tlk.fr/games/Powermanga/";
|
||||
downloadPage = "https://linux.tlk.fr/games/Powermanga/download/";
|
||||
description = "An arcade 2D shoot-em-up game";
|
||||
longDescription = ''
|
||||
Powermanga is an arcade 2D shoot-em-up game with 41 levels and more than
|
||||
200 sprites. It runs in 320x200 or 640x400 pixels, with Window mode or
|
||||
full screen and support for 8, 15, 16, 24, and 32 bpp. As you go through
|
||||
the levels, you will destroy enemy spaceships and bosses, collect gems to
|
||||
power up your ship and get special powers, helpers and weapons.
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,68 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, autoconf
|
||||
, automake
|
||||
, SDL
|
||||
, SDL_mixer
|
||||
, SDL_image
|
||||
, libmikmod
|
||||
, tinyxml
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tecnoballz";
|
||||
version = "0.93.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://linux.tlk.fr/games/TecnoballZ/download/tecnoballz-${version}.tgz";
|
||||
sha256 = "sha256-WRW76e+/eXE/KwuyOjzTPFQnKwNznbIrUrz14fnvgug=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL
|
||||
SDL_mixer
|
||||
SDL_image
|
||||
libmikmod
|
||||
tinyxml
|
||||
];
|
||||
|
||||
# Newer compilers introduced warnings
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac \
|
||||
--replace "-Werror" ""
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
./bootstrap
|
||||
'';
|
||||
|
||||
installFlags = [
|
||||
# Default is $(out)/games
|
||||
"gamesdir=$(out)/bin"
|
||||
# We set the scoredir to $TMPDIR at install time.
|
||||
# Otherwise it will try to write in /var/games at install time
|
||||
"scoredir=$(TMPDIR)"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://linux.tlk.fr/games/TecnoballZ/";
|
||||
downloadPage = "https://linux.tlk.fr/games/TecnoballZ/download/";
|
||||
description = "A brick breaker game with a sophisticated system of weapons and bonuses";
|
||||
longDescription = ''
|
||||
A exciting Brick Breaker with 50 levels of game and 11 special levels,
|
||||
distributed on the 2 modes of game to give the player a sophisticated
|
||||
system of attack weapons with an enormous power of fire that can be build
|
||||
by gaining bonuses. Numerous decors, musics and sounds complete this great
|
||||
game. This game was ported from the Commodore Amiga.
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "firmware-linux-nonfree";
|
||||
version = "2021-05-11";
|
||||
version = "2021-07-16";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
|
||||
rev = "refs/tags/" + lib.replaceStrings ["-"] [""] version;
|
||||
sha256 = "015hajf3mq8dv2hw5wsyvi34zdqiwxp9p5dwdp8nrk4r9z5ysqxw";
|
||||
sha256 = "185pnaqf2qmhbcdvvldmbar09zgaxhh3h8x9bxn6079bcdpaskn6";
|
||||
};
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
|
|
@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "034bwbl616vzl7lhcbvyz9dzmpzwi12vca3r5mszdxqh3z3s1g6a";
|
||||
outputHash = "0g470hj2ylpviijfpjqzsndn2k8kkscj27wqwk51xlk8cr3mrahb";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Binary firmware collection packaged by kernel.org";
|
||||
|
|
|
|||
|
|
@ -27,10 +27,10 @@ rec {
|
|||
else legacy_390;
|
||||
|
||||
beta = generic {
|
||||
version = "465.27";
|
||||
sha256_64bit = "fmn/qFve5qqqa26n4dsoOwGZ+ash5Bon3JBI8kncMXE=";
|
||||
settingsSha256 = "3BFLCx0dcrQY4Mv1joMsiVPwTPyufgsNT5pFgp1Mk/A=";
|
||||
persistencedSha256 = "HtoFGTiBnAeQyRTOMlve5poaQh63LHRD+DHJxZO+c90=";
|
||||
version = "465.31";
|
||||
sha256_64bit = "YAjQAckzWGMEnDOOe6arlkBvT3rzFCeqjBjG0ncnLNo=";
|
||||
settingsSha256 = "33zHXxfG/t6REbHqhYjzBhtuus7jP34r2wK90sBT9vE=";
|
||||
persistencedSha256 = "1r/QqjOxg6836mQ46hNsPscKliNAtpN9xW6M++02woY=";
|
||||
};
|
||||
|
||||
# Vulkan developer beta driver
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkg-config, libusb1, hwdata , python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "usbutils-012";
|
||||
name = "usbutils-013";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz";
|
||||
sha256 = "0iiy0q7fzikavmdsjsb0sl9kp3gfh701qwyjjccvqh0qz4jlcqw8";
|
||||
sha256 = "0f0klk6d3hmbpf6p4dcwa1qjzblmkhbxs1wsw87aidvqri7lj8wy";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -51,11 +51,11 @@
|
||||
usbreset.c
|
||||
@@ -61,7 +61,7 @@ EXTRA_DIST = \
|
||||
LICENSES/GPL-3.0-only.txt
|
||||
|
||||
lsusb.py: $(srcdir)/lsusb.py.in
|
||||
- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
|
||||
|
|
@ -9,8 +9,3 @@
|
|||
chmod 755 $@
|
||||
|
||||
lsusb.8: $(srcdir)/lsusb.8.in
|
||||
- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
|
||||
+ sed 's|VERSION|$(VERSION)|g;s|@usbids@|@hwdata@/share/hwdata/usb.ids|g' $< >$@
|
||||
|
||||
usb-devices.1: $(srcdir)/usb-devices.1.in
|
||||
sed 's|VERSION|$(VERSION)|g' $< >$@
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dovecot";
|
||||
version = "2.3.15";
|
||||
version = "2.3.16";
|
||||
|
||||
nativeBuildInputs = [ perl pkg-config ];
|
||||
buildInputs =
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "141manrh54cy8xizr7f8fsa3vdzc2ccfgdz87l9rjylm8mfxvfr1";
|
||||
sha256 = "04ngqv5mml5z0i4p7fkchp4xw2awy7x7mq2mim9frnav0m9iv9q3";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ let
|
|||
dovecotMajorMinor = lib.versions.majorMinor dovecot.version;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "dovecot-pigeonhole";
|
||||
version = "0.5.15";
|
||||
version = "0.5.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz";
|
||||
sha256 = "1l2h0p8ddsl3ja2lnwk0mfqplqh8n0iw8k27awd3ak7prr88yjg1";
|
||||
sha256 = "0f79qsiqnhaxn7mrrfcrnsjyv6357kzb7wa0chhfd69vwa06g8sw";
|
||||
};
|
||||
|
||||
buildInputs = [ dovecot openssl ];
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.23.0.4482-62106842a";
|
||||
version = "1.23.1.4602-280ab6053";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "0i4cfnzlzxh3vwd8kivy0dy6wg102j96v7p3mpivkwj15kjrl01v";
|
||||
sha256 = "0q0drm9x7c1c14ja21pzy4cl03am37gp78s6djbpk4sgxwvvyhic";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "0yh30712m23hmpqc4b83pbmadgslq72z8lc4prx2kp01n3p5hfkq";
|
||||
sha256 = "0hz6572yj9wfq4sri76cjyzz4xmfvf8jlzvxqhsk4r05d8kbxrli";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,7 @@
|
|||
#! /usr/bin/env perl
|
||||
|
||||
# Usage:
|
||||
#
|
||||
# manually update tarballs.list
|
||||
# then run: cat tarballs.list | perl ./generate-expr-from-tarballs.pl
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell --pure --keep NIX_PATH -i perl -p cacert nix perl
|
||||
|
||||
# Usage: manually update tarballs.list then run: ./generate-expr-from-tarballs.pl tarballs.list
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ with lib;
|
|||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.11.9"; # also update communityModules
|
||||
version = "0.11.10"; # also update communityModules
|
||||
pname = "prosody";
|
||||
# The following community modules are necessary for the nixos module
|
||||
# prosody module to comply with XEP-0423 and provide a working
|
||||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
src = fetchurl {
|
||||
url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
|
||||
sha256 = "02gzvsaq0l5lx608sfh7hfz14s6yfsr4sr4kzcsqd1cxljp35h6c";
|
||||
sha256 = "1q84s9cq7cgzd295qxa2iy0r3vd3v3chbck62bdx3pd6skk19my6";
|
||||
};
|
||||
|
||||
# A note to all those merging automated updates: Please also update this
|
||||
|
|
@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
|
|||
# version.
|
||||
communityModules = fetchhg {
|
||||
url = "https://hg.prosody.im/prosody-modules";
|
||||
rev = "c149edb37349";
|
||||
sha256 = "1njw17k0nhf15hc20l28v0xzcc7jha85lqy3j97nspv9zdxmshk1";
|
||||
rev = "64fafbeba14d";
|
||||
sha256 = "02gj1b8sdmdvymsdmjpq47zrl7sg578jcdxbbq18s44f3njmc9q1";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,18 +4,18 @@ let
|
|||
p = if stdenv.is64bit then {
|
||||
arch = "x86_64";
|
||||
gcclib = "${stdenv.cc.cc.lib}/lib64";
|
||||
sha256 = "14bpc5ddhxvgfxkxhj5q9z443s7z4nn1zf4k1hxj7rbf13rcpg00";
|
||||
sha256 = "e4f579963199f05476657f0066beaa32d1261aef2203382f3919e1ed4bc4594e";
|
||||
}
|
||||
else {
|
||||
arch = "i386";
|
||||
gcclib = "${stdenv.cc.cc.lib}/lib";
|
||||
sha256 = "1s829q8gy9xgz0jm7w70aljqs2h49x402blqfr9zvn806aprmrm5";
|
||||
sha256 = "69113bf33ba0c57a363305b76361f2866c3b8394b173eed0f49db1f50bfe0373";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "yandex-disk";
|
||||
version = "0.1.5.1039";
|
||||
version = "0.1.6.1074";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${pname}-${version}-1.fedora.${p.arch}.rpm";
|
||||
|
|
|
|||
|
|
@ -41,13 +41,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5";
|
||||
version = "5.0.4";
|
||||
version = "5.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-2KGdR1m70Qatidzf/DZuFK3lc1t8z7sxjyhaxuc0Tqg=";
|
||||
sha256 = "0czj2awvgk9apdh9rj3vcb04g8x2wp1d4sshvch31nwpqs10hssr";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@ in
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "fcitx5-chinese-addons";
|
||||
version = "5.0.3";
|
||||
version = "5.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5-chinese-addons";
|
||||
rev = version;
|
||||
sha256 = "sha256-kCihpRUtUXrqqf7FPQp8ZRexiygOuDVOdQwVx7tSn+c=";
|
||||
sha256 = "sha256-+DhXFqUxECGZYHAmEw5cZJQnRHHgvT0nVVqY9DXgWBU=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "fcitx5-configtool";
|
||||
version = "5.0.4";
|
||||
version = "5.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5-configtool";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-UO3Ob+bFQ/2Vqb8YpD9tfmfZt5YLUyoqcbtsHLaVOzE=";
|
||||
sha256 = "0w6cgg57ldk02j3fs7mm8pn5inblcjyr20d3xl5qbyawwccjsn2m";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -4,9 +4,11 @@
|
|||
, extra-cmake-modules
|
||||
, fcitx5
|
||||
, gobject-introspection
|
||||
, glib
|
||||
, gtk2
|
||||
, gtk3
|
||||
, gtk4
|
||||
, fmt
|
||||
, pcre
|
||||
, libuuid
|
||||
, libselinux
|
||||
|
|
@ -24,13 +26,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-gtk";
|
||||
version = "5.0.3";
|
||||
version = "5.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5-gtk";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-+BzXbZyzC3fvLqysufblk0zK9fAg5jslVdm/v3jz4B4=";
|
||||
sha256 = "0vcikqrxv1xxcdaiz3axgm7rpab4w8aciw838sbpa9l20dp8cnyq";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
@ -39,8 +41,10 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off";
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
gtk4
|
||||
fmt
|
||||
gobject-introspection
|
||||
fcitx5
|
||||
pcre
|
||||
|
|
@ -57,6 +61,11 @@ stdenv.mkDerivation rec {
|
|||
libXtst
|
||||
] ++ lib.optional withGTK2 gtk2;
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.concatMapStringsSep " " (s: "-isystem ${s}") [
|
||||
"${glib.dev}/include/gio-unix-2.0"
|
||||
"${glib.dev}/include/glib-2.0"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-lua";
|
||||
version = "5.0.4";
|
||||
version = "5.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5-lua";
|
||||
rev = version;
|
||||
sha256 = "sha256-1gKfFq+x/tCOYqESO49Qddp5z6zXO7ULjTJgDEl8BqI=";
|
||||
sha256 = "0x7b78rz9mdyhm3y8yi7kihah7fgqzjyfgqwjyfx3i90wxflnmmc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, cmake
|
||||
|
|
@ -12,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-rime";
|
||||
version = "5.0.4";
|
||||
version = "5.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5-rime";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-WB+bWvJxL2yywictNN8Zy0OYxiCRErQGL2dGH4zQPp8=";
|
||||
sha256 = "1r36c1pl63vka9mxa8f5x0kijapjgxzz5b4db8h87ri9kcxk7i2g";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-table-extra";
|
||||
version = "5.0.2";
|
||||
version = "5.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5-table-extra";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Bqxdi/rjiTKqHLvVFVcQMjz/I0xxTiBgUIRkZjLuK+M=";
|
||||
sha256 = "1rhm9jyqxlsgjsn3f5n9jwm5qjcgg87widp0bv1xa9cc23mydrqv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-table-other";
|
||||
version = "5.0.3";
|
||||
version = "5.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = "fcitx5-table-other";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-jJTFAOrBeRBoUn0mqqkX0z1zQnDOh7otMHDPmjuZbWw=";
|
||||
sha256 = "0z34y05sbb2qavpa6banv7xvlsmpymmm828265r8bf7r995wx8lz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i python3 -p nix-prefetch-github python3Packages.requests
|
||||
#!nix-shell -i python3 -p nix-update nix-prefetch-github python3Packages.requests
|
||||
|
||||
from nix_prefetch_github import *
|
||||
import json
|
||||
|
|
@ -12,8 +12,7 @@ REPOS = [ "libime", "xcb-imdkit", "fcitx5", "fcitx5-gtk", "fcitx5-qt", "fcitx5-c
|
|||
OWNER = "fcitx"
|
||||
|
||||
def get_latest_tag(repo, owner=OWNER):
|
||||
r = requests.get( 'https://api.github.com/repos/{}/{}/tags'.format(owner,repo)
|
||||
, auth=('poscat', 'db5e6fd16d0eb8c36385d3d944e058a1178b4265'))
|
||||
r = requests.get('https://api.github.com/repos/{}/{}/tags'.format(owner,repo))
|
||||
return r.json()[0].get("name")
|
||||
|
||||
def main():
|
||||
|
|
|
|||
|
|
@ -18,16 +18,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "silicon";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aloxaf";
|
||||
repo = "silicon";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ci0gq4rOQHBmFPvhXZseIlwnqAWd06/qg/i/luhV79s=";
|
||||
sha256 = "sha256-k+p8AEEL1BBJTmPc58QoIk7EOzu8QKdG00RQ58EN3bg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-sUPOf9er+BOMqDJ8C6+Xjjqj6NQUV2JTzGA4yUWtDWM=";
|
||||
cargoSha256 = "sha256-vpegobS7lpRkt/oZePW9WggYeg0JXDte8fQP/bf7oAI=";
|
||||
|
||||
buildInputs = [ llvmPackages.libclang expat freetype fira-code ]
|
||||
++ lib.optionals stdenv.isLinux [ libxcb ]
|
||||
|
|
|
|||
|
|
@ -55,10 +55,10 @@ let inherit (lib) optionals; in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "connman";
|
||||
version = "1.39";
|
||||
version = "1.40";
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-n2KnFpt0kcZwof8uM1sNlmMI+y9i4oXHgRBeuQ8YGvM=";
|
||||
sha256 = "sha256-GleufOI0qjoXRKrDvlwhIdmNzpmUQO+KucxO39XtyxI=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
|||
libmnl
|
||||
gnutls
|
||||
readline
|
||||
];
|
||||
] ++ optionals (enableOpenconnect) [ openconnect ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clamav";
|
||||
version = "0.103.2";
|
||||
version = "0.103.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-1LXQrGZiYuQjoyb7VHeMqnxpYk1sP5VCiV/rhHgnG9I=";
|
||||
sha256 = "sha256-n249GESfPRo5kncdaWaFJJ36EnNv4rKSmFjyx9gnauk=";
|
||||
};
|
||||
|
||||
# don't install sample config files into the absolute sysconfdir folder
|
||||
|
|
|
|||
|
|
@ -13566,7 +13566,9 @@ in
|
|||
|
||||
nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { };
|
||||
|
||||
nexus = callPackage ../development/tools/repository-managers/nexus { };
|
||||
nexus = callPackage ../development/tools/repository-managers/nexus {
|
||||
jre_headless = jre8_headless;
|
||||
};
|
||||
|
||||
nwjs = callPackage ../development/tools/nwjs {
|
||||
gconf = pkgs.gnome2.GConf;
|
||||
|
|
@ -28569,6 +28571,8 @@ in
|
|||
|
||||
pokerth-server = libsForQt5.callPackage ../games/pokerth { target = "server"; };
|
||||
|
||||
powermanga = callPackage ../games/powermanga { };
|
||||
|
||||
prboom = callPackage ../games/prboom { };
|
||||
|
||||
pysolfc = python3Packages.callPackage ../games/pysolfc { };
|
||||
|
|
@ -28789,6 +28793,8 @@ in
|
|||
|
||||
tbe = libsForQt5.callPackage ../games/the-butterfly-effect { };
|
||||
|
||||
tecnoballz = callPackage ../games/tecnoballz { };
|
||||
|
||||
teetertorture = callPackage ../games/teetertorture { };
|
||||
|
||||
teeworlds = callPackage ../games/teeworlds { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue