Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
b261cac75a
@ -67,6 +67,11 @@ in mkLicense lset) ({
|
||||
free = false;
|
||||
};
|
||||
|
||||
aom = {
|
||||
fullName = "Alliance for Open Media Patent License 1.0";
|
||||
url = "https://aomedia.org/license/patent-license/";
|
||||
};
|
||||
|
||||
apsl20 = {
|
||||
spdxId = "APSL-2.0";
|
||||
fullName = "Apple Public Source License 2.0";
|
||||
|
||||
@ -4573,6 +4573,12 @@
|
||||
githubId = 343415;
|
||||
name = "Greg Roodt";
|
||||
};
|
||||
gruve-p = {
|
||||
email = "groestlcoin@gmail.com";
|
||||
github = "gruve-p";
|
||||
githubId = 11212268;
|
||||
name = "gruve-p";
|
||||
};
|
||||
gschwartz = {
|
||||
email = "gsch@pennmedicine.upenn.edu";
|
||||
github = "GregorySchwartz";
|
||||
@ -11036,7 +11042,7 @@
|
||||
name = "Yann Hodique";
|
||||
};
|
||||
sikmir = {
|
||||
email = "sikmir@gmail.com";
|
||||
email = "sikmir@disroot.org";
|
||||
github = "sikmir";
|
||||
githubId = 688044;
|
||||
name = "Nikolay Korotkiy";
|
||||
|
||||
@ -105,6 +105,7 @@ mkdir -p $out/iso
|
||||
# version-5 UUID's work)
|
||||
xorriso="xorriso
|
||||
-boot_image any gpt_disk_guid=$(uuid -v 5 daed2280-b91e-42c0-aed6-82c825ca41f3 $out | tr -d -)
|
||||
-volume_date all_file_dates =$SOURCE_DATE_EPOCH
|
||||
-as mkisofs
|
||||
-iso-level 3
|
||||
-volid ${volumeID}
|
||||
|
||||
@ -734,13 +734,13 @@ in
|
||||
{ source = config.system.build.squashfsStore;
|
||||
target = "/nix-store.squashfs";
|
||||
}
|
||||
{ source = config.isoImage.splashImage;
|
||||
target = "/isolinux/background.png";
|
||||
}
|
||||
{ source = pkgs.writeText "version" config.system.nixos.label;
|
||||
target = "/version.txt";
|
||||
}
|
||||
] ++ optionals canx86BiosBoot [
|
||||
{ source = config.isoImage.splashImage;
|
||||
target = "/isolinux/background.png";
|
||||
}
|
||||
{ source = pkgs.substituteAll {
|
||||
name = "isolinux.cfg";
|
||||
src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg;
|
||||
@ -761,6 +761,9 @@ in
|
||||
{ source = (pkgs.writeTextDir "grub/loopback.cfg" "source /EFI/boot/grub.cfg") + "/grub";
|
||||
target = "/boot/grub";
|
||||
}
|
||||
{ source = config.isoImage.efiSplashImage;
|
||||
target = "/EFI/boot/efi-background.png";
|
||||
}
|
||||
] ++ optionals (config.boot.loader.grub.memtest86.enable && canx86BiosBoot) [
|
||||
{ source = "${pkgs.memtest86plus}/memtest.bin";
|
||||
target = "/boot/memtest.bin";
|
||||
@ -769,10 +772,6 @@ in
|
||||
{ source = config.isoImage.grubTheme;
|
||||
target = "/EFI/boot/grub-theme";
|
||||
}
|
||||
] ++ [
|
||||
{ source = config.isoImage.efiSplashImage;
|
||||
target = "/EFI/boot/efi-background.png";
|
||||
}
|
||||
];
|
||||
|
||||
boot.loader.timeout = 10;
|
||||
|
||||
@ -51,7 +51,10 @@ in {
|
||||
};
|
||||
|
||||
networking.firewall = mkIf cfg.openFirewall {
|
||||
allowedTCPPortRanges = [{ from = 9100; to = 9200; }];
|
||||
allowedTCPPortRanges = [
|
||||
{ from = 9100; to = 9200; }
|
||||
{ from = 9330; to = 9332; }
|
||||
];
|
||||
allowedUDPPorts = [ 9003 ];
|
||||
extraCommands = ''
|
||||
iptables -A INPUT -s 224.0.0.0/4 -j ACCEPT
|
||||
|
||||
@ -181,7 +181,6 @@ in
|
||||
hadoop.all = handleTestOn [ "x86_64-linux" ] ./hadoop/hadoop.nix {};
|
||||
hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {};
|
||||
hadoop.yarn = handleTestOn [ "x86_64-linux" ] ./hadoop/yarn.nix {};
|
||||
handbrake = handleTestOn ["x86_64-linux"] ./handbrake.nix {};
|
||||
haproxy = handleTest ./haproxy.nix {};
|
||||
hardened = handleTest ./hardened.nix {};
|
||||
hedgedoc = handleTest ./hedgedoc.nix {};
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
|
||||
let
|
||||
# Download Big Buck Bunny example, licensed under CC Attribution 3.0.
|
||||
testMkv = pkgs.fetchurl {
|
||||
url = "https://github.com/Matroska-Org/matroska-test-files/blob/cf0792be144ac470c4b8052cfe19bb691993e3a2/test_files/test1.mkv?raw=true";
|
||||
sha256 = "1hfxbbgxwfkzv85pvpvx55a72qsd0hxjbm9hkl5r3590zw4s75h9";
|
||||
name = "test1.mkv";
|
||||
};
|
||||
|
||||
in
|
||||
{
|
||||
name = "handbrake";
|
||||
|
||||
meta = {
|
||||
maintainers = with pkgs.lib.maintainers; [ ];
|
||||
};
|
||||
|
||||
machine = { pkgs, ... }: {
|
||||
environment.systemPackages = with pkgs; [ handbrake ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
# Test MP4 and MKV transcoding. Since this is a short clip, transcoding typically
|
||||
# only takes a few seconds.
|
||||
start_all()
|
||||
|
||||
machine.succeed("HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160")
|
||||
machine.succeed("test -e test.mp4")
|
||||
machine.succeed("HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160")
|
||||
machine.succeed("test -e test.mkv")
|
||||
'';
|
||||
})
|
||||
62
pkgs/applications/audio/indicator-sound-switcher/default.nix
Normal file
62
pkgs/applications/audio/indicator-sound-switcher/default.nix
Normal file
@ -0,0 +1,62 @@
|
||||
{ python3Packages
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, perlPackages
|
||||
, gettext
|
||||
, gtk3
|
||||
, gobject-introspection
|
||||
, intltool, wrapGAppsHook, glib
|
||||
, librsvg
|
||||
, libayatana-appindicator-gtk3
|
||||
, libpulseaudio
|
||||
, keybinder3
|
||||
, gdk-pixbuf
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "indicator-sound-switcher";
|
||||
version = "2.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yktoo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "APU8Y0xUhRd9RbMSG9TD0TBvFLu/VlLGauf56z8gZDw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace lib/indicator_sound_switcher/lib_pulseaudio.py \
|
||||
--replace "CDLL('libpulse.so.0')" "CDLL('${libpulseaudio}/lib/libpulse.so')"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
intltool
|
||||
wrapGAppsHook
|
||||
glib
|
||||
gdk-pixbuf
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
librsvg
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python3Packages.setuptools
|
||||
python3Packages.pygobject3
|
||||
gtk3
|
||||
gobject-introspection
|
||||
librsvg
|
||||
libayatana-appindicator-gtk3
|
||||
libpulseaudio
|
||||
keybinder3
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sound input/output selector indicator for Linux";
|
||||
homepage = "https://yktoo.com/en/software/sound-switcher-indicator/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ alexnortung ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
93
pkgs/applications/blockchains/groestlcoin/default.nix
Normal file
93
pkgs/applications/blockchains/groestlcoin/default.nix
Normal file
@ -0,0 +1,93 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, util-linux
|
||||
, hexdump
|
||||
, autoSignDarwinBinariesHook
|
||||
, wrapQtAppsHook ? null
|
||||
, boost
|
||||
, libevent
|
||||
, miniupnpc_2
|
||||
, zeromq
|
||||
, zlib
|
||||
, db53
|
||||
, sqlite
|
||||
, qrencode
|
||||
, qtbase ? null
|
||||
, qttools ? null
|
||||
, python3
|
||||
, withGui ? false
|
||||
, withWallet ? true
|
||||
}:
|
||||
|
||||
let
|
||||
version = "22.0";
|
||||
desktop = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/Groestlcoin/packaging/${version}/debian/groestlcoin-qt.desktop";
|
||||
sha256 = "0mxwq4jvcip44a796iwz7n1ljkhl3a4p47z7qlsxcfxw3zmm0k0k";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if withGui then "groestlcoin" else "groestlcoind";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Groestlcoin";
|
||||
repo = "groestlcoin";
|
||||
rev = "v${version}";
|
||||
sha256 = "104zzcigpk976iqyinjn6mw3l36zb1if7249iz44ds1zaxv3g1v1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ]
|
||||
++ lib.optionals stdenv.isLinux [ util-linux ]
|
||||
++ lib.optionals stdenv.isDarwin [ hexdump ]
|
||||
++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]
|
||||
++ lib.optionals withGui [ wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ boost libevent miniupnpc_2 zeromq zlib ]
|
||||
++ lib.optionals withWallet [ db53 sqlite ]
|
||||
++ lib.optionals withGui [ qrencode qtbase qttools ];
|
||||
|
||||
postInstall = lib.optionalString withGui ''
|
||||
install -Dm644 ${desktop} $out/share/applications/groestlcoin-qt.desktop
|
||||
substituteInPlace $out/share/applications/groestlcoin-qt.desktop --replace "Icon=groestlcoin128" "Icon=groestlcoin"
|
||||
install -Dm644 share/pixmaps/groestlcoin256.png $out/share/pixmaps/groestlcoin.png
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
"--disable-bench"
|
||||
] ++ lib.optionals (!withWallet) [
|
||||
"--disable-wallet"
|
||||
] ++ lib.optionals withGui [
|
||||
"--with-gui=qt5"
|
||||
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
|
||||
];
|
||||
|
||||
checkInputs = [ python3 ];
|
||||
|
||||
checkFlags = [ "LC_ALL=en_US.UTF-8" ]
|
||||
# QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Groestlcoin's GUI.
|
||||
# See also https://github.com/NixOS/nixpkgs/issues/24256
|
||||
++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Peer-to-peer electronic cash system";
|
||||
longDescription = ''
|
||||
Groestlcoin is a free open source peer-to-peer electronic cash system that is
|
||||
completely decentralized, without the need for a central server or trusted
|
||||
parties. Users hold the crypto keys to their own money and transact directly
|
||||
with each other, with the help of a P2P network to check for double-spending.
|
||||
'';
|
||||
homepage = "https://groestlcoin.org/";
|
||||
downloadPage = "https://github.com/Groestlcoin/groestlcoin/releases/tag/v{version}/";
|
||||
maintainers = with maintainers; [ gruve-p ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -2,8 +2,10 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, which
|
||||
, capstone
|
||||
, jansson
|
||||
, libunistring
|
||||
, lua5_3
|
||||
, wxGTK31
|
||||
, Carbon
|
||||
@ -15,30 +17,33 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rehex";
|
||||
version = "0.3.92";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solemnwarning";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-yZvJlomUpJwDJOBVSl49lU+JE1YMMs/BSzHepXoFlIY=";
|
||||
hash = "sha256-NuWWaYABQDaS9wkwmXkBJWHzLFJbUUCiePNQNo4yZrk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile.osx --replace 'iconutil -c icns -o $@ $(ICONSET)' \
|
||||
'png2icns $@ $(ICONSET)/icon_16x16.png $(ICONSET)/icon_32x32.png $(ICONSET)/icon_128x128.png $(ICONSET)/icon_256x256.png $(ICONSET)/icon_512x512.png'
|
||||
# See https://github.com/solemnwarning/rehex/pull/148
|
||||
substituteInPlace Makefile.osx \
|
||||
--replace '$(filter-out %@2x.png,$(wildcard $(ICONSET)/*.png))' 'res/icon{16,32,128,256,512}.png'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
nativeBuildInputs = [ pkg-config which ]
|
||||
++ lib.optionals stdenv.isDarwin [ libicns ];
|
||||
|
||||
buildInputs = [ capstone jansson lua5_3 ]
|
||||
buildInputs = [ capstone jansson libunistring lua5_3 ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ wxGTK31 ]
|
||||
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ];
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ]
|
||||
makeFlags = [ "prefix=${placeholder "out"}" ]
|
||||
++ lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Reverse Engineers' Hex Editor";
|
||||
longDescription = ''
|
||||
@ -46,7 +51,8 @@ stdenv.mkDerivation rec {
|
||||
engineering, and everything else.
|
||||
'';
|
||||
homepage = "https://github.com/solemnwarning/rehex";
|
||||
license = licenses.gpl2;
|
||||
changelog = "https://github.com/solemnwarning/rehex/raw/${version}/CHANGES.txt";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ markus1189 SuperSandro2000 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "AusweisApp2";
|
||||
version = "1.22.2";
|
||||
version = "1.22.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Governikus";
|
||||
repo = "AusweisApp2";
|
||||
rev = version;
|
||||
sha256 = "sha256-Oci1y6//45Gep4IS6Ym+v9MPCP5mOswAiWPkXqd+zR0=";
|
||||
sha256 = "sha256-Zh1rWMdRXPj/+80Sqvp9cbV5sDrNVBebPRGTTWM1DLk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clifm";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leo-arch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nYBGM3gUj1NGrxNLt0xpNl00cgS2Ecs3kYjZapiJT48=";
|
||||
sha256 = "sha256-62WxvJsXkzvDqFGFpid9VDB1mARgllkKnb6mFC5pdl8=";
|
||||
};
|
||||
|
||||
buildInputs = [ libcap acl file readline ];
|
||||
|
||||
34
pkgs/applications/misc/firefly-desktop/default.nix
Normal file
34
pkgs/applications/misc/firefly-desktop/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib, fetchurl, appimageTools }:
|
||||
|
||||
let
|
||||
pname = "firefly-desktop";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/iotaledger/firefly/releases/download/desktop-${version}/${pname}-${version}.AppImage";
|
||||
sha256 = "f3162efcf0407614fd1351af50e95ef180400b747a5cc6b82bc840828a15548d";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
in appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share/applications $out/share/pixmaps
|
||||
mv $out/bin/${pname}-${version} $out/bin/firefly-desktop
|
||||
cp ${appimageContents}/desktop.desktop $out/share/applications/firefly-desktop.desktop
|
||||
substituteInPlace $out/share/applications/firefly-desktop.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=firefly-desktop' \
|
||||
--replace 'Icon=desktop' 'Icon=firefly-desktop'
|
||||
cp ${appimageContents}/desktop.png $out/share/pixmaps/firefly-desktop.png
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "IOTA's New Wallet";
|
||||
homepage = "https://firefly.iota.org";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qcad";
|
||||
version = "3.27.1.0";
|
||||
version = "3.27.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qcad";
|
||||
repo = "qcad";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tydgSfS1MF322sgWULMEZ8P6YIaN1QoeJiia0wbsgjo=";
|
||||
sha256 = "sha256-DHDfDwGrYMRd5gxFaPL06B/wssQho9420MxUg8fI2r0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ttyper";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "max-niederman";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UptjgFGp4QNG8eLuqBzg/Kd5p5Rms3yT172hbf/2hi4=";
|
||||
sha256 = "sha256-e001uftwIwnCpjf4OH89QWaYyT99aMZhCPqDxyAsHyU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-N10X5eJlpDKmCEffEXpkAejS32Lz183Lup0mmLMwOSU=";
|
||||
cargoSha256 = "sha256-RvqktyPZtdKC8RVtLWpT1YYsdgyfHaL7W3+vO8RgG/8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal-based typing test";
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
|
||||
let
|
||||
pname = "zettlr";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
|
||||
sha256 = "sha256-neqgUXvCxjKQii3uOwXed0S/2FhWly/1tiHY2snyHrc=";
|
||||
sha256 = "sha256-gfq5eXSoEfOb3FVAv/iDDSGeEeZxFRp4BFtwf87WQGE=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
|
||||
@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zola";
|
||||
version = "0.15.2";
|
||||
version = "0.15.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getzola";
|
||||
repo = "zola";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-X4J3T/ob0NfCFxddadBtsPsDhfvesg6/sBJybWeubMM=";
|
||||
sha256 = "sha256-LK8twqWaS+SQ3oqvMGE7oP/IJNLvQ45Pu92pkbSKzDs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-0tynm/DTX2oiqZOdWjRBGPk8IPIN07x2+FCXQmQ4Fzo=";
|
||||
cargoSha256 = "sha256-7W0vjbAWZl/eKBZvUWWWolEOh8aQeKegt823EebcKMQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@ -40,10 +40,10 @@
|
||||
"owner": "aliyun",
|
||||
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.152.0",
|
||||
"sha256": "1childp3dkdi6raya1865inkky2qx1jav95yq9c57gz20zs27x8a",
|
||||
"rev": "v1.153.0",
|
||||
"sha256": "1h37sxzkngmikvmyj9isx45vcpd31ml47f4r6ii1h2l69182hsqs",
|
||||
"vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg",
|
||||
"version": "1.152.0"
|
||||
"version": "1.153.0"
|
||||
},
|
||||
"ansible": {
|
||||
"owner": "nbering",
|
||||
@ -67,10 +67,10 @@
|
||||
"owner": "alexkappa",
|
||||
"provider-source-address": "registry.terraform.io/alexkappa/auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v0.25.0",
|
||||
"sha256": "0ibscxhwj92k8p43apnxyl9sly7pldv0lgcikjfjj352084q4k62",
|
||||
"rev": "v0.26.1",
|
||||
"sha256": "03nzwsda6n1nycpk2w87b8fj6aqzid8i2fa29qd9skwplm7hyjfk",
|
||||
"vendorSha256": "0k6lylkcdvm0piaic8hdbhg1jf1vzc897w1sq7v57brx7586h3sc",
|
||||
"version": "0.25.0"
|
||||
"version": "0.26.1"
|
||||
},
|
||||
"avi": {
|
||||
"owner": "vmware",
|
||||
@ -94,10 +94,10 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v3.72.0",
|
||||
"sha256": "0xkwqh7akc7rf047w6by4368n2bpn4lijk9j6j3wsgbaffw0xjlb",
|
||||
"vendorSha256": "0apvp3vb3qx2l6698x4ai3spz40l6mb3z8gn45ms2vlxcwp2wf7y",
|
||||
"version": "3.72.0"
|
||||
"rev": "v3.73.0",
|
||||
"sha256": "0la188dljw15l09j2farlhgri0vhrlbmsay7q1ar2y4ralqlsgl8",
|
||||
"vendorSha256": "1h2x1318ax4qdy261wm8pqxq21ra50hymcykhw6mhj5lqxcb5r5z",
|
||||
"version": "3.73.0"
|
||||
},
|
||||
"azuread": {
|
||||
"owner": "hashicorp",
|
||||
@ -112,10 +112,10 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v2.92.0",
|
||||
"sha256": "0p4vxda4n7895xp7aqg4zqddynjn7hnzsc8am83y8hf9hbfaji8q",
|
||||
"rev": "v2.93.0",
|
||||
"sha256": "0akacaih0smdjxh9ssdir1j248m5bpcc4wpwhykb7922yvj581ds",
|
||||
"vendorSha256": null,
|
||||
"version": "2.92.0"
|
||||
"version": "2.93.0"
|
||||
},
|
||||
"azurestack": {
|
||||
"owner": "hashicorp",
|
||||
@ -139,10 +139,10 @@
|
||||
"owner": "F5Networks",
|
||||
"provider-source-address": "registry.terraform.io/F5Networks/bigip",
|
||||
"repo": "terraform-provider-bigip",
|
||||
"rev": "v1.12.1",
|
||||
"sha256": "0dpgxcdcpv6y25ffs0gp2pvq8z9yfh7hdqll25d0b09z0pqgb61q",
|
||||
"rev": "v1.12.2",
|
||||
"sha256": "08qs8psr4wy5f9qiv7chkmmsls19dwj2p2k6fqxdrd6pj2154rcg",
|
||||
"vendorSha256": null,
|
||||
"version": "1.12.1"
|
||||
"version": "1.12.2"
|
||||
},
|
||||
"brightbox": {
|
||||
"owner": "brightbox",
|
||||
@ -248,10 +248,10 @@
|
||||
"owner": "DataDog",
|
||||
"provider-source-address": "registry.terraform.io/DataDog/datadog",
|
||||
"repo": "terraform-provider-datadog",
|
||||
"rev": "v3.7.0",
|
||||
"sha256": "0fynbn0zbplslbvqz0jij4gm8q6ydg697x7nh5rzw89dy26l2f8g",
|
||||
"vendorSha256": "0ngvbc9h3csl811g40q707flf4dl1hal95hpkxsvz7p71s3371q8",
|
||||
"version": "3.7.0"
|
||||
"rev": "v3.8.1",
|
||||
"sha256": "0mvl80dsqzab1r3p5n446737dadzfbsyfbdy2w2xvmz4fgx6aklh",
|
||||
"vendorSha256": "0p8czqb4hn5z9bfgsfajdpx46hwil0ax75j8xljlh1ccvpp2rvyz",
|
||||
"version": "3.8.1"
|
||||
},
|
||||
"dhall": {
|
||||
"owner": "awakesecurity",
|
||||
@ -347,10 +347,10 @@
|
||||
"owner": "fastly",
|
||||
"provider-source-address": "registry.terraform.io/fastly/fastly",
|
||||
"repo": "terraform-provider-fastly",
|
||||
"rev": "v0.40.0",
|
||||
"sha256": "11gf1xmj0qgn3hfw4hviqnfc23rrfd3qxz82idff4f1i7c5kym1i",
|
||||
"rev": "v0.41.0",
|
||||
"sha256": "096dwysa1awyb4a1fay9sw1i784cki8q4x141f9gan5w1qwns89y",
|
||||
"vendorSha256": null,
|
||||
"version": "0.40.0"
|
||||
"version": "0.41.0"
|
||||
},
|
||||
"flexibleengine": {
|
||||
"owner": "FlexibleEngineCloud",
|
||||
@ -383,10 +383,10 @@
|
||||
"owner": "integrations",
|
||||
"provider-source-address": "registry.terraform.io/integrations/github",
|
||||
"repo": "terraform-provider-github",
|
||||
"rev": "v4.19.1",
|
||||
"sha256": "0dixdw0215ksa76871mac60k7y0vm111f3jay9njsa1ljz8rwhnd",
|
||||
"rev": "v4.19.2",
|
||||
"sha256": "0k6w1wxx9a67wkgh4j4aswbpcnlnjcvqnfi0gy2rw9kqbyxb9j0m",
|
||||
"vendorSha256": null,
|
||||
"version": "4.19.1"
|
||||
"version": "4.19.2"
|
||||
},
|
||||
"gitlab": {
|
||||
"owner": "gitlabhq",
|
||||
@ -402,20 +402,20 @@
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/google",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v4.6.0",
|
||||
"sha256": "0vi0crc4i5myzw17knvb3zz0yjpg7v1qvp9rjrb0q6v89nafr30c",
|
||||
"vendorSha256": "17rlq86zl83cav8pinr8am3wkmva4slab2izmxddhiw3na60a4la",
|
||||
"version": "4.6.0"
|
||||
"rev": "v4.7.0",
|
||||
"sha256": "15w69dyr0s818as7v8pwzdbfs82l23qn846a7xlihw2g49xk0cah",
|
||||
"vendorSha256": "144kv885w2gfsljj8vx7q9pgrpyshpn392162ljzpjb6qx3qzzxj",
|
||||
"version": "4.7.0"
|
||||
},
|
||||
"google-beta": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v4.6.0",
|
||||
"sha256": "0kbdpyln8yy3128g43y134v5li9k5a6mb2fwa0jl8zffmhfc209k",
|
||||
"vendorSha256": "17rlq86zl83cav8pinr8am3wkmva4slab2izmxddhiw3na60a4la",
|
||||
"version": "4.6.0"
|
||||
"rev": "v4.7.0",
|
||||
"sha256": "0jnz05yvhlawgc188xazv1fvqsqvpm867xf3i93xpl248pr1vqlf",
|
||||
"vendorSha256": "144kv885w2gfsljj8vx7q9pgrpyshpn392162ljzpjb6qx3qzzxj",
|
||||
"version": "4.7.0"
|
||||
},
|
||||
"grafana": {
|
||||
"owner": "grafana",
|
||||
@ -430,10 +430,10 @@
|
||||
"owner": "gridscale",
|
||||
"provider-source-address": "registry.terraform.io/gridscale/gridscale",
|
||||
"repo": "terraform-provider-gridscale",
|
||||
"rev": "v1.13.0",
|
||||
"sha256": "0m4n1ih7fzwxrnd3b70i4xl0nrwbpw8f6hh1fpa02jv7znpdp7l8",
|
||||
"rev": "v1.14.0",
|
||||
"sha256": "1syi3hvmff8dkbh538r4acbr5r72nmd073fvr52zcn0a9bc3q9np",
|
||||
"vendorSha256": null,
|
||||
"version": "1.13.0"
|
||||
"version": "1.14.0"
|
||||
},
|
||||
"hcloud": {
|
||||
"owner": "hetznercloud",
|
||||
@ -583,19 +583,19 @@
|
||||
"owner": "launchdarkly",
|
||||
"provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly",
|
||||
"repo": "terraform-provider-launchdarkly",
|
||||
"rev": "v2.3.0",
|
||||
"sha256": "1yvxzhwx5nm53gjaqxzsfkc8khgyi2va1a9kjwmkhzqghzl4w5nw",
|
||||
"vendorSha256": "0pmnhlfmi9i6xblz62ysnw02p4i8iz6naqpna99gbgyllnj5asdg",
|
||||
"version": "2.3.0"
|
||||
"rev": "v2.4.1",
|
||||
"sha256": "1smrdhg6fn9lzrlh0mz822zibnvd1487w5qn38l71ark9dadahqv",
|
||||
"vendorSha256": "13vcxvw56bn7mdz917lvdryd2d7mcvi83ykbzjfbpxr4lzrrm9qw",
|
||||
"version": "2.4.1"
|
||||
},
|
||||
"libvirt": {
|
||||
"owner": "dmacvicar",
|
||||
"provider-source-address": "registry.terraform.io/dmacvicar/libvirt",
|
||||
"repo": "terraform-provider-libvirt",
|
||||
"rev": "v0.6.12",
|
||||
"sha256": "1kqpy1cr7vg4iclxwd7wa4fmhw63l3z5gn07knfx9in7nm380pyn",
|
||||
"vendorSha256": "0l9wr4g77chmshcfibdbl23rs8y8bxgiar4n152gkr0z12jvr5iq",
|
||||
"version": "0.6.12"
|
||||
"rev": "v0.6.13",
|
||||
"sha256": "1fvxvijl5vjx7gb4w19pf4gcq97pisiznr2n72ybpma46c2clx2h",
|
||||
"vendorSha256": "0rck411b4dh2zh4m4m6h2d03zlv5wm94li9dq5ggr0lspfx6nv1i",
|
||||
"version": "0.6.13"
|
||||
},
|
||||
"linode": {
|
||||
"owner": "linode",
|
||||
@ -638,10 +638,10 @@
|
||||
"owner": "terraform-lxd",
|
||||
"provider-source-address": "registry.terraform.io/terraform-lxd/lxd",
|
||||
"repo": "terraform-provider-lxd",
|
||||
"rev": "v1.6.0",
|
||||
"sha256": "07h159mjbddkf3ishhdknqn10pyb2wh9yavjps5mwmdbiii6qpvy",
|
||||
"rev": "v1.7.0",
|
||||
"sha256": "1fg9ad6zmkkg8j4sqfan3ibjjb73digg10k5h8xaii778r9bh311",
|
||||
"vendorSha256": "11x12jxh4q99hinpljqfchysgkhch93sgv0mz065ws20y0dxzfvs",
|
||||
"version": "1.6.0"
|
||||
"version": "1.7.0"
|
||||
},
|
||||
"mailgun": {
|
||||
"owner": "wgebis",
|
||||
@ -766,10 +766,10 @@
|
||||
"owner": "terraform-providers",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/oci",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.59.0",
|
||||
"sha256": "12i4j95g08c887xxplc90hcxwsrpwcn5qjyy5inazr21vqscjx2h",
|
||||
"rev": "v4.60.0",
|
||||
"sha256": "02wxisy2c9g6kkg6wrgv99qfrds26xwqfj2m3v97y0ldpi2fhbpa",
|
||||
"vendorSha256": null,
|
||||
"version": "4.59.0"
|
||||
"version": "4.60.0"
|
||||
},
|
||||
"okta": {
|
||||
"owner": "okta",
|
||||
@ -803,10 +803,10 @@
|
||||
"owner": "OpenNebula",
|
||||
"provider-source-address": "registry.terraform.io/OpenNebula/opennebula",
|
||||
"repo": "terraform-provider-opennebula",
|
||||
"rev": "v0.3.0",
|
||||
"sha256": "110mzxr2mk9hzw7nfisyl4in7r7q4m280szzgc3bzlp9sjvqgg3y",
|
||||
"vendorSha256": "1wp9dk5kcrkmcx7mh5inbq3zd7qwp8sbl9hc0svaf44mf1p9446w",
|
||||
"version": "0.3.0"
|
||||
"rev": "v0.4.0",
|
||||
"sha256": "1r6v1ksis0h9mairvn9mwk49dkn6s6ixi8j0jaz9w173lx5si917",
|
||||
"vendorSha256": "0qyzavig8wnnjzm63pny5azywqyrnjm978yg5y0sr6zw8wghjd15",
|
||||
"version": "0.4.0"
|
||||
},
|
||||
"openstack": {
|
||||
"owner": "terraform-provider-openstack",
|
||||
@ -821,10 +821,10 @@
|
||||
"owner": "opentelekomcloud",
|
||||
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.27.2",
|
||||
"sha256": "1icfsjpch6plp9qbx0snn55kvkba0kvnd0skwdhzxi66xcdw0s9b",
|
||||
"vendorSha256": "0dc4l5swfw666mpm5q67gm45abkm9zsvibqrja910h6rrp387576",
|
||||
"version": "1.27.2"
|
||||
"rev": "v1.27.3",
|
||||
"sha256": "17n1vy9h2blw9k3p82sbcz9zbj4hilg33qga5n09nq2ngafagazg",
|
||||
"vendorSha256": "12ahdbb83gxb9dcax635ngr54cqvnydr7l65h5dvv7b2gfldb1ki",
|
||||
"version": "1.27.3"
|
||||
},
|
||||
"opsgenie": {
|
||||
"owner": "opsgenie",
|
||||
@ -1055,10 +1055,10 @@
|
||||
"owner": "tencentcloudstack",
|
||||
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.61.1",
|
||||
"sha256": "1v6b8ldg6pkphqy5aphdhig1q3iizzfrj611k39lyk1q3q914yf4",
|
||||
"rev": "v1.61.2",
|
||||
"sha256": "1i9jyz4r344swdvnnpgz2s1ds5b5s2hif3bjr82mmfd7gshyagnq",
|
||||
"vendorSha256": null,
|
||||
"version": "1.61.1"
|
||||
"version": "1.61.2"
|
||||
},
|
||||
"tfe": {
|
||||
"owner": "hashicorp",
|
||||
@ -1128,10 +1128,10 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/vault",
|
||||
"repo": "terraform-provider-vault",
|
||||
"rev": "v3.1.1",
|
||||
"sha256": "15fwc0sfdpcl85194gq6r97y18ggh61wbyh6lq7nrprwn2xvjch9",
|
||||
"vendorSha256": "1q2yfmg6g3bl6h0vzanz7874xc4g7ggmysh2dqryijvr4kccnari",
|
||||
"version": "3.1.1"
|
||||
"rev": "v3.2.1",
|
||||
"sha256": "0y8vvc5mckzjs24x36rihl1vdvh9k2kazn5lsqvq6apv36kg5vw4",
|
||||
"vendorSha256": "0j5kz5jvyds701gq89v8dcsvm67kbfxxgzjvmn74ms3nrkx8hr84",
|
||||
"version": "3.2.1"
|
||||
},
|
||||
"vcd": {
|
||||
"owner": "vmware",
|
||||
@ -1192,10 +1192,10 @@
|
||||
"owner": "vultr",
|
||||
"provider-source-address": "registry.terraform.io/vultr/vultr",
|
||||
"repo": "terraform-provider-vultr",
|
||||
"rev": "v2.8.1",
|
||||
"sha256": "1dhfxr6a4kj1llalfw76w36iw6vcdk1p0nb90kfkpg2sh58a6rid",
|
||||
"rev": "v2.9.0",
|
||||
"sha256": "0hx1n1wcjx40s94bysr14j0w4bc1xzkrrmkpjcwwbqywn75p6ggw",
|
||||
"vendorSha256": null,
|
||||
"version": "2.8.1"
|
||||
"version": "2.9.0"
|
||||
},
|
||||
"wavefront": {
|
||||
"owner": "vmware",
|
||||
@ -1210,9 +1210,9 @@
|
||||
"owner": "yandex-cloud",
|
||||
"provider-source-address": "registry.terraform.io/yandex-cloud/yandex",
|
||||
"repo": "terraform-provider-yandex",
|
||||
"rev": "v0.69.0",
|
||||
"sha256": "0k4py0asibcpfl9w8q0bn3rfjxhxf6cs3g53j35qij3gakqf1w2i",
|
||||
"rev": "v0.70.0",
|
||||
"sha256": "0dmhzjwcd0j7rfczxahami23yjcc0pr10m12iig3z4hj9kgikzvy",
|
||||
"vendorSha256": "0zx2lq9va0llrjlf3lk8pnx6f5knmi4jjxrnll89kp01imydjqv8",
|
||||
"version": "0.69.0"
|
||||
"version": "0.70.0"
|
||||
}
|
||||
}
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "deltachat-cursed";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adbenitez";
|
||||
repo = "deltachat-cursed";
|
||||
rev = "v${version}";
|
||||
sha256 = "0zzzrzc8yxw6ffwfirbrr5ahbidbvlwdvgdg82zjsdjjbarxph8c";
|
||||
hash = "sha256-IZrTPnj6eX1qgEPnEiD9qmVkwn1SMK38gVKAJFgZNfw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-ews";
|
||||
version = "3.42.1";
|
||||
version = "3.42.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "nCvGMSfDS0GUQfF8zomVq+gKf9H72X896zptRy9/Xy0=";
|
||||
sha256 = "qgi2ycWlzY4PaiEMHu0Rd3bN2aqFcLtxkII1MzZXls4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gettext intltool pkg-config ];
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
, flask
|
||||
, flask-httpauth
|
||||
, flask-socketio
|
||||
, stem
|
||||
, cepa
|
||||
, psutil
|
||||
, pyqt5
|
||||
, pycrypto
|
||||
@ -21,15 +21,16 @@
|
||||
, unidecode
|
||||
, tor
|
||||
, obfs4
|
||||
, snowflake
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.4";
|
||||
version = "2.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "onionshare";
|
||||
repo = "onionshare";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Lclm7mIkaAkQpWcNILTRJtLA43dpiyHtWAeHS2r3+ZQ=";
|
||||
sha256 = "xCAM+tjjyDg/gqAXr4YNPhM8R3n9r895jktisAGlpZo=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "Securely and anonymously send and receive files";
|
||||
@ -55,16 +56,9 @@ let
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ lourkeur ];
|
||||
};
|
||||
stem' = stem.overridePythonAttrs (_: rec {
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onionshare";
|
||||
repo = "stem";
|
||||
rev = version;
|
||||
sha256 = "Dzpvx7CgAr5OtGmfubWAYDLqq5LkGqcwjr3bxpfL/3A=";
|
||||
};
|
||||
});
|
||||
# TODO: package meek https://support.torproject.org/glossary/meek/
|
||||
meek = "/meek-not-available";
|
||||
|
||||
in
|
||||
rec {
|
||||
@ -76,7 +70,7 @@ rec {
|
||||
# hardcode store paths of dependencies
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
inherit tor obfs4;
|
||||
inherit tor meek obfs4 snowflake;
|
||||
inherit (tor) geoip;
|
||||
})
|
||||
];
|
||||
@ -86,7 +80,7 @@ rec {
|
||||
flask
|
||||
flask-httpauth
|
||||
flask-socketio
|
||||
stem'
|
||||
cepa
|
||||
psutil
|
||||
pycrypto
|
||||
pynacl
|
||||
@ -109,8 +103,6 @@ rec {
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
"test_firefox_like_behavior"
|
||||
"test_if_unmodified_since"
|
||||
"test_get_tor_paths_linux" # expects /usr instead of /nix/store
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# on darwin (and only on darwin) onionshare attempts to discover
|
||||
@ -123,12 +115,12 @@ rec {
|
||||
onionshare-gui = buildPythonApplication {
|
||||
pname = "onionshare";
|
||||
inherit version meta;
|
||||
src = "${src}/desktop/src";
|
||||
src = "${src}/desktop";
|
||||
patches = [
|
||||
# hardcode store paths of dependencies
|
||||
(substituteAll {
|
||||
src = ./fix-paths-gui.patch;
|
||||
inherit tor obfs4;
|
||||
inherit tor meek obfs4 snowflake;
|
||||
inherit (tor) geoip;
|
||||
})
|
||||
];
|
||||
|
||||
@ -1,25 +1,46 @@
|
||||
--- a/onionshare/gui_common.py
|
||||
+++ b/onionshare/gui_common.py
|
||||
@@ -391,29 +391,10 @@ class GuiCommon:
|
||||
@@ -410,52 +410,12 @@ class GuiCommon:
|
||||
}
|
||||
|
||||
def get_tor_paths(self):
|
||||
- if self.common.platform == "Linux":
|
||||
- tor_path = shutil.which("tor")
|
||||
- obfs4proxy_file_path = shutil.which("obfs4proxy")
|
||||
- prefix = os.path.dirname(os.path.dirname(tor_path))
|
||||
- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")
|
||||
- elif self.common.platform == "Windows":
|
||||
- base_path = self.get_resource_path("tor")
|
||||
- if base_path and os.path.isdir(base_path):
|
||||
- self.common.log(
|
||||
- "GuiCommon", "get_tor_paths", "using paths in resources"
|
||||
- )
|
||||
- tor_path = os.path.join(base_path, "tor")
|
||||
- tor_geo_ip_file_path = os.path.join(base_path, "geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
|
||||
- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy")
|
||||
- snowflake_file_path = os.path.join(base_path, "snowflake-client")
|
||||
- meek_client_file_path = os.path.join(base_path, "meek-client")
|
||||
- else:
|
||||
- # Fallback to looking in the path
|
||||
- self.common.log("GuiCommon", "get_tor_paths", "using paths from PATH")
|
||||
- tor_path = shutil.which("tor")
|
||||
- obfs4proxy_file_path = shutil.which("obfs4proxy")
|
||||
- snowflake_file_path = shutil.which("snowflake-client")
|
||||
- meek_client_file_path = shutil.which("meek-client")
|
||||
- prefix = os.path.dirname(os.path.dirname(tor_path))
|
||||
- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")
|
||||
-
|
||||
- if self.common.platform == "Windows":
|
||||
- base_path = self.get_resource_path("tor")
|
||||
- tor_path = os.path.join(base_path, "Tor", "tor.exe")
|
||||
- obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")
|
||||
- snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe")
|
||||
- meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe")
|
||||
- tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")
|
||||
- elif self.common.platform == "Darwin":
|
||||
- base_path = self.get_resource_path("tor")
|
||||
- tor_path = os.path.join(base_path, "tor")
|
||||
- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy")
|
||||
- snowflake_file_path = os.path.join(base_path, "snowflake-client")
|
||||
- meek_client_file_path = os.path.join(base_path, "meek-client")
|
||||
- tor_geo_ip_file_path = os.path.join(base_path, "geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
|
||||
- elif self.common.platform == "BSD":
|
||||
@ -27,10 +48,14 @@
|
||||
- tor_geo_ip_file_path = "/usr/local/share/tor/geoip"
|
||||
- tor_geo_ipv6_file_path = "/usr/local/share/tor/geoip6"
|
||||
- obfs4proxy_file_path = "/usr/local/bin/obfs4proxy"
|
||||
- meek_client_file_path = "/usr/local/bin/meek-client"
|
||||
- snowflake_file_path = "/usr/local/bin/snowflake-client"
|
||||
+ tor_path = "@tor@/bin/tor"
|
||||
+ tor_geo_ip_file_path = "@geoip@/share/tor/geoip"
|
||||
+ tor_geo_ipv6_file_path = "@geoip@/share/tor/geoip6"
|
||||
+ obfs4proxy_file_path = "@obfs4@/bin/obfs4proxy"
|
||||
+ meek_client_file_path = "@meek@/bin/meek-client"
|
||||
+ snowflake_file_path = "@snowflake@/bin/snowflake-client"
|
||||
|
||||
return (
|
||||
tor_path,
|
||||
|
||||
@ -1,41 +1,76 @@
|
||||
--- a/onionshare_cli/common.py
|
||||
+++ b/onionshare_cli/common.py
|
||||
@@ -308,33 +308,10 @@ class Common:
|
||||
@@ -318,67 +318,12 @@ class Common:
|
||||
return path
|
||||
|
||||
|
||||
def get_tor_paths(self):
|
||||
- if self.platform == "Linux":
|
||||
- tor_path = shutil.which("tor")
|
||||
- if not tor_path:
|
||||
- raise CannotFindTor()
|
||||
- obfs4proxy_file_path = shutil.which("obfs4proxy")
|
||||
- snowflake_file_path = shutil.which("snowflake-client")
|
||||
- meek_client_file_path = shutil.which("meek-client")
|
||||
- prefix = os.path.dirname(os.path.dirname(tor_path))
|
||||
- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")
|
||||
- elif self.platform == "Windows":
|
||||
- # In Windows, the Tor binaries are in the onionshare package, not the onionshare_cli package
|
||||
- base_path = self.get_resource_path("tor")
|
||||
- base_path = base_path.replace("onionshare_cli", "onionshare")
|
||||
- tor_path = os.path.join(base_path, "Tor", "tor.exe")
|
||||
-
|
||||
- # If tor.exe isn't there, mayber we're running from the source tree
|
||||
- if not os.path.exists(tor_path):
|
||||
- base_path = os.path.join(os.getcwd(), "onionshare", "resources", "tor")
|
||||
-
|
||||
- tor_path = os.path.join(base_path, "Tor", "tor.exe")
|
||||
- if not os.path.exists(tor_path):
|
||||
- raise CannotFindTor()
|
||||
-
|
||||
- obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")
|
||||
- snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe")
|
||||
- meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe")
|
||||
- tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")
|
||||
-
|
||||
- elif self.platform == "Darwin":
|
||||
- tor_path = shutil.which("tor")
|
||||
- if not tor_path:
|
||||
- raise CannotFindTor()
|
||||
- obfs4proxy_file_path = shutil.which("obfs4proxy")
|
||||
- prefix = os.path.dirname(os.path.dirname(tor_path))
|
||||
- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")
|
||||
- # Let's see if we have tor binaries in the onionshare GUI package
|
||||
- base_path = self.get_resource_path("tor")
|
||||
- base_path = base_path.replace("onionshare_cli", "onionshare")
|
||||
- tor_path = os.path.join(base_path, "tor")
|
||||
- if os.path.exists(tor_path):
|
||||
- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy")
|
||||
- snowflake_file_path = os.path.join(base_path, "snowflake-client")
|
||||
- meek_client_file_path = os.path.join(base_path, "meek-client")
|
||||
- tor_geo_ip_file_path = os.path.join(base_path, "geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
|
||||
- else:
|
||||
- # Fallback to looking in the path
|
||||
- tor_path = shutil.which("tor")
|
||||
- if not os.path.exists(tor_path):
|
||||
- raise CannotFindTor()
|
||||
-
|
||||
- obfs4proxy_file_path = shutil.which("obfs4proxy")
|
||||
- snowflake_file_path = shutil.which("snowflake-client")
|
||||
- meek_client_file_path = shutil.which("meek-client")
|
||||
- prefix = os.path.dirname(os.path.dirname(tor_path))
|
||||
- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")
|
||||
-
|
||||
- elif self.platform == "BSD":
|
||||
- tor_path = "/usr/local/bin/tor"
|
||||
- tor_geo_ip_file_path = "/usr/local/share/tor/geoip"
|
||||
- tor_geo_ipv6_file_path = "/usr/local/share/tor/geoip6"
|
||||
- obfs4proxy_file_path = "/usr/local/bin/obfs4proxy"
|
||||
- snowflake_file_path = "/usr/local/bin/snowflake-client"
|
||||
- meek_client_file_path = "/usr/local/bin/meek-client"
|
||||
+ tor_path = "@tor@/bin/tor"
|
||||
+ tor_geo_ip_file_path = "@geoip@/share/tor/geoip"
|
||||
+ tor_geo_ipv6_file_path = "@geoip@/share/tor/geoip6"
|
||||
+ obfs4proxy_file_path = "@obfs4@/bin/obfs4proxy"
|
||||
|
||||
+ snowflake_file_path = "@snowflake@/bin/snowflake-client"
|
||||
+ meek_client_file_path = "@meek@/bin/meek-client"
|
||||
|
||||
return (
|
||||
tor_path,
|
||||
|
||||
|
||||
@ -10,7 +10,10 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, nixosTests
|
||||
# For tests
|
||||
, testVersion
|
||||
, runCommand
|
||||
, fetchurl
|
||||
# Main build tools
|
||||
, pkg-config
|
||||
, autoconf
|
||||
@ -103,7 +106,7 @@ let
|
||||
inherit (lib) optional optionals optionalString versions;
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
let self = stdenv.mkDerivation rec {
|
||||
pname = "handbrake";
|
||||
inherit version src;
|
||||
|
||||
@ -211,7 +214,23 @@ stdenv.mkDerivation rec {
|
||||
makeFlags = [ "--directory=build" ];
|
||||
|
||||
passthru.tests = {
|
||||
basic-conversion = nixosTests.handbrake;
|
||||
basic-conversion =
|
||||
let
|
||||
# Big Buck Bunny example, licensed under CC Attribution 3.0.
|
||||
testMkv = fetchurl {
|
||||
url = "https://github.com/Matroska-Org/matroska-test-files/blob/cf0792be144ac470c4b8052cfe19bb691993e3a2/test_files/test1.mkv?raw=true";
|
||||
sha256 = "1hfxbbgxwfkzv85pvpvx55a72qsd0hxjbm9hkl5r3590zw4s75h9";
|
||||
};
|
||||
in
|
||||
runCommand "${pname}-${version}-basic-conversion" { nativeBuildInputs = [ self ]; } ''
|
||||
mkdir -p $out
|
||||
cd $out
|
||||
HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160
|
||||
test -e test.mp4
|
||||
HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160
|
||||
test -e test.mkv
|
||||
'';
|
||||
version = testVersion { package = self; command = "HandBrakeCLI --version"; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
@ -230,4 +249,5 @@ stdenv.mkDerivation rec {
|
||||
platforms = with platforms; unix;
|
||||
broken = stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13";
|
||||
};
|
||||
}
|
||||
};
|
||||
in self
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "streamlink";
|
||||
version = "3.0.3";
|
||||
version = "3.1.0";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-oEK9p6OuqGSm2JdgfnJ+N0sJtRq6wCoVCGcU0GNEMLI=";
|
||||
sha256 = "sha256-T2M0vg+BYIdr21CcdrrBf7bVVlZU+tKJWG2xfBMoMlg=";
|
||||
};
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
@ -32,10 +32,6 @@ python3Packages.buildPythonApplication rec {
|
||||
ffmpeg
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg --replace 'lxml >=4.6.4,<5.0' 'lxml'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://streamlink.github.io/";
|
||||
description = "CLI for extracting streams from various websites to video player of your choosing";
|
||||
|
||||
@ -62,16 +62,14 @@
|
||||
, systemd
|
||||
, taglib
|
||||
, unzip
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, xorg
|
||||
, zlib
|
||||
|
||||
, chromecastSupport ? true, libmicrodns, protobuf
|
||||
, jackSupport ? false
|
||||
, onlyLibVLC ? false
|
||||
, skins2Support ? !onlyLibVLC, freetype
|
||||
, withQt5 ? true, qtbase, qtsvg, qtx11extras, wrapQtAppsHook
|
||||
, waylandSupport ? true, wayland, wayland-protocols
|
||||
, withQt5 ? true, qtbase, qtsvg, qtwayland, qtx11extras, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
# chromecastSupport requires TCP port 8010 to be open for it to work.
|
||||
@ -148,8 +146,6 @@ stdenv.mkDerivation rec {
|
||||
srt
|
||||
systemd
|
||||
taglib
|
||||
wayland
|
||||
wayland-protocols
|
||||
zlib
|
||||
]
|
||||
++ (with xorg; [
|
||||
@ -162,8 +158,15 @@ stdenv.mkDerivation rec {
|
||||
++ optional (!hostIsAarch) live555
|
||||
++ optional jackSupport libjack2
|
||||
++ optionals chromecastSupport [ libmicrodns protobuf ]
|
||||
++ optionals skins2Support (with xorg; [ freetype libXext libXinerama libXpm ])
|
||||
++ optionals withQt5 [ qtbase qtsvg qtx11extras ];
|
||||
++ optionals skins2Support (with xorg; [
|
||||
freetype
|
||||
libXext
|
||||
libXinerama
|
||||
libXpm
|
||||
])
|
||||
++ optionals waylandSupport [ wayland wayland-protocols ]
|
||||
++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
|
||||
++ optional (waylandSupport && withQt5) qtwayland;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
@ -172,7 +175,8 @@ stdenv.mkDerivation rec {
|
||||
removeReferencesTo
|
||||
unzip
|
||||
]
|
||||
++ optionals withQt5 [ wrapQtAppsHook ];
|
||||
++ optionals withQt5 [ wrapQtAppsHook ]
|
||||
++ optionals waylandSupport [ wayland wayland-protocols ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -210,9 +214,11 @@ stdenv.mkDerivation rec {
|
||||
configureFlags = [
|
||||
"--enable-srt" # Explicit enable srt to ensure the patch is applied.
|
||||
"--with-kde-solid=$out/share/apps/solid/actions"
|
||||
] ++ optional onlyLibVLC "--disable-vlc"
|
||||
++ optional skins2Support "--enable-skins2"
|
||||
++ optionals chromecastSupport [
|
||||
]
|
||||
++ optional onlyLibVLC "--disable-vlc"
|
||||
++ optional skins2Support "--enable-skins2"
|
||||
++ optional waylandSupport "--enable-wayland"
|
||||
++ optionals chromecastSupport [
|
||||
"--enable-sout"
|
||||
"--enable-chromecast"
|
||||
"--enable-microdns"
|
||||
|
||||
@ -8,10 +8,10 @@ in rebar3Relx rec {
|
||||
releaseType = "escript";
|
||||
# The package name "elvis" is already taken
|
||||
pname = "elvis-erlang";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
sha256 = "139mgd4cwc0vazxfnssyym61jd9g45wn1nc53mjfzx5dkrrn4dc5";
|
||||
sha256 = "6vNxr3AYpFuXaIVH9bWw7K5KiF1swfI+CSI43RoMQEA=";
|
||||
rev = version;
|
||||
};
|
||||
beamDeps = builtins.attrValues (import ./rebar-deps.nix {
|
||||
|
||||
@ -26,11 +26,11 @@ let
|
||||
};
|
||||
parse_trans = builder {
|
||||
name = "parse_trans";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
src = fetchHex {
|
||||
pkg = "parse_trans";
|
||||
version = "3.4.0";
|
||||
sha256 = "sha256-+Z42iDC+pEVSIk434ElDpUh08IuFkEhd6NE4MrY6LcM=";
|
||||
version = "3.4.1";
|
||||
sha256 = "sha256-YgpAbOddragnuC5FPBnPBndr4mb1pnz/NOHvLLtg5Jo=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
@ -66,11 +66,11 @@ let
|
||||
};
|
||||
certifi = builder {
|
||||
name = "certifi";
|
||||
version = "2.6.1";
|
||||
version = "2.8.0";
|
||||
src = fetchHex {
|
||||
pkg = "certifi";
|
||||
version = "2.6.1";
|
||||
sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34=";
|
||||
version = "2.8.0";
|
||||
sha256 = "sha256-asfvwcb4YAsI1iUpLUu/WE4UhHzhtrXETZg9Jz4Ql+o=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
@ -146,11 +146,11 @@ let
|
||||
};
|
||||
elvis_core = builder {
|
||||
name = "elvis_core";
|
||||
version = "1.1.2";
|
||||
version = "1.3.1";
|
||||
src = fetchHex {
|
||||
pkg = "elvis_core";
|
||||
version = "1.1.2";
|
||||
sha256 = "sha256-xO5Cp6fC/FZ/Pqa1FQFkzWgpDxEA6bGaTPiG2Kocpzw=";
|
||||
version = "1.3.1";
|
||||
sha256 = "sha256-eoiQv4GFoyUs1OvYJv5fita5MCTt+IV26yeunl3BnWk=";
|
||||
};
|
||||
beamDeps = [ katana_code zipper ];
|
||||
};
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
{ lib, stdenv, fetchurl, fetchFromGitHub
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, glib
|
||||
, db
|
||||
@ -7,32 +10,37 @@
|
||||
|
||||
let
|
||||
modelData = fetchurl {
|
||||
url = "mirror://sourceforge/libpinyin/models/model17.text.tar.gz";
|
||||
sha256 = "1kb2nswpsqlk2qm5jr7vqcp97f2dx7nvpk24lxjs1g12n252f5z0";
|
||||
url = "mirror://sourceforge/libpinyin/models/model19.text.tar.gz";
|
||||
sha256 = "02zml6m8sj5q97ibpvaj9s9yz3gfj0jnjrfhkn02qv4nwm72lhjn";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libpinyin";
|
||||
version = "2.3.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libpinyin";
|
||||
repo = "libpinyin";
|
||||
rev = version;
|
||||
sha256 = "14fkpp16s5k0pbw5wwd24pqr0qbdjgbl90n9aqwx72m03n7an40l";
|
||||
owner = "libpinyin";
|
||||
repo = "libpinyin";
|
||||
rev = version;
|
||||
sha256 = "0izisma5g9a7mxfxs177pi1d7v9dklm0ar4z404nf2s8x4wcg3ib";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
tar -xzf ${modelData} -C $sourceRoot/data
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook glib db pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
glib
|
||||
db
|
||||
pkg-config
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for intelligent sentence-based Chinese pinyin input method";
|
||||
homepage = "https://sourceforge.net/projects/libpinyin";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ ericsagnes ];
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://sourceforge.net/projects/libpinyin";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ linsui ericsagnes ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/librep.x86_64-darwin
|
||||
};
|
||||
}
|
||||
# TODO: investigate fetchFromGithub
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apfel";
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scarrazza";
|
||||
repo = "apfel";
|
||||
rev = version;
|
||||
sha256 = "sha256-szEtSC/NouYlHSjVoX9Hoh7yQ0W82rVccYEF1L2tXoU=";
|
||||
sha256 = "sha256-fRdJ+C92tEC75iUwP9Tmm/EswrlA52eUo5fBjfieH9o=";
|
||||
};
|
||||
|
||||
buildInputs = [ gfortran lhapdf python3 zlib ];
|
||||
|
||||
31
pkgs/development/python-modules/ansimarkup/default.nix
Normal file
31
pkgs/development/python-modules/ansimarkup/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, colorama
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansimarkup";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gvalkov";
|
||||
repo = "python-ansimarkup";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HGeVapv2Z5GtPwSp3+dvUwAH0bFqu+Bmk5E6SRr7NO4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ colorama ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "ansimarkup" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An XML-like markup for producing colored terminal text.";
|
||||
homepage = "https://github.com/gvalkov/python-ansimarkup";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ cpcloud ];
|
||||
};
|
||||
}
|
||||
32
pkgs/development/python-modules/cepa/default.nix
Normal file
32
pkgs/development/python-modules/cepa/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, python, mock }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cepa";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "HcbwsyTTei7SyidGSOzo/SyWodL0QPWMDKF6/Ute3no=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
rm test/unit/installation.py
|
||||
sed -i "/test.unit.installation/d" test/settings.cfg
|
||||
# https://github.com/torproject/stem/issues/56
|
||||
sed -i '/MOCK_VERSION/d' run_tests.py
|
||||
'';
|
||||
|
||||
checkInputs = [ mock ];
|
||||
|
||||
checkPhase = ''
|
||||
touch .gitignore
|
||||
${python.interpreter} run_tests.py -u
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Controller library that allows applications to interact with Tor";
|
||||
homepage = "https://github.com/onionshare/cepa";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ lourkeur ];
|
||||
};
|
||||
}
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipympl";
|
||||
version = "0.8.5";
|
||||
version = "0.8.7";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version format;
|
||||
sha256 = "120a084d84e6a6a00fc39c73e10345dcd9855efb3fa6e774f3e72057a866715c";
|
||||
sha256 = "11c3d01f0555f855c51a960964e3ab4dff38e6ccd1a4695205fe250341a9eb99";
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libarchive-c";
|
||||
version = "3.2";
|
||||
version = "4.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Changaco";
|
||||
repo = "python-${pname}";
|
||||
rev = version;
|
||||
sha256 = "1kj3y9vnsc9m2hvnvgk5inawxfknz5drj3q51hqgcbq8p4dm8vli";
|
||||
sha256 = "1ar7lj1lpisklq2q07d95yhlbfq25g9g61hcj8whj17mq8vrvml1";
|
||||
};
|
||||
|
||||
LC_ALL="en_US.UTF-8";
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytradfri";
|
||||
version = "8.0.0";
|
||||
version = "8.0.1";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-libs";
|
||||
repo = "pytradfri";
|
||||
rev = version;
|
||||
hash = "sha256-YnQUZcqSldtRqzMac5sPoSNDT+ifs3Jqek2CoDeobe8=";
|
||||
hash = "sha256-Wxz2P55lc7yJ1OXNXYWb25a+xtMs1sANNc7hE7nawHI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,15 +11,22 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "svdtools";
|
||||
version = "0.1.20";
|
||||
version = "0.1.21";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
sha256 = "028s1bn50mfpaygf1wc2mvf06s50wqfplqrkhrjz6kx8vzrmwj72";
|
||||
sha256 = "0qc94haqkj4dbhify1l3x0ji1dx34m79nfnsk1c7l1kl2zjvz6bz";
|
||||
};
|
||||
|
||||
# remove upon next release
|
||||
# see: https://github.com/stm32-rs/svdtools/pull/96
|
||||
prePatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'PyYAML ~= 5.3' 'PyYAML >= 5.3'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
braceexpand
|
||||
click
|
||||
@ -34,7 +41,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python package to handle vendor-supplied, often buggy SVD files";
|
||||
homepage = "https://github.com/stm32-rs/svdtools";
|
||||
changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG-python.md";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ newam ];
|
||||
};
|
||||
|
||||
@ -2,17 +2,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gopls";
|
||||
version = "0.7.4";
|
||||
version = "0.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "tools";
|
||||
rev = "gopls/v${version}";
|
||||
sha256 = "sha256-tpJkEq3TuEiJ4bChlWXi2241WMcZjChEt1hV1G+h8f8=";
|
||||
sha256 = "sha256-2+tbwFkT3Z2dfYCs1Fd/9IqD39VuTMGHQ43b7gBBktM=";
|
||||
};
|
||||
|
||||
modRoot = "gopls";
|
||||
vendorSha256 = "sha256-MEL3VRHPSf1Im09Hw+GX+3J3UGt7j29V4kxzoiWhqfk=";
|
||||
vendorSha256 = "sha256-nKjJjtVHk/RLIHI/5v8tO4RcaLLZhr0A6llYGsB0ifQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-udeps";
|
||||
version = "0.1.25";
|
||||
version = "0.1.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "est31";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GNQ8PTnkmf4m2QW1yIEKytk53RNJZa9Z0GUrW5UjIkk=";
|
||||
sha256 = "sha256-7QTlbZZcWZx/E2jYYu0A6kBbScmCml0wpJ17tqLYg90=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-MbD5lkmKzggdoSzCcArVzpdQRLnXT1y+C2EFSWUbaa4=";
|
||||
cargoSha256 = "sha256-E9AouGvZTg3wD/loc80Cz933oEnWMSqwQEYTU+NPtjM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -2,48 +2,56 @@
|
||||
"x86_64-linux": {
|
||||
"alpha": {
|
||||
"experimental": {
|
||||
"name": "factorio_alpha_x64-1.1.50.tar.xz",
|
||||
"name": "factorio_alpha_x64-1.1.53.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "1sb3kvpj3kikr1bvm4si4f3dmj7873dhbz6zj57kin6d5mbmhq4p",
|
||||
"sha256": "1l5sk9rhf4pq9l87w5sv4a1ikqx8rpby5hf4xn7sdsm9mshd3wyw",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.50/alpha/linux64",
|
||||
"version": "1.1.50"
|
||||
"url": "https://factorio.com/get-download/1.1.53/alpha/linux64",
|
||||
"version": "1.1.53"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_alpha_x64-1.1.50.tar.xz",
|
||||
"name": "factorio_alpha_x64-1.1.53.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "1sb3kvpj3kikr1bvm4si4f3dmj7873dhbz6zj57kin6d5mbmhq4p",
|
||||
"sha256": "1l5sk9rhf4pq9l87w5sv4a1ikqx8rpby5hf4xn7sdsm9mshd3wyw",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.50/alpha/linux64",
|
||||
"version": "1.1.50"
|
||||
"url": "https://factorio.com/get-download/1.1.53/alpha/linux64",
|
||||
"version": "1.1.53"
|
||||
}
|
||||
},
|
||||
"demo": {
|
||||
"stable": {
|
||||
"name": "factorio_demo_x64-1.1.50.tar.xz",
|
||||
"experimental": {
|
||||
"name": "factorio_demo_x64-1.1.53.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "0i3r21i7s4yzjfqrwf82x87pfjg7d3bhkz3zqi0x398j9bykpw43",
|
||||
"sha256": "0m3mk296w4azma2v5z6pay1caqql2jfnlcyyd120laxl4rdg2k76",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.50/demo/linux64",
|
||||
"version": "1.1.50"
|
||||
"url": "https://factorio.com/get-download/1.1.53/demo/linux64",
|
||||
"version": "1.1.53"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_demo_x64-1.1.53.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "0m3mk296w4azma2v5z6pay1caqql2jfnlcyyd120laxl4rdg2k76",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.53/demo/linux64",
|
||||
"version": "1.1.53"
|
||||
}
|
||||
},
|
||||
"headless": {
|
||||
"experimental": {
|
||||
"name": "factorio_headless_x64-1.1.50.tar.xz",
|
||||
"name": "factorio_headless_x64-1.1.53.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "0j75wbnszhlmyk655b2h8jd1lvmnplq44blixl959hh3lxvqn50m",
|
||||
"sha256": "18ra52h32nhdqxz6vagp9nw3an5pgamariy0ny050xr2xpidw3v1",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.50/headless/linux64",
|
||||
"version": "1.1.50"
|
||||
"url": "https://factorio.com/get-download/1.1.53/headless/linux64",
|
||||
"version": "1.1.53"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_headless_x64-1.1.50.tar.xz",
|
||||
"name": "factorio_headless_x64-1.1.53.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "0j75wbnszhlmyk655b2h8jd1lvmnplq44blixl959hh3lxvqn50m",
|
||||
"sha256": "18ra52h32nhdqxz6vagp9nw3an5pgamariy0ny050xr2xpidw3v1",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.50/headless/linux64",
|
||||
"version": "1.1.50"
|
||||
"url": "https://factorio.com/get-download/1.1.53/headless/linux64",
|
||||
"version": "1.1.53"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
73
pkgs/games/snis/default.nix
Normal file
73
pkgs/games/snis/default.nix
Normal file
@ -0,0 +1,73 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, coreutils
|
||||
, portaudio
|
||||
, libbsd
|
||||
, libpng
|
||||
, libvorbis
|
||||
, SDL2
|
||||
, makeWrapper
|
||||
, lua5_2
|
||||
, glew
|
||||
, openssl
|
||||
, picotts
|
||||
, alsa-utils
|
||||
, espeak-classic
|
||||
, sox
|
||||
, libopus
|
||||
, openscad
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "snis_launcher";
|
||||
version = "unstable-2021-10-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smcameron";
|
||||
repo = "space-nerds-in-space";
|
||||
rev = "e70d3c63e33c940feb53c8d818ce2d8ea2aadf00";
|
||||
sha256 = "sha256-HVCb1iFn7GWNpedtFCgLyd0It8s4PEmUwDfb8ap1TDc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "OPUSARCHIVE=libopus.a" "OPUSARCHIVE=" \
|
||||
--replace "-I./opus-1.3.1/include" "-I${libopus.dev}/include/opus"
|
||||
substituteInPlace snis_launcher \
|
||||
--replace "PREFIX=." "PREFIX=$out"
|
||||
substituteInPlace snis_text_to_speech.sh \
|
||||
--replace "pico2wave" "${sox}/bin/pico2wave" \
|
||||
--replace "espeak" "${espeak-classic}/bin/espeak" \
|
||||
--replace "play" "${sox}/bin/play" \
|
||||
--replace "aplay" "${alsa-utils}/bin/aplay" \
|
||||
--replace "/bin/rm" "${coreutils}/bin/rm"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config openscad makeWrapper ];
|
||||
buildInputs = [ coreutils portaudio libbsd libpng libvorbis SDL2 lua5_2 glew openssl picotts sox alsa-utils libopus ];
|
||||
|
||||
postBuild = ''
|
||||
make models -j$NIX_BUILD_CORES
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out
|
||||
cp -R share $out/share
|
||||
cp -R bin $out/bin
|
||||
cp snis_launcher $out/bin/
|
||||
# without this, snis_client crashes on Wayland
|
||||
wrapProgram $out/bin/snis_client --set SDL_VIDEODRIVER x11
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Space Nerds In Space, a multi-player spaceship bridge simulator";
|
||||
homepage = "https://smcameron.github.io/space-nerds-in-space/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ alyaeanyx ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "jackett";
|
||||
version = "0.20.417";
|
||||
version = "0.20.428";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "AZSw5kbQT32dU4dlUJRF0oywc3yuA0ObaPy4kksdSjE=";
|
||||
sha256 = "Wf1eQkKovRIMUQeqadmOQl5R0syoKWiZENjRR4jGUdk=";
|
||||
};
|
||||
|
||||
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
|
||||
|
||||
30
pkgs/servers/tile38/default.nix
Normal file
30
pkgs/servers/tile38/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tile38";
|
||||
version = "1.27.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tidwall";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-CT611ZQmUYb6AclDEWXQsKDNxpwdJ+jqxIdDKGRo4/Q=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-FeQbfnvdERg5jtiTaT7Uz1YvmYLDXCDEf4sAyr3+Avk=";
|
||||
|
||||
subPackages = [ "cmd/tile38-cli" "cmd/tile38-server" ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/tidwall/tile38/core.Version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Real-time Geospatial and Geofencing";
|
||||
longDescription = ''
|
||||
Tile38 is an in-memory geolocation data store, spatial index, and realtime geofence.
|
||||
It supports a variety of object types including lat/lon points, bounding boxes, XYZ tiles, Geohashes, and GeoJSON.
|
||||
'';
|
||||
homepage = "https://tile38.com/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
};
|
||||
}
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aliyun-cli";
|
||||
version = "3.0.102";
|
||||
version = "3.0.104";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aliyun";
|
||||
repo = pname;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-DUNWfwLA7if9NVUaUlwfW0i2CVcZyg2gIKmi1Nu485k=";
|
||||
sha256 = "sha256-SxguK71rdNUANYKxXgdrxp7vysj5MP+dPiR0Jwzt5Nc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-c7LsCNcxdHwDBEknXJt9AyrmFcem8YtUYy06vNDBdDY=";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "certigo";
|
||||
version = "1.13.0";
|
||||
version = "1.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "square";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3VysSE4N2MlNDOZ27RbCe8rUuYChU5Z3L/CIhtvMp38=";
|
||||
sha256 = "sha256-P6xXXY0INB3Eyuxs1LEJlm2NBfMbG/HvlbIKUMAOxZE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-0wul0f8T7E4cXbsNee1j1orUgjrAToqDLgwCjiyii1Y=";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clair";
|
||||
version = "4.3.5";
|
||||
version = "4.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quay";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XV1lSEg6ksa5Y1jPKpVw3l+3pWkf6iBrJ+TBqVoj60k=";
|
||||
sha256 = "sha256-yKs/TPSu3WD34Z9fAys7ItWWcSKiUXhVWAqQXMnOrEw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-U5uPTd9RHJnt3It7iluu73ihuDiIl3kCy/1f2bRqhBY=";
|
||||
vendorSha256 = "sha256-C3xnBANsymSgI7l446CjJzEMY1gURGTxDNBBjNjHmaE=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
26
pkgs/tools/filesystems/sdat2img/default.nix
Normal file
26
pkgs/tools/filesystems/sdat2img/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ stdenv, lib, fetchFromGitHub, python3Packages }:
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "sdat2img";
|
||||
version = "unstable-2021-11-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "sdat2img";
|
||||
owner = "xpirt";
|
||||
rev = "b432c988a412c06ff24d196132e354712fc18929";
|
||||
sha256 = "sha256-NCbf9H0hoJgeDtP6cQY0H280BQqgKXv3ConZ87QixVY=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
installPhase = ''
|
||||
install -D $src/sdat2img.py $out/bin/sdat2img
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Convert sparse Android data image (.dat) into filesystem ext4 image (.img)";
|
||||
homepage = "https://github.com/xpirt/sdat2img";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.xaverdh ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "chezmoi";
|
||||
version = "2.9.5";
|
||||
version = "2.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-do4Vn/+tjklvhE0MdNN4PEDKFAN2pizg9owGIyesWtI=";
|
||||
sha256 = "sha256-DW4IqnpvhdX+RDxPHPyAezjB1BeMaiopC6UzVrodqLo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-94h02DvhtXIoAC4ZJHm6LysFQKj8ceWuV01Dmiy6Yb8=";
|
||||
vendorSha256 = "sha256-RQQeIKegZBCceXBahX78CYH00xFWEH38O5iFUQyXOLc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, python39Packages, fetchFromGitHub }:
|
||||
|
||||
python39Packages.buildPythonPackage rec {
|
||||
python39Packages.buildPythonApplication rec {
|
||||
name = "gay";
|
||||
version = "1.2.8";
|
||||
|
||||
|
||||
21
pkgs/tools/networking/snowflake/default.nix
Normal file
21
pkgs/tools/networking/snowflake/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib, buildGoModule, fetchgit }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "snowflake";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.torproject.org/pluggable-transports/${pname}";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ULkqsh0DeFI1GsaVaHGSjoEY38EktvDVC52Sx6cQLOE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "D5A19UHL1WEE1ODT80jKT+PJ5CTXPjc9Eg6v2Nfm4aw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "System to defeat internet censorship";
|
||||
homepage = "https://snowflake.torproject.org/";
|
||||
maintainers = with maintainers; [ lourkeur ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "kube-hunter";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OXiFWdbp6L9S57gRIROzuvXZ0R16lvKDqZR0kW0eEYQ=";
|
||||
sha256 = "066pivd9mdhy24n40m9917zr5f9gh4fva4zmxk9vyppgk1b3mpwc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bfs";
|
||||
version = "2.3";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "bfs";
|
||||
owner = "tavianator";
|
||||
rev = version;
|
||||
sha256 = "sha256-ng8/Cgo54MRtrYHRRU9b1v+O1yN5ji/VuV87BWABIMM=";
|
||||
sha256 = "sha256-V82UdCG0J04sZP3FTVQqANrez/LCwOLQY6zzFOoIeNo=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ libcap acl ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "svt-av1";
|
||||
version = "0.8.7";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "AOMediaCodec";
|
||||
repo = "SVT-AV1";
|
||||
rev = "v${version}";
|
||||
sha256 = "1xlxb6kn6hqz9dxz0nd905m4i2mwjwq1330rbabwzmg4b66cdslg";
|
||||
sha256 = "sha256-kmFyJ5b0EiesWUN71rbULF2cQt2pICF0P/MeZ+h7W9U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake nasm ];
|
||||
@ -26,11 +26,9 @@ stdenv.mkDerivation rec {
|
||||
inherit (src.meta) homepage;
|
||||
changelog = "https://gitlab.com/AOMediaCodec/SVT-AV1/-/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [
|
||||
aom
|
||||
bsd2
|
||||
{
|
||||
fullName = "Alliance for Open Media Patent License 1.0";
|
||||
url = "https://aomedia.org/license/patent-license/";
|
||||
}
|
||||
bsd3
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isAarch64; # undefined reference to `cpuinfo_arm_linux_init'
|
||||
|
||||
@ -323,6 +323,8 @@ with pkgs;
|
||||
|
||||
evans = callPackage ../development/tools/evans { };
|
||||
|
||||
firefly-desktop = callPackage ../applications/misc/firefly-desktop { };
|
||||
|
||||
frugal = callPackage ../development/tools/frugal { };
|
||||
|
||||
glade = callPackage ../development/tools/glade { };
|
||||
@ -1160,6 +1162,8 @@ with pkgs;
|
||||
mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { };
|
||||
siduck76-st = callPackage ../applications/terminal-emulators/st/siduck76-st.nix { };
|
||||
|
||||
snowflake = callPackage ../tools/networking/snowflake { };
|
||||
|
||||
stupidterm = callPackage ../applications/terminal-emulators/stupidterm {
|
||||
gtk = gtk3;
|
||||
};
|
||||
@ -9522,6 +9526,8 @@ with pkgs;
|
||||
|
||||
sdate = callPackage ../tools/misc/sdate { };
|
||||
|
||||
sdat2img = callPackage ../tools/filesystems/sdat2img { };
|
||||
|
||||
sdcv = callPackage ../applications/misc/sdcv { };
|
||||
|
||||
sdl-jstest = callPackage ../tools/misc/sdl-jstest { };
|
||||
@ -10218,6 +10224,8 @@ with pkgs;
|
||||
|
||||
tidy-viewer = callPackage ../tools/text/tidy-viewer { };
|
||||
|
||||
tile38 = callPackage ../servers/tile38 { };
|
||||
|
||||
tiled = libsForQt5.callPackage ../applications/editors/tiled { };
|
||||
|
||||
tiledb = callPackage ../development/libraries/tiledb { };
|
||||
@ -17284,6 +17292,8 @@ with pkgs;
|
||||
indicator-application-gtk2 = callPackage ../development/libraries/indicator-application/gtk2.nix { };
|
||||
indicator-application-gtk3 = callPackage ../development/libraries/indicator-application/gtk3.nix { };
|
||||
|
||||
indicator-sound-switcher = callPackage ../applications/audio/indicator-sound-switcher { };
|
||||
|
||||
indilib = callPackage ../development/libraries/science/astronomy/indilib { };
|
||||
indi-full = callPackage ../development/libraries/science/astronomy/indilib/indi-full.nix { };
|
||||
|
||||
@ -29434,8 +29444,6 @@ with pkgs;
|
||||
libcaca = null;
|
||||
};
|
||||
|
||||
vlc_qt5 = vlc;
|
||||
|
||||
libvlc = vlc.override {
|
||||
withQt5 = false;
|
||||
qtbase = null;
|
||||
@ -30206,6 +30214,17 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) IOKit;
|
||||
};
|
||||
|
||||
groestlcoin = libsForQt5.callPackage ../applications/blockchains/groestlcoin {
|
||||
boost = boost17x;
|
||||
withGui = true;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
|
||||
groestlcoind = callPackage ../applications/blockchains/groestlcoin {
|
||||
boost = boost17x;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
|
||||
ledger_agent = with python3Packages; toPythonApplication ledger_agent;
|
||||
|
||||
ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { };
|
||||
@ -31275,6 +31294,8 @@ with pkgs;
|
||||
|
||||
synthv1 = libsForQt5.callPackage ../applications/audio/synthv1 { };
|
||||
|
||||
snis = callPackage ../games/snis { };
|
||||
|
||||
system-syzygy = callPackage ../games/system-syzygy { };
|
||||
|
||||
t4kcommon = callPackage ../games/t4kcommon { };
|
||||
|
||||
@ -520,6 +520,8 @@ in {
|
||||
|
||||
ansiconv = callPackage ../development/python-modules/ansiconv { };
|
||||
|
||||
ansimarkup = callPackage ../development/python-modules/ansimarkup { };
|
||||
|
||||
ansiwrap = callPackage ../development/python-modules/ansiwrap { };
|
||||
|
||||
antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime {
|
||||
@ -1487,6 +1489,8 @@ in {
|
||||
|
||||
coqpit = callPackage ../development/python-modules/coqpit { };
|
||||
|
||||
cepa = callPackage ../development/python-modules/cepa { };
|
||||
|
||||
cerberus = callPackage ../development/python-modules/cerberus { };
|
||||
|
||||
cert-chain-resolver = callPackage ../development/python-modules/cert-chain-resolver { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user