Merge master into haskell-updates
This commit is contained in:
commit
3755a52ac8
|
@ -13,7 +13,7 @@ let
|
|||
(iniFmt.generate "PackageKit.conf" (recursiveUpdate
|
||||
{
|
||||
Daemon = {
|
||||
DefaultBackend = "test_nop";
|
||||
DefaultBackend = "nix";
|
||||
KeepCache = false;
|
||||
};
|
||||
}
|
||||
|
@ -35,7 +35,7 @@ let
|
|||
in
|
||||
{
|
||||
imports = [
|
||||
(mkRemovedOptionModule [ "services" "packagekit" "backend" ] "The only backend that doesn't blow up is `test_nop`.")
|
||||
(mkRemovedOptionModule [ "services" "packagekit" "backend" ] "Always set to Nix.")
|
||||
];
|
||||
|
||||
options.services.packagekit = {
|
||||
|
@ -62,6 +62,8 @@ in
|
|||
|
||||
services.dbus.packages = with pkgs; [ packagekit ];
|
||||
|
||||
environment.systemPackages = with pkgs; [ packagekit ];
|
||||
|
||||
systemd.packages = with pkgs; [ packagekit ];
|
||||
|
||||
environment.etc = listToAttrs (map
|
||||
|
|
|
@ -79,7 +79,7 @@ in {
|
|||
in {
|
||||
services.rsync = {
|
||||
enable = !cfg.socketActivated;
|
||||
aliases = [ "rsyncd" ];
|
||||
aliases = [ "rsyncd.service" ];
|
||||
|
||||
description = "fast remote file copy program daemon";
|
||||
after = [ "network.target" ];
|
||||
|
|
|
@ -17,7 +17,7 @@ let
|
|||
|
||||
machine = { pkgs, ... }: {
|
||||
environment.systemPackages = [ pkgs."${packageSet}"."${variant}" ];
|
||||
virtualisation.diskSize = "800";
|
||||
virtualisation.diskSize = 800;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
|
|
|
@ -2,25 +2,23 @@
|
|||
, lib
|
||||
, fetchFromGitLab
|
||||
, cairo
|
||||
, dbus
|
||||
, desktop-file-utils
|
||||
, gettext
|
||||
, glib
|
||||
, gtk3
|
||||
, libhandy_0
|
||||
, libsass
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, meson
|
||||
, ninja
|
||||
, pango
|
||||
, pkg-config
|
||||
, python3
|
||||
, rustPlatform
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "contrast";
|
||||
version = "0.0.3";
|
||||
version = "0.0.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
|
@ -28,13 +26,13 @@ stdenv.mkDerivation rec {
|
|||
owner = "design";
|
||||
repo = "contrast";
|
||||
rev = version;
|
||||
sha256 = "0kk3mv7a6y258109xvgicmsi0lw0rcs00gfyivl5hdz7qh47iccy";
|
||||
sha256 = "cypSbqLwSmauOoWOuppWpF3hvrxiqmkLspxAWzvlUC0=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-ePkPiWGn79PHrMsSEql5OXZW5uRMdTP+w0/DCcm2KG4=";
|
||||
hash = "sha256-W4FyqwJpimf0isQRCq9TegpTQPQfsumx40AFQCFG5VQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -47,29 +45,31 @@ stdenv.mkDerivation rec {
|
|||
rustPlatform.rust.cargo
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.rust.rustc
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
glib # for glib-compile-resources
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
dbus
|
||||
glib
|
||||
gtk3
|
||||
libhandy_0
|
||||
libsass
|
||||
gtk4
|
||||
libadwaita
|
||||
pango
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/meson_post_install.py
|
||||
# https://gitlab.gnome.org/World/design/contrast/-/merge_requests/23
|
||||
substituteInPlace build-aux/meson_post_install.py \
|
||||
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Checks whether the contrast between two colors meet the WCAG requirements";
|
||||
homepage = "https://gitlab.gnome.org/World/design/contrast";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -18,13 +18,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.0-22";
|
||||
version = "7.1.0-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = version;
|
||||
sha256 = "sha256-Pd/b3lmFpOis8z+ITFScBUNALIKJY4ZOx2VOBwM0Bh4=";
|
||||
sha256 = "sha256-NNdtJvgExAFPgJxkSDq8N/UqCbuMRw2N5hPnWGszJtI=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
|
|
@ -3,33 +3,35 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "deskew";
|
||||
version = "1.25";
|
||||
version = "1.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "galfar";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0zjjj66qhgqkmfxl3q7p78dv4xl4ci918pgl4d5259pqdj1bfgc8";
|
||||
hash = "sha256-xghVOEMkQ/mXpOzJqMaT3SII7xneMNoFqRlqjtzmDnA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ fpc ];
|
||||
buildInputs = [ libtiff ];
|
||||
|
||||
buildPhase = ''
|
||||
rm -r Bin # Remove pre-compiled binary
|
||||
mkdir Bin
|
||||
chmod +x compile.sh
|
||||
./compile.sh
|
||||
runHook preBuild
|
||||
patchShebangs ./Scripts
|
||||
pushd Scripts && ./compile.sh && popd
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dt $out/bin Bin/*
|
||||
runHook preInstall
|
||||
install -Dt $out/bin Bin/deskew
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command line tool for deskewing scanned text documents";
|
||||
homepage = "https://bitbucket.org/galfar/app-deskew/overview";
|
||||
license = licenses.mit;
|
||||
homepage = "https://galfar.vevb.net/deskew";
|
||||
license = with licenses; [ mit mpl11 ];
|
||||
maintainers = with maintainers; [ryantm];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
@ -33,11 +33,11 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
version = "8.3.0";
|
||||
version = "8.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
|
||||
sha256 = "1cakv316ipwyw6s3x4a6qhl0nmg17bxhh08c969gma3svamh1grw";
|
||||
sha256 = "tnZr+qjUcJ9Fhk6RP8iwu+/JsvYSE03NHhBfhedyCTQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -31,42 +31,14 @@ let
|
|||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
pname = "mupdf";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
|
||||
sha256 = "0rljl44y8p8hgaqializlyrgpij1wbnrzyp0ll5kcg7w05nylq48";
|
||||
sha256 = "1vfyhlqq1a0k0drcggly4bgsjasmf6lmpfbdi5xcrwdbzkagrbr1";
|
||||
};
|
||||
|
||||
patches = lib.optional stdenv.isDarwin ./darwin.patch ++ [
|
||||
(fetchpatch {
|
||||
name = "pdfocr.patch";
|
||||
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84";
|
||||
sha256 = "1fx6pdgwrbk3bqsx53764d61llfj9s5q8lxqkna7mjnp7mg4krj3";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "pdf-layer.patch";
|
||||
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54";
|
||||
sha256 = "0ma8jq8d9a0mf26qjklgi4gdaflpjik1br1nhafzvjz7ccl56ksm";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "pixmap.patch";
|
||||
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603";
|
||||
sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2021-3407.patch";
|
||||
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=cee7cefc610d42fd383b3c80c12cbc675443176a";
|
||||
sha256 = "18g9jsj90jnqibaff8pqi70a7x8ygc3sh4jl4xnvlv8vr7fxxbh6";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "CVE-2021-37220.patch";
|
||||
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=f5712c9949d026e4b891b25837edd2edc166151f";
|
||||
sha256 = "1zyw6w6zr7k2akpzkyycj2zzw3y5qc7afsn1ysklfj2rvb6cnsx3";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c
|
||||
'';
|
||||
|
|
|
@ -43,7 +43,7 @@ let
|
|||
});
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "phoc";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
|
@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
|
|||
owner = "Phosh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oUZtJzclVRSbLG3flF3ryLuvp1kPUtYNsmCG0csSC2A=";
|
||||
sha256 = "sha256-kfMM/YjgAktpOKHNcxxl1FPVbgATPDNRhEJ/sVT1LYs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -10,12 +10,12 @@ in
|
|||
rec {
|
||||
thunderbird = common rec {
|
||||
pname = "thunderbird";
|
||||
version = "91.5.1";
|
||||
version = "91.6.0";
|
||||
application = "comm/mail";
|
||||
binaryName = pname;
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
|
||||
sha512 = "5939e09b143e440efa906d95cda06826bd3a73b2edde5eed86229b8a0e4d1434519059f37d319d26978d7eea9b3906c5e1c1543a2bc2465625d5ab5438855717";
|
||||
sha512 = "a11eafe1390141ee3508eea06ba8ab135d0725513977a3b37b3b35f413a1f825dc14fef530b9ac961840804be59291c7f5cba3c93b12726605d4a7255660f749";
|
||||
};
|
||||
patches = [
|
||||
# The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "phosh";
|
||||
version = "0.14.1";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects
|
||||
sha256 = "sha256-FILSNVBYpWSPXeDb1Vc4jZ7zJMg0Gj6EY5yoc81gUr0=";
|
||||
sha256 = "sha256-ZEfYjgSaj4vVdfgdIcg0PWwlFX90PIm5wvdn9P/8tvo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, fetchzip }:
|
||||
|
||||
fetchzip {
|
||||
name = "ipaexfont-003.01";
|
||||
name = "ipaexfont-004.01";
|
||||
|
||||
url = "https://web.archive.org/web/20160616003021/http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip";
|
||||
url = "https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype
|
||||
'';
|
||||
|
||||
sha256 = "02a6sj990cnig5lq0m54nmbmfkr3s57jpxl9fiyzrjmigvd1qmhj";
|
||||
sha256 = "0wp369kri33kb1mmiq4lpl9i4xnacw9fj63ycmkmlkq64s8qnjnx";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Japanese font package with Mincho and Gothic fonts";
|
||||
|
@ -21,7 +21,7 @@ fetchzip {
|
|||
|
||||
This is the successor to the IPA fonts.
|
||||
'';
|
||||
homepage = "http://ipafont.ipa.go.jp/";
|
||||
homepage = "https://moji.or.jp/ipafont/";
|
||||
license = licenses.ipa;
|
||||
maintainers = with maintainers; [ gebner ];
|
||||
};
|
||||
|
|
|
@ -16,13 +16,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "unstable-2021-12-24";
|
||||
version = "2022-02-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = "aa1f1446b6dbc6acfe3ee247e6841369c68e1495";
|
||||
sha256 = "03f79h6kv5vbf92fhpi1wivzvcrfvvdvkhbmy805x4b4wl7qynki";
|
||||
rev = version;
|
||||
sha256 = "08a1jhirvn2x9hhjr0lqqqayhsf446cddapprxpsnsn9q6x2j2gp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
dontDropIconThemeCache = true;
|
||||
|
||||
# These fixup steps are slow and unnecessary for this package.
|
||||
# Package may installs almost 400 000 small files.
|
||||
# Package may install almost 400 000 small files.
|
||||
dontPatchELF = true;
|
||||
dontRewriteSymlinks = true;
|
||||
|
||||
|
|
|
@ -10,6 +10,8 @@
|
|||
, sizeVariants ? [] # default: standard
|
||||
, tweaks ? []
|
||||
, wallpapers ? false
|
||||
, withGrub ? false
|
||||
, grubScreens ? [] # default: 1080p
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -20,16 +22,17 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red"
|
|||
lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants
|
||||
lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants
|
||||
lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "midblack" "rimless" "normal" ] tweaks
|
||||
lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
inherit pname;
|
||||
version = "unstable-2022-01-07";
|
||||
version = "unstable-2022-02-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = "78e5421fee63b4c2a2a3d2e321538367b01a24ec";
|
||||
sha256 = "1vfvv1gfbr9yr9mz0kb7c7ij6pxcryni1fjs87gn4hpyzns431wk";
|
||||
rev = "7ab6a1b7eda81e914405a9931408b1d5c73e6891";
|
||||
sha256 = "09xixd6cz2iyyyg6vskyk0wj2mahfsg21dlfcvi862h8w01hg9lr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -65,6 +68,18 @@ stdenvNoCC.mkDerivation {
|
|||
''}
|
||||
''}
|
||||
|
||||
${lib.optionalString withGrub ''
|
||||
(
|
||||
cd other/grub2
|
||||
|
||||
patchShebangs install.sh
|
||||
|
||||
./install.sh --justcopy --dest $out/share/grub/themes \
|
||||
${lib.optionalString (builtins.elem "nord" tweaks) "--theme nord"} \
|
||||
${lib.optionalString (grubScreens != []) "--screen " + builtins.toString grubScreens}
|
||||
)
|
||||
''}
|
||||
|
||||
jdupes -L -r $out/share
|
||||
|
||||
runHook postInstall
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "graphite-kde-theme";
|
||||
version = "unstable-2022-01-22";
|
||||
version = "2022-02-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = "d60a26533b104d6d2251c5187a402f3f35ecbdf7";
|
||||
sha256 = "0cry5s3wr0frpchc0hx97r9v6r3v6rvln7l1hb3znn8npkr4mssi";
|
||||
rev = version;
|
||||
sha256 = "0pnn5s1vfdgkpsy5sc838731ly1imi8pbyd4asibw4zi238l0nvf";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -26,6 +26,16 @@ stdenv.mkDerivation rec {
|
|||
extensionPortalSlug = "pop-shell";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
for file in */main.js; do
|
||||
substituteInPlace $file --replace "gjs" "${gjs}/bin/gjs"
|
||||
done
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
chmod +x $out/share/gnome-shell/extensions/pop-shell@system76.com/*/main.js
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Keyboard-driven layer for GNOME Shell";
|
||||
license = licenses.gpl3Only;
|
||||
|
|
|
@ -1,20 +1,3 @@
|
|||
diff --git a/src/color_dialog/src/main.ts b/src/color_dialog/src/main.ts
|
||||
index 9522499..9911530 100644
|
||||
--- a/src/color_dialog/src/main.ts
|
||||
+++ b/src/color_dialog/src/main.ts
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/gjs
|
||||
+#!/usr/bin/env gjs
|
||||
|
||||
imports.gi.versions.Gtk = '3.0';
|
||||
|
||||
@@ -84,4 +84,4 @@ function launch_color_dialog() {
|
||||
|
||||
Gtk.init(null);
|
||||
|
||||
-launch_color_dialog()
|
||||
\ No newline at end of file
|
||||
+launch_color_dialog()
|
||||
diff --git a/src/extension.ts b/src/extension.ts
|
||||
index 7417c46..00d5829 100644
|
||||
--- a/src/extension.ts
|
||||
|
@ -28,23 +11,6 @@ index 7417c46..00d5829 100644
|
|||
|
||||
if (ipc) {
|
||||
const generator = (stdout: any, res: any) => {
|
||||
diff --git a/src/floating_exceptions/src/main.ts b/src/floating_exceptions/src/main.ts
|
||||
index f298ec7..87a6bc4 100644
|
||||
--- a/src/floating_exceptions/src/main.ts
|
||||
+++ b/src/floating_exceptions/src/main.ts
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/gjs
|
||||
+#!/usr/bin/env gjs
|
||||
|
||||
imports.gi.versions.Gtk = '3.0'
|
||||
|
||||
@@ -329,4 +329,4 @@ function main() {
|
||||
Gtk.main()
|
||||
}
|
||||
|
||||
-main()
|
||||
\ No newline at end of file
|
||||
+main()
|
||||
diff --git a/src/panel_settings.ts b/src/panel_settings.ts
|
||||
index 83ff56c..1bc1e98 100644
|
||||
--- a/src/panel_settings.ts
|
||||
|
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mate-tweak";
|
||||
version = "22.04.0";
|
||||
version = "22.04.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ubuntu-mate";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "yCML+RdN7/dCCx5x1m8fUIkBrnfKztwqplpu1wXwDvY=";
|
||||
sha256 = "FcXJc8tlpP9RCrO6EVGvHPFF6qXorImzi9UccgZU+co=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
mkXfceDerivation {
|
||||
category = "panel-plugins";
|
||||
pname = "xfce4-cpufreq-plugin";
|
||||
version = "1.2.5";
|
||||
sha256 = "sha256-r783SIGbVKxmLjCxexrMWjYdK7EgbgcHDFTG8KGjWMc=";
|
||||
version = "1.2.6";
|
||||
sha256 = "sha256-HS+9pBCHy0NmDVUwL8QFDPeVpKyKib8YCwV8fZDL5Uc=";
|
||||
|
||||
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
|
||||
|
||||
|
|
|
@ -20,11 +20,11 @@ let
|
|||
category = "panel-plugins";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "xfce4-cpugraph-plugin";
|
||||
version = "1.2.5";
|
||||
version = "1.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-wvbb1/g8ebY7g8mCMsedBQ4YZA6CRkueyNNkOpLDobA=";
|
||||
sha256 = "sha256-dzJG9XwYJKhUaNQRnBeusHFw7R66zo+kBsf7z1tHr5k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,11 +8,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xfce4-sensors-plugin";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-2pDxLmrplbzRyBvjVHmnqdMjCMZezWTlaLqMlZLTn8s=";
|
||||
sha256 = "sha256-FxwCNfcMZfD/7lh+lg2dp5soSFXfIhMCOerCYnLsBsk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -55,5 +55,6 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ stesie AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mit;
|
||||
mainProgram = "qjs";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -20,11 +20,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spidermonkey";
|
||||
version = "91.5.1";
|
||||
version = "91.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
|
||||
sha256 = "sha256-NgSWlFBf9e3RoIZIDlo9Kf7dPwsNSoononGmbo/GzR8=";
|
||||
sha512 = "3dd1929f93cdd087a93fc3597f32d9005c986b59832954e01a8c2472b179c92ad611eaa73d3fc000a08b838a0b70da73ff5ba82d6009160655ba6894cf04520e";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
@ -64,7 +64,7 @@ assert enableGeoLocation -> geoclue2 != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webkitgtk";
|
||||
version = "2.34.4";
|
||||
version = "2.34.5";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-l19QGRmbp2mRkYNc914BoYuU47zQEH2nOJ1N3LGrpAY=";
|
||||
sha256 = "sha256-aJMGQ696R6OvBfRtZueEQiQzdT2rM10ygvMZqFpWKbQ=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
|
|
|
@ -13,8 +13,8 @@ let param =
|
|||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "ocaml${ocaml.version}-functory-${param.version}";
|
||||
pname = "ocaml${ocaml.version}-functory";
|
||||
inherit (param) version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.lri.fr/~filliatr/functory/download/functory-${param.version}.tar.gz";
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.3";
|
||||
name = "ocaml${ocaml.version}-inotify-${version}";
|
||||
pname = "ocaml${ocaml.version}-inotify";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "whitequark";
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }:
|
||||
|
||||
let version = "1.0.1"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml${ocaml.version}-jsonm-${version}";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-jsonm";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://erratique.ch/software/jsonm/releases/jsonm-${version}.tbz";
|
||||
|
|
|
@ -7,7 +7,7 @@ else
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6";
|
||||
name = "ocaml${ocaml.version}-lablgtk-extras-${version}";
|
||||
pname = "ocaml${ocaml.version}-lablgtk-extras";
|
||||
src = fetchFromGitLab {
|
||||
domain = "framagit.org";
|
||||
owner = "zoggy";
|
||||
|
|
|
@ -49,7 +49,7 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit (param) version src;
|
||||
name = "ocaml${ocaml.version}-labltk-${version}";
|
||||
pname = "ocaml${ocaml.version}-labltk";
|
||||
|
||||
buildInputs = [ ocaml findlib tcl tk makeWrapper ];
|
||||
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.1";
|
||||
name = "ocaml${ocaml.version}-lwt_react-${version}";
|
||||
pname = "ocaml${ocaml.version}-lwt_react";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz";
|
||||
url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-${version}.tar.gz";
|
||||
sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31";
|
||||
};
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, fetchFromGitHub, perl, ocaml, findlib, camlidl, gmp, mpfr }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-mlgmpidl-${version}";
|
||||
pname = "ocaml${ocaml.version}-mlgmpidl";
|
||||
version = "1.2.12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nberth";
|
||||
|
|
|
@ -16,7 +16,8 @@ let param =
|
|||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml${ocaml.version}-mtime-${param.version}";
|
||||
pname = "ocaml${ocaml.version}-mtime";
|
||||
inherit (param) version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://erratique.ch/software/mtime/releases/mtime-${param.version}.tbz";
|
||||
|
|
|
@ -20,7 +20,7 @@ then throw "nocrypto is not available for OCaml ${ocaml.version}"
|
|||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-nocrypto-${version}";
|
||||
pname = "ocaml${ocaml.version}-nocrypto";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
@ -12,7 +12,7 @@ let withLwt = lwt != null; in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.2.2";
|
||||
name = "ocaml${ocaml.version}-notty-${version}";
|
||||
pname = "ocaml${ocaml.version}-notty";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pqwy/notty/releases/download/v${version}/notty-${version}.tbz";
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.1";
|
||||
name = "ocaml${ocaml.version}-num-${version}";
|
||||
pname = "ocaml${ocaml.version}-num";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml";
|
||||
repo = "num";
|
||||
|
|
|
@ -7,7 +7,7 @@ then throw "ocamlnet is not available for OCaml ${ocaml.version}"
|
|||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-ocamlnet-${version}";
|
||||
pname = "ocaml${ocaml.version}-ocamlnet";
|
||||
version = "4.1.9";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
@ -5,7 +5,7 @@ then throw "ocp-ocamlres is not available for OCaml ${ocaml.version}"
|
|||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-ocp-ocamlres-${version}";
|
||||
pname = "ocaml${ocaml.version}-ocp-ocamlres";
|
||||
version = "0.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "OCamlPro";
|
||||
|
|
|
@ -13,8 +13,8 @@ let param =
|
|||
}; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "ocaml${ocaml.version}-pprint-${param.version}";
|
||||
inherit (param) version;
|
||||
pname = "ocaml${ocaml.version}-pprint";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gallium.inria.fr/~fpottier/pprint/pprint-${param.version}.tar.gz";
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-process-${version}";
|
||||
pname = "ocaml${ocaml.version}-process";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.8.5";
|
||||
name = "ocaml${ocaml.version}-ptime-${version}";
|
||||
pname = "ocaml${ocaml.version}-ptime";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://erratique.ch/software/ptime/releases/ptime-${version}.tbz";
|
||||
|
|
|
@ -23,7 +23,8 @@ let param =
|
|||
in
|
||||
|
||||
stdenv.mkDerivation ({
|
||||
name = "ocaml${ocaml.version}-rope-${param.version}";
|
||||
pname = "ocaml${ocaml.version}-rope";
|
||||
inherit (param) version;
|
||||
|
||||
src = fetchurl {
|
||||
inherit (param) url sha256;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-rresult-${version}";
|
||||
pname = "ocaml${ocaml.version}-rresult";
|
||||
version = "0.6.0";
|
||||
src = fetchurl {
|
||||
url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz";
|
||||
|
|
|
@ -7,7 +7,7 @@ then throw "sosa is not available for OCaml ${ocaml.version}"
|
|||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-sosa-${version}";
|
||||
pname = "ocaml${ocaml.version}-sosa";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
@ -27,7 +27,7 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-topkg-${version}";
|
||||
pname = "ocaml${ocaml.version}-topkg";
|
||||
inherit (param) version;
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
@ -5,7 +5,7 @@ then throw "wasm is not available for OCaml ${ocaml.version}"
|
|||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ocaml${ocaml.version}-wasm-${version}";
|
||||
pname = "ocaml${ocaml.version}-wasm";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiooncue";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-6GnXuYpggUMisfeOnl52xvWFIZRV+oCwsFKAjPwscTU=";
|
||||
hash = "sha256-rzgSvgVfpz2AVwqnat+TO+QhA3KcXV/a1HDNAP1fNPM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
39
pkgs/development/python-modules/aiosenseme/default.nix
Normal file
39
pkgs/development/python-modules/aiosenseme/default.nix
Normal file
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, ifaddr
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiosenseme";
|
||||
version = "0.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ShK4DP1lAtAFI6z2kf5T1ecbNTKUn2kqUjps2ABRegg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ifaddr
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aiosenseme"
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to interact with SenseME fans and lights by Big Ass Fans";
|
||||
homepage = "https://github.com/bdraco/aiosenseme";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "amcrest";
|
||||
version = "1.9.3";
|
||||
version = "1.9.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tchellomello";
|
||||
repo = "python-amcrest";
|
||||
rev = version;
|
||||
sha256 = "0f9l8xbn40xwx2zzssx5qmkpmv82j6syj8ncnmm6z9dc5wpr6sw7";
|
||||
sha256 = "sha256-smwPKZLevolNvpkLxoFR3NGL9YFPlBk3WYQqJXBaS7s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -14,14 +14,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "async-upnp-client";
|
||||
version = "0.23.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "0.23.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenLooman";
|
||||
repo = "async_upnp_client";
|
||||
rev = version;
|
||||
sha256 = "sha256-FrH5PwNpXZpNk7mUnMBGA9MQUPBqBEOoMd9T5ond2WA=";
|
||||
sha256 = "sha256-fMlP8LX+OFiw6o1rpz8J0sEsACk5x9dQko1oGEaZFuc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -59,7 +61,9 @@ buildPythonPackage rec {
|
|||
"test_deferred_callback_url"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "async_upnp_client" ];
|
||||
pythonImportsCheck = [
|
||||
"async_upnp_client"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Asyncio UPnP Client library for Python";
|
||||
|
|
107
pkgs/development/python-modules/django/4.nix
Normal file
107
pkgs/development/python-modules/django/4.nix
Normal file
|
@ -0,0 +1,107 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, substituteAll
|
||||
|
||||
# patched in
|
||||
, geos
|
||||
, gdal
|
||||
, withGdal ? false
|
||||
|
||||
# propagated
|
||||
, asgiref
|
||||
, backports-zoneinfo
|
||||
, sqlparse
|
||||
|
||||
# tests
|
||||
, aiosmtpd
|
||||
, argon2_cffi
|
||||
, bcrypt
|
||||
, docutils
|
||||
, geoip2
|
||||
, jinja2
|
||||
, memcached
|
||||
, numpy
|
||||
, pillow
|
||||
, pylibmc
|
||||
, pymemcache
|
||||
, python
|
||||
, pytz
|
||||
, pywatchman
|
||||
, pyyaml
|
||||
, redis
|
||||
, selenium
|
||||
, tblib
|
||||
, tzdata
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
version = "4.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-EQ+1j7Euylngcq1Z/ELXcc1kLdei8kFlgqqdp6jvlUo=";
|
||||
};
|
||||
|
||||
patches = lib.optional withGdal
|
||||
(substituteAll {
|
||||
src = ./django_4_set_geos_gdal_lib.patch;
|
||||
geos = geos;
|
||||
gdal = gdal;
|
||||
extension = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
});
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asgiref
|
||||
sqlparse
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
backports-zoneinfo
|
||||
];
|
||||
|
||||
# Fails to import asgiref in ~200 tests
|
||||
# ModuleNotFoundError: No module named 'asgiref'
|
||||
doCheck = false;
|
||||
|
||||
checkInputs = [
|
||||
aiosmtpd
|
||||
argon2_cffi
|
||||
asgiref
|
||||
bcrypt
|
||||
docutils
|
||||
geoip2
|
||||
jinja2
|
||||
memcached
|
||||
numpy
|
||||
pillow
|
||||
pylibmc
|
||||
pymemcache
|
||||
pytz
|
||||
pywatchman
|
||||
pyyaml
|
||||
redis
|
||||
selenium
|
||||
tblib
|
||||
tzdata
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
${python.interpreter} tests/runtests.py
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design.";
|
||||
homepage = "https://www.djangoproject.com";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py
|
||||
index 05b5732..91fafee 100644
|
||||
--- a/django/contrib/gis/gdal/libgdal.py
|
||||
+++ b/django/contrib/gis/gdal/libgdal.py
|
||||
@@ -14,7 +14,7 @@ try:
|
||||
from django.conf import settings
|
||||
lib_path = settings.GDAL_LIBRARY_PATH
|
||||
except (AttributeError, ImportError, ImproperlyConfigured, OSError):
|
||||
- lib_path = None
|
||||
+ lib_path = ""@gdal@/lib/libgdal@extension@"
|
||||
|
||||
if lib_path:
|
||||
lib_names = None
|
||||
diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py
|
||||
index 2cdb5d3..fac2d04 100644
|
||||
--- a/django/contrib/gis/geos/libgeos.py
|
||||
+++ b/django/contrib/gis/geos/libgeos.py
|
||||
@@ -24,7 +24,7 @@ def load_geos():
|
||||
from django.conf import settings
|
||||
lib_path = settings.GEOS_LIBRARY_PATH
|
||||
except (AttributeError, ImportError, ImproperlyConfigured, OSError):
|
||||
- lib_path = None
|
||||
+ lib_path = "@geos@/lib/libgeos_c@extension@"
|
||||
|
||||
# Setting the appropriate names for the GEOS-C library.
|
||||
if lib_path:
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fiona";
|
||||
version = "1.8.20";
|
||||
version = "1.8.21";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Fiona";
|
||||
inherit version;
|
||||
sha256 = "a70502d2857b82f749c09cb0dea3726787747933a2a1599b5ab787d74e3c143b";
|
||||
sha256 = "sha256-Og7coqegcNtAXXEYchSkPSMzpXtAl1RKP8woIGali/w=";
|
||||
};
|
||||
|
||||
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
|
||||
|
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipyvuetify";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
|
||||
# GitHub version tries to run npm (Node JS)
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2d17367ce7da45a2622107d55c8b4c5475aace99ed5d95e5d7d3f93aa4c0c566";
|
||||
sha256 = "sha256-uFjS7lv8kDRultRqqu2++1eieLs67dLolVurTXWls8A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ipyvue ];
|
||||
|
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "librosa";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c53d05e768ae4a3e553ae21c2e5015293e5efbfd5c12d497f1104cb519cca6b3";
|
||||
sha256 = "sha256-zSFnXTuYWPjRs7FDKzYONoFFvtN4B+HxOwcRqozTkP0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ joblib matplotlib six scikit-learn decorator audioread resampy soundfile pooch ];
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pip-tools";
|
||||
version = "6.5.0";
|
||||
version = "6.5.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-0U6k/CwRjbKmr2WkNFqLmzVeeSrtrWv2TdPrl8X8X+4=";
|
||||
sha256 = "sha256-gPViqmmfx2pCRTlpfgvvQeSQoFDlemohRoUxmBqdQZ4=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-cases";
|
||||
version = "3.6.8";
|
||||
version = "3.6.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d423e87b30e1080cc162d86c72bfa35861cccfe3539125e81c68ba142ab974bc";
|
||||
sha256 = "sha256-Bf9favhlHcGj8nf1JxTkMjpo8hMyfBHgMCilOcIL2Sk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,21 +1,30 @@
|
|||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-celery";
|
||||
version = "0.0.0";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "cfd060fc32676afa1e4f51b2938f903f7f75d952186b8c6cf631628c4088f406";
|
||||
format = "flit";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "celery";
|
||||
repo = "pytest-celery";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vzWwkOS3BLOInaFDk+PegvEmC88ZZ1sG1CmHwhn7r9w=";
|
||||
};
|
||||
|
||||
patches = [ ./no-celery.patch ];
|
||||
postPatch = ''
|
||||
# avoid infinite recursion with celery
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace '"celery >= 4.4.0"' ""
|
||||
'';
|
||||
|
||||
doCheck = false; # This package has nothing to test or import.
|
||||
# This package has nothing to test or import.
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "pytest plugin for unittest subTest() support and subtests fixture";
|
||||
homepage = "https://github.com/pytest-dev/pytest-subtests";
|
||||
description = "Pytest plugin to enable celery.contrib.pytest";
|
||||
homepage = "https://github.com/celery/pytest-celery";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
This plugin is needed to test celery itself, so it can't depend on celery.
|
||||
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -6,3 +6,3 @@ from distutils.core import setup
|
||||
install_requires = \
|
||||
-['celery >= 4.4.0']
|
||||
+[]
|
||||
|
|
@ -1,23 +1,41 @@
|
|||
{ buildPythonPackage, fetchPypi, lib, python-dateutil, requests
|
||||
, six, sseclient-py }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, python-dateutil
|
||||
, requests
|
||||
, six
|
||||
, sseclient-py
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-nest";
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "12iyypbl92ybh8w1bf4z0c2g0sb9id2c07c89vzvnlxgjylw3wbi";
|
||||
hash = "sha256-01hoZbDssbJ10NA72gOtlzjZMGjsUBUoVDVM35uAOLU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python-dateutil requests six sseclient-py ];
|
||||
# has no tests
|
||||
propagatedBuildInputs = [
|
||||
python-dateutil
|
||||
requests
|
||||
six
|
||||
sseclient-py
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "nest" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nest"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
"Python API and command line tool for talking to the Nest™ Thermostat";
|
||||
description = "Python API and command line tool for talking to the Nest™ Thermostat";
|
||||
homepage = "https://github.com/jkoelker/python-nest";
|
||||
license = licenses.cc-by-nc-sa-40;
|
||||
maintainers = with maintainers; [ jamiemagee ];
|
||||
|
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywayland";
|
||||
version = "0.4.9";
|
||||
version = "0.4.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "EJ/Ul1ZpIQa5Mw6UmkRi7GC+b+mCMqhto6EsfNjpCdg=";
|
||||
sha256 = "sha256-3fVAJXiIS6sFUj8riHg7LJ4VLLpjZEK8qTJNYSaXtOw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywizlight";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "sbidy";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/euT77CAcfM9gMBV4SQsJWn6+JWcmqGNN8NGGX93xSg=";
|
||||
sha256 = "sha256-CbbnCNHmc2yoKX8hDUCD8gIvDX5HNL3HYKpbJjLgQwk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "slack-sdk";
|
||||
version = "3.14.0";
|
||||
version = "3.14.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "slackapi";
|
||||
repo = "python-slack-sdk";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CRE5ghYJzo/w7d2zGh3IYUb2pl8we1XcoTo2ZKWxUZ8=";
|
||||
sha256 = "sha256-KhEfD8k7qQMfY2ErqApn1K1lhIJgBiVBjjWKL2DjNdg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ufoLib2";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "xJfvyNE+30BgNirX8u1xhKcD8pM3owRAVC4WX+qFqEM=";
|
||||
sha256 = "sha256-MnWi2mI+bUt+4pyYTNs6W4a7wj8KHOlEhti7XDCKpHs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -22,13 +22,13 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.805";
|
||||
version = "2.0.812";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-vQ5BJUwjik9Wfh4eFGuefpMuTcEV83hYEJKa5/n+kRc=";
|
||||
hash = "sha256-dCGcg0v83/KJGCvq2jQSemaHJb5wvluN6U73dRer6gY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
|
@ -44,13 +44,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "radare2";
|
||||
version = "5.5.4";
|
||||
version = "5.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radare";
|
||||
repo = "radare2";
|
||||
rev = version;
|
||||
sha256 = "sha256-zELmNpbT1JCt0UAzHwzcTDN9QZTLQY0+rG9zVRWxiFg=";
|
||||
sha256 = "sha256-AhO7Ev/4M9dtogNIMWOc03ARD5H2gdlRXR4Qpnkf7bw=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
@ -67,10 +67,6 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm
|
||||
'';
|
||||
|
||||
WITHOUT_PULL = "1";
|
||||
makeFlags = [
|
||||
"GITTAP=${version}"
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
{ lib, bundlerEnv, bundlerUpdateScript, ruby, perl, autoconf }:
|
||||
|
||||
bundlerEnv {
|
||||
pname = "chef-dk";
|
||||
version = "4.13.3";
|
||||
name = "chef-dk-4.13.3";
|
||||
# Do not change this to pname & version until underlying issues with Ruby
|
||||
# packaging are resolved ; see https://github.com/NixOS/nixpkgs/issues/70171
|
||||
|
||||
inherit ruby;
|
||||
gemdir = ./.;
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typos";
|
||||
version = "1.3.7";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bsPwyTucFJdKp+r8uJ2XLOzvbTM4i5EmSY+3VgyAFuE=";
|
||||
sha256 = "sha256-XFx8M9cQ7uXm4LS983FOZ6hz3zffLahhwrBjytbwEWk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-2wJXx8xHPrjzKupuen3XfRMSviYEwYK3nbL5/uTDIzE=";
|
||||
cargoSha256 = "sha256-ngWvbNx41K3PfGbzJfH8uBUl0cuI/Abj6EbX8YANk6Q=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Source code spell checker";
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fheroes2";
|
||||
version = "0.9.11";
|
||||
version = "0.9.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihhub";
|
||||
repo = "fheroes2";
|
||||
rev = version;
|
||||
sha256 = "sha256-p2FG4oWLTGflOoxsp8A+FpoVHfKiEw3DEnK8n3UiBtU=";
|
||||
sha256 = "sha256-6voM6aQ22zW6NHm9x2TDsM4Kea6TLYZTdSLyc/6fz8A=";
|
||||
};
|
||||
|
||||
buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ];
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp
|
||||
, libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, sqlite, luajit
|
||||
, freetype, gettext, doxygen, ncurses, graphviz, xorg, gmp, libspatialindex
|
||||
, leveldb, postgresql, hiredis, libiconv, OpenGL, OpenAL ? openal, Carbon, Cocoa
|
||||
, leveldb, postgresql, hiredis, libiconv, zlib, libXrandr, libX11, ninja, prometheus-cpp
|
||||
, OpenGL, OpenAL ? openal, Carbon, Cocoa
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
@ -9,6 +10,21 @@ with lib;
|
|||
let
|
||||
boolToCMake = b: if b then "ON" else "OFF";
|
||||
|
||||
irrlichtMt = stdenv.mkDerivation rec {
|
||||
pname = "irrlichtMt";
|
||||
version = "1.9.0mt4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "minetest";
|
||||
repo = "irrlicht";
|
||||
rev = version;
|
||||
sha256 = "sha256-YlXn9LrfGkjdb8+zQGDgrInolUYj9nVSF2AXWFpEEkw=";
|
||||
};
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ zlib libjpeg libpng libGLU libGL libXrandr libX11 libXxf86vm ];
|
||||
outputs = [ "out" "dev" ];
|
||||
meta = irrlicht.meta;
|
||||
};
|
||||
|
||||
generic = { version, rev ? version, sha256, dataRev ? version, dataSha256, buildClient ? true, buildServer ? false }: let
|
||||
sources = {
|
||||
src = fetchFromGitHub {
|
||||
|
@ -30,29 +46,41 @@ let
|
|||
src = sources.src;
|
||||
|
||||
cmakeFlags = [
|
||||
"-G Ninja"
|
||||
"-DBUILD_CLIENT=${boolToCMake buildClient}"
|
||||
"-DBUILD_SERVER=${boolToCMake buildServer}"
|
||||
"-DENABLE_FREETYPE=1"
|
||||
"-DENABLE_GETTEXT=1"
|
||||
"-DENABLE_SPATIAL=1"
|
||||
"-DENABLE_SYSTEM_JSONCPP=1"
|
||||
"-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"
|
||||
"-DIRRLICHT_INCLUDE_DIR=${irrlichtMt.dev}/include/irrlicht"
|
||||
|
||||
# Remove when https://github.com/NixOS/nixpkgs/issues/144170 is fixed
|
||||
"-DCMAKE_INSTALL_BINDIR=bin"
|
||||
"-DCMAKE_INSTALL_DATADIR=share"
|
||||
"-DCMAKE_INSTALL_DOCDIR=share/doc"
|
||||
"-DCMAKE_INSTALL_DOCDIR=share/doc"
|
||||
"-DCMAKE_INSTALL_MANDIR=share/man"
|
||||
"-DCMAKE_INSTALL_LOCALEDIR=share/locale"
|
||||
|
||||
] ++ optionals buildClient [
|
||||
"-DOpenGL_GL_PREFERENCE=GLVND"
|
||||
] ++ optionals buildServer [
|
||||
"-DENABLE_PROMETHEUS=1"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen graphviz ];
|
||||
nativeBuildInputs = [ cmake doxygen graphviz ninja ];
|
||||
|
||||
buildInputs = [
|
||||
irrlicht luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses
|
||||
irrlichtMt luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses
|
||||
gmp libspatialindex
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
libiconv OpenGL OpenAL Carbon Cocoa
|
||||
] ++ optionals buildClient [
|
||||
libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm
|
||||
] ++ optionals buildServer [
|
||||
leveldb postgresql hiredis
|
||||
leveldb postgresql hiredis prometheus-cpp
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
@ -73,22 +101,13 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
v4 = {
|
||||
version = "0.4.17.1";
|
||||
sha256 = "19sfblgh9mchkgw32n7gdvm7a8a9jxsl9cdlgmxn9bk9m939a2sg";
|
||||
dataSha256 = "1g8iw2pya32ifljbdx6z6rpcinmzm81i9minhi2bi1d500ailn7s";
|
||||
};
|
||||
|
||||
v5 = {
|
||||
version = "5.4.1";
|
||||
sha256 = "062ilb7s377q3hwfhl8q06vvcw2raydz5ljzlzwy2dmyzmdcndb8";
|
||||
dataSha256 = "0i45lbnikvgj9kxdp0yphpjjwjcgp4ibn49xkj78j5ic1s9n8jd4";
|
||||
version = "5.5.0";
|
||||
sha256 = "sha256-V+ggqvZibSQrJbrtNCEkmRYHhgSKTQsdBh3c8+t6WeA=";
|
||||
dataSha256 = "sha256-6ZS3EET3nm09eL0czCGadwzon35/EBfAg2KjPX3ZP/0=";
|
||||
};
|
||||
|
||||
in {
|
||||
minetestclient_4 = generic (v4 // { buildClient = true; buildServer = false; });
|
||||
minetestserver_4 = generic (v4 // { buildClient = false; buildServer = true; });
|
||||
|
||||
minetestclient_5 = generic (v5 // { buildClient = true; buildServer = false; });
|
||||
minetestserver_5 = generic (v5 // { buildClient = false; buildServer = true; });
|
||||
}
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -802,7 +802,6 @@
|
||||
install(CODE "
|
||||
set(BU_CHMOD_BUNDLE_ITEMS ON)
|
||||
include(BundleUtilities)
|
||||
- fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/${BUNDLE_PATH}\" \"\" \"\${CMAKE_INSTALL_PREFIX}/${BINDIR}\")
|
||||
" COMPONENT Runtime)
|
||||
endif()
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -17,6 +17,7 @@
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
+#include <cstdint>
|
||||
#include "irrlicht.h" // createDevice
|
||||
#include "irrlichttypes_extrabloated.h"
|
||||
#include "chat_interface.h"
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epson-inkjet-printer-escpr2";
|
||||
version = "1.1.45";
|
||||
version = "1.1.46";
|
||||
|
||||
src = fetchurl {
|
||||
# To find new versions, visit
|
||||
# http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for
|
||||
# some printer like for instance "WF-7210" to get to the most recent
|
||||
# version.
|
||||
url = "https://download3.ebz.epson.net/dsc/f/03/00/13/38/11/01e244e8529c5cbcec8d39220a9512d5e6c08eec/epson-inkjet-printer-escpr2-1.1.45-1lsb3.2.src.rpm";
|
||||
sha256 = "sha256-MZXn1fsD3D6W5vlX+NwRkwLtaBRqQwe9lwnJC2L9Lfk=";
|
||||
url = "https://download3.ebz.epson.net/dsc/f/03/00/13/43/83/99e36ae2747bfae54a5dd32dacaf189a073278aa/epson-inkjet-printer-escpr2-1.1.46-1lsb3.2.src.rpm";
|
||||
sha256 = "sha256-7AeDULD/BB+swLBOwijilcM+yJi5slOMw2lEtquLyYw=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
@ -49,13 +49,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "anbox";
|
||||
version = "unstable-2020-11-29";
|
||||
version = "unstable-2021-10-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "6c10125a7f13908d2cbe56d2d9ab09872755f265";
|
||||
sha256 = "00bqssh4zcs0jj6w07b91719xkrpdw75vpcplwrvlhwsvl55f901";
|
||||
rev = "84f0268012cbe322ad858d76613f4182074510ac";
|
||||
sha256 = "sha256-QXWhatewiUDQ93cH1UZsYgbjUxpgB1ajtGFYZnKmabc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -1,39 +0,0 @@
|
|||
diff -urN gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in gogoc-1_2-RELEASE-fix/gogoc-tsp/conf/gogoc.conf.in
|
||||
--- gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in 2009-11-20 17:53:12.000000000 +0100
|
||||
+++ gogoc-1_2-RELEASE-fix/gogoc-tsp/conf/gogoc.conf.in 2012-02-25 15:16:12.758849219 +0100
|
||||
@@ -224,7 +224,7 @@
|
||||
#
|
||||
# broker_list=<file_name>
|
||||
#
|
||||
-broker_list=tsp-broker-list.txt
|
||||
+broker_list=/var/lib/gogoc/tsp-broker-list.txt
|
||||
|
||||
#
|
||||
# Last Server Used File Name:
|
||||
@@ -234,7 +234,7 @@
|
||||
#
|
||||
# last_server=<file_name>
|
||||
#
|
||||
-last_server=tsp-last-server.txt
|
||||
+last_server=/var/lib/gogoc/tsp-last-server.txt
|
||||
|
||||
#
|
||||
# Always Use Last Known Working Server:
|
||||
@@ -294,7 +294,7 @@
|
||||
#
|
||||
# log_filename=<file_name>
|
||||
#
|
||||
-log_filename=gogoc.log
|
||||
+log_filename=/var/log/gogoc.log
|
||||
|
||||
#
|
||||
# Log File Rotation:
|
||||
@@ -313,7 +313,7 @@
|
||||
#
|
||||
# log_rotation=<yes|no>
|
||||
#
|
||||
-log_rotation=yes
|
||||
+log_rotation=no
|
||||
|
||||
#
|
||||
# Log File Rotation Size:
|
|
@ -1,41 +0,0 @@
|
|||
{lib, stdenv, fetchurl, openssl, nettools, iproute2, sysctl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gogoclient";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchurl {
|
||||
#url = "http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz";
|
||||
url = "https://src.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz";
|
||||
sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49";
|
||||
};
|
||||
patches = [./gcc46-include-fix.patch ./config-paths.patch ];
|
||||
makeFlags = ["target=linux"];
|
||||
installFlags = ["installdir=$(out)"];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
buildInputs = [openssl];
|
||||
|
||||
preFixup = ''
|
||||
mkdir -p $out/share/gogoclient-${version}
|
||||
chmod 444 $out/bin/gogoc.conf
|
||||
mv $out/bin/gogoc.conf $out/share/gogoclient-${version}/gogoc.conf.sample
|
||||
rm $out/bin/gogoc.conf.sample
|
||||
|
||||
substituteInPlace "$out/template/linux.sh" \
|
||||
--replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \
|
||||
--replace "/sbin/route" "${nettools}/bin/route" \
|
||||
--replace "/sbin/ip" "${iproute2}/sbin/ip" \
|
||||
--replace "/sbin/sysctl" "${sysctl}/bin/sysctl"
|
||||
sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://ipv6.ernet.in/Tunnel_broker";
|
||||
description = "Client to connect to the Freenet6 IPv6 tunnel broker service";
|
||||
maintainers = [ maintainers.bluescreen303 ];
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -1,22 +0,0 @@
|
|||
diff -urN gogoc-1_2-RELEASE/gogoc-messaging/src/clientmsgsender.cc gogoc-1_2-RELEASE-fix/gogoc-messaging/src/clientmsgsender.cc
|
||||
--- gogoc-1_2-RELEASE/gogoc-messaging/src/clientmsgsender.cc 2009-11-20 17:34:55.000000000 +0100
|
||||
+++ gogoc-1_2-RELEASE-fix/gogoc-messaging/src/clientmsgsender.cc 2012-02-25 15:06:20.764698284 +0100
|
||||
@@ -15,6 +15,7 @@
|
||||
// **************************************************************************
|
||||
#include <gogocmessaging/clientmsgsender.h>
|
||||
#include <assert.h>
|
||||
+#include <stddef.h>
|
||||
|
||||
|
||||
namespace gogocmessaging
|
||||
diff -urN gogoc-1_2-RELEASE/gogoc-messaging/src/servermsgsender.cc gogoc-1_2-RELEASE-fix/gogoc-messaging/src/servermsgsender.cc
|
||||
--- gogoc-1_2-RELEASE/gogoc-messaging/src/servermsgsender.cc 2009-11-20 17:34:56.000000000 +0100
|
||||
+++ gogoc-1_2-RELEASE-fix/gogoc-messaging/src/servermsgsender.cc 2012-02-25 15:06:36.722740288 +0100
|
||||
@@ -15,6 +15,7 @@
|
||||
// **************************************************************************
|
||||
#include <gogocmessaging/servermsgsender.h>
|
||||
#include <assert.h>
|
||||
+#include <stddef.h>
|
||||
|
||||
|
||||
namespace gogocmessaging
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "microcode-intel";
|
||||
version = "20210608";
|
||||
version = "20220207";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "Intel-Linux-Processor-Microcode-Data-Files";
|
||||
rev = "microcode-${version}";
|
||||
sha256 = "08nk353z2lcqsjbm2qdsfapfgrvlfw0rj7r9scr9pllzkjj5n9x3";
|
||||
sha256 = "sha256-yNHYAf8AX8C8iSaFWa6u7knUryaUgvI6nIH9jkD4jjw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ iucode-tool libarchive ];
|
||||
|
|
|
@ -616,6 +616,6 @@ stdenv.mkDerivation {
|
|||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
priority = 10;
|
||||
maintainers = with maintainers; [ eelco flokli kloenk ];
|
||||
maintainers = with maintainers; [ flokli kloenk mic92 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,12 +4,12 @@
|
|||
|
||||
with python3Packages; buildPythonApplication rec {
|
||||
pname = "synadm";
|
||||
version = "0.32";
|
||||
version = "0.33.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e3fc0db4920d36092a00080fe5b6dac867a6d19f630f69822c8544568f5885e2";
|
||||
sha256 = "sha256-eIpRyx1iErZuB3n+Sl231BE47ckIXYzaelod7OtdSF8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grafana";
|
||||
version = "8.3.4";
|
||||
version = "8.3.5";
|
||||
|
||||
excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)";
|
||||
|
||||
|
@ -10,15 +10,15 @@ buildGoModule rec {
|
|||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "grafana";
|
||||
sha256 = "sha256-Ikvl8jsStMGDIc0y4cKWwyXJHTu4V4nCKiLUyERjRsw=";
|
||||
sha256 = "sha256-frkrYDiPxP3zDpZyYp/9MbNthaJlBF4Z+DdBs2G4jE8=";
|
||||
};
|
||||
|
||||
srcStatic = fetchurl {
|
||||
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
|
||||
sha256 = "sha256-UI+NouSRwQVmAgx19OHhWcoDLj9KD05xh57/1gLvWmA=";
|
||||
sha256 = "sha256-1gk9MK110K5bV3hIPAE2dSS8wgH12dxvmNu3Ku/42e0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-gaY6liueEmngxjPSegmycrLpfsB0p1YWWrNGbzpHHOc=";
|
||||
vendorSha256 = "sha256-Wg4VELJyrR/VbaFNamoziRU66GTVJxBUZ1vluKjn0O8=";
|
||||
|
||||
nativeBuildInputs = [ wire ];
|
||||
|
||||
|
|
|
@ -19,13 +19,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "powerlevel10k";
|
||||
version = "1.15.0";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romkatv";
|
||||
repo = "powerlevel10k";
|
||||
rev = "v${version}";
|
||||
sha256 = "1b3j2riainx3zz4irww72z0pb8l8ymnh1903zpsy5wmjgb0wkcwq";
|
||||
sha256 = "sha256-gSPCNLK733+9NWdalqUJ8nzkhoQxurXAYX9t4859j2s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "realvnc-vnc-viewer";
|
||||
version = "6.21.920";
|
||||
version = "6.21.1109";
|
||||
|
||||
src = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm";
|
||||
sha256 = "1qghc5380h4b2pczksmky3kcffz5wn9shw033w4f969wl96p31fz";
|
||||
sha256 = "12zxp9kvi070nzxbrnrfsyla38ryb69zlidw6cvypmsgqnylfxj7";
|
||||
};
|
||||
"i686-linux" = fetchurl {
|
||||
url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x86.rpm";
|
||||
sha256 = "034iwqxpqhnm6i292fakva7vkwrrzamwcvbm7xyccpd54adj0grn";
|
||||
sha256 = "03vhdmzyd16r0kdxpkq9azyy1h705lk4sbgnbw5fr8gkifwng60f";
|
||||
};
|
||||
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkg-config, scdoc, wayland-protocols }:
|
||||
{ lib, stdenv, fetchFromGitHub, pixman, libpng, libjpeg, meson, ninja, wayland, pkg-config, scdoc, wayland-protocols }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grim";
|
||||
version = "1.3.2";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emersion";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-71dmYENfPX8YHcTlR2F67EheoewicePMKm9/wPbmj9A=";
|
||||
sha256 = "sha256-lwJn1Lysv1qLauqmrduUlzdoKUrUM5uBjv+dWSsrM6w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
pixman
|
||||
libpng
|
||||
libjpeg
|
||||
wayland
|
||||
wayland-protocols
|
||||
|
|
|
@ -23,12 +23,6 @@ stdenv.mkDerivation rec {
|
|||
stripLen = 1;
|
||||
});
|
||||
|
||||
postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform)
|
||||
# XXX: Awful hack to allow cross-compilation.
|
||||
'' sed -i ./configure \
|
||||
-e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g'
|
||||
''; # "
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
|
|
@ -1,60 +1,95 @@
|
|||
{ stdenv, fetchFromGitHub, lib
|
||||
, intltool, glib, pkg-config, polkit, python3, sqlite
|
||||
, gobject-introspection, vala, gtk-doc, autoreconfHook, autoconf-archive
|
||||
, nix, enableNixBackend ? false, boost
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, gettext
|
||||
, glib
|
||||
, pkg-config
|
||||
, polkit
|
||||
, python3
|
||||
, sqlite
|
||||
, gobject-introspection
|
||||
, vala
|
||||
, gtk-doc
|
||||
, nix
|
||||
, boost
|
||||
, meson
|
||||
, ninja
|
||||
, libxslt
|
||||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_42
|
||||
, libxml2
|
||||
, gst_all_1
|
||||
, gtk3
|
||||
, enableCommandNotFound ? false
|
||||
, enableBashCompletion ? false, bash-completion ? null
|
||||
, enableSystemd ? stdenv.isLinux, systemd }:
|
||||
, enableBashCompletion ? false
|
||||
, bash-completion ? null
|
||||
, enableSystemd ? stdenv.isLinux
|
||||
, systemd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "packagekit";
|
||||
version = "1.1.13";
|
||||
version = "1.2.5pre";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hughsie";
|
||||
owner = "PackageKit";
|
||||
repo = "PackageKit";
|
||||
rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "0xmgac27p5z8wr56yw3cqhywnlvaf8kvyv1g0nzxnq167xj5vxam";
|
||||
rev = "9c2ef9cddf39ebde587907561f8e7ac99ed6be1a";
|
||||
sha256 = "05z1ds240kcmigygkbgjasr4spn7vd7cbpsbfrghhgnmszx9bjgl";
|
||||
};
|
||||
|
||||
buildInputs = [ glib polkit python3 gobject-introspection ]
|
||||
++ lib.optional enableSystemd systemd
|
||||
++ lib.optional enableBashCompletion bash-completion;
|
||||
propagatedBuildInputs =
|
||||
[ sqlite boost ]
|
||||
++ lib.optional enableNixBackend nix;
|
||||
nativeBuildInputs = [ vala intltool pkg-config autoreconfHook autoconf-archive gtk-doc ];
|
||||
|
||||
preAutoreconf = ''
|
||||
gtkdocize
|
||||
intltoolize
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
(if enableSystemd then "--enable-systemd" else "--disable-systemd")
|
||||
"--disable-dummy"
|
||||
"--disable-cron"
|
||||
"--enable-introspection"
|
||||
"--disable-offline-update"
|
||||
"--localstatedir=/var"
|
||||
"--sysconfdir=/etc"
|
||||
"--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d"
|
||||
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
|
||||
"--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"
|
||||
]
|
||||
++ lib.optional enableNixBackend "--enable-nix"
|
||||
++ lib.optional (!enableBashCompletion) "--disable-bash-completion"
|
||||
++ lib.optional (!enableCommandNotFound) "--disable-command-not-found";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installFlags = [
|
||||
"sysconfdir=${placeholder "out"}/etc"
|
||||
"localstatedir=\${TMPDIR}"
|
||||
buildInputs = [
|
||||
glib
|
||||
polkit
|
||||
python3
|
||||
gobject-introspection
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gtk3
|
||||
sqlite
|
||||
nix
|
||||
boost
|
||||
] ++ lib.optional enableSystemd systemd
|
||||
++ lib.optional enableBashCompletion bash-completion;
|
||||
nativeBuildInputs = [
|
||||
vala
|
||||
gettext
|
||||
pkg-config
|
||||
gtk-doc
|
||||
meson
|
||||
libxslt
|
||||
docbook-xsl-nons
|
||||
docbook_xml_dtd_42
|
||||
libxml2
|
||||
ninja
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
(if enableSystemd then "-Dsystemd=true" else "-Dsystem=false")
|
||||
"-Dpackaging_backend=nix"
|
||||
"-Ddbus_sys=${placeholder "out"}/share/dbus-1/system.d"
|
||||
"-Ddbus_services=${placeholder "out"}/share/dbus-1/system-services"
|
||||
"-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
|
||||
"-Dcron=false"
|
||||
"-Dgtk_doc=true"
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
]
|
||||
++ lib.optional (!enableBashCompletion) "-Dbash_completion=false"
|
||||
++ lib.optional (!enableCommandNotFound) "-Dbash_command_not_found=false";
|
||||
|
||||
postPatch = ''
|
||||
# HACK: we want packagekit to look in /etc for configs but install
|
||||
# those files in $out/etc ; we just override the runtime paths here
|
||||
# same for /var & $out/var
|
||||
substituteInPlace etc/meson.build \
|
||||
--replace "install_dir: join_paths(get_option('sysconfdir'), 'PackageKit')" "install_dir: join_paths('$out', 'etc', 'PackageKit')"
|
||||
substituteInPlace data/meson.build \
|
||||
--replace "install_dir: join_paths(get_option('localstatedir'), 'lib', 'PackageKit')," "install_dir: join_paths('$out', 'var', 'lib', 'PackageKit'),"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "System to facilitate installing and updating packages";
|
||||
longDescription = ''
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2022-02-05";
|
||||
version = "2022-02-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-1wdIvJ7AeCNNbApS16ZFmytsPL8Oal+ivem8cHOD1iA=";
|
||||
sha256 = "sha256-+E8MmkXnynCudGfKnCa6usmyPVM+y6kRB8eAm4F9glY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
55
pkgs/tools/security/orjail/default.nix
Normal file
55
pkgs/tools/security/orjail/default.nix
Normal file
|
@ -0,0 +1,55 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, tor
|
||||
, firejail
|
||||
, iptables
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "orjail";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "06bwqb3l7syy4c1d8xynxwakmdxvm3qfm8r834nidsknvpdckd9z";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs make-helper.bsh
|
||||
mkdir bin
|
||||
mv usr/sbin/orjail bin/orjail
|
||||
rm -r usr
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"DESTDIR=${placeholder "out"}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# Specify binary paths: tor, firejail, iptables
|
||||
# mktemp fails with /tmp path prefix, will work without it anyway
|
||||
# https://github.com/orjail/orjail/issues/78
|
||||
# firejail will fail reading /etc/hosts, therefore remove --hostname arg
|
||||
# https://github.com/netblue30/firejail/issues/2758
|
||||
substituteInPlace $out/bin/orjail \
|
||||
--replace ''$'TORBIN=\n' ''$'TORBIN=${tor}/bin/tor\n' \
|
||||
--replace ''$'FIREJAILBIN=\n' ''$'FIREJAILBIN=${firejail}/bin/firejail\n' \
|
||||
--replace 'iptables -' '${iptables}/bin/iptables -' \
|
||||
--replace 'mktemp /tmp/' 'mktemp ' \
|
||||
--replace '--hostname=host ' ""
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Force programs to exclusively use tor network";
|
||||
homepage = "https://github.com/orjail/orjail";
|
||||
license = licenses.wtfpl;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -0,0 +1,43 @@
|
|||
From a2d5d973f53efb11bdcaecbd0099df9714bc287f Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Tue, 8 Feb 2022 19:35:35 +0100
|
||||
Subject: [PATCH] Set `base` to an empty value
|
||||
|
||||
`DESTDIR` ensures that everything lands in the correct location (i.e.
|
||||
the target store-path on Nix), within this path, everything should be
|
||||
moved into `/lib` and `/share`.
|
||||
---
|
||||
setup.py | 17 ++---------------
|
||||
1 file changed, 2 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 1f0a58b..f7baa41 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -8,21 +8,8 @@ from pathlib import Path
|
||||
|
||||
from setuptools import setup
|
||||
|
||||
-share = Path(sys.prefix, 'share')
|
||||
-base = '/usr'
|
||||
-if os.uname().sysname == 'Darwin':
|
||||
- base = '/usr/local'
|
||||
-lib = Path(base, 'lib', 'password-store', 'extensions')
|
||||
-
|
||||
-if '--user' in sys.argv:
|
||||
- if 'PASSWORD_STORE_EXTENSIONS_DIR' in os.environ:
|
||||
- lib = Path(os.environ['PASSWORD_STORE_EXTENSIONS_DIR'])
|
||||
- else:
|
||||
- lib = Path.home() / '.password-store' / '.extensions'
|
||||
- if 'XDG_DATA_HOME' in os.environ:
|
||||
- share = Path(os.environ['XDG_DATA_HOME'])
|
||||
- else:
|
||||
- share = Path.home() / '.local' / 'share'
|
||||
+share = Path('share')
|
||||
+lib = Path('lib', 'password-store', 'extensions')
|
||||
|
||||
setup(
|
||||
data_files=[
|
||||
--
|
||||
2.33.1
|
||||
|
|
@ -5,16 +5,17 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "pass-audit";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roddhjav";
|
||||
repo = "pass-audit";
|
||||
rev = "v${version}";
|
||||
sha256 = "1vapymgpab91kh798mirgs1nb7j9qln0gm2d3321cmsghhb7xs45";
|
||||
sha256 = "sha256-xigP8LxRXITLF3X21zhWx6ooFNSTKGv46yFSt1dd4vs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-Set-base-to-an-empty-value.patch
|
||||
./0002-Fix-audit.bash-setup.patch
|
||||
];
|
||||
|
||||
|
@ -40,7 +41,8 @@ in stdenv.mkDerivation rec {
|
|||
installFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ];
|
||||
postInstall = ''
|
||||
wrapProgram $out/lib/password-store/extensions/audit.bash \
|
||||
--prefix PYTHONPATH : "$out/lib/${pythonEnv.libPrefix}/site-packages"
|
||||
--prefix PYTHONPATH : "$out/lib/${pythonEnv.libPrefix}/site-packages" \
|
||||
--run "export COMMAND"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -41,8 +41,8 @@
|
|||
, xen
|
||||
, yajl
|
||||
, IOKit
|
||||
# Defaults to `null` for all supported plugins,
|
||||
# list of plugin names for a custom build
|
||||
# Defaults to `null` for all supported plugins (except xen, which is marked as
|
||||
# insecure), otherwise a list of plugin names for a custom build
|
||||
, enabledPlugins ? null
|
||||
, ...
|
||||
}:
|
||||
|
@ -136,7 +136,7 @@ let
|
|||
buildInputs =
|
||||
if enabledPlugins == null
|
||||
then builtins.concatMap pluginBuildInputs
|
||||
(builtins.attrNames plugins)
|
||||
(builtins.attrNames (builtins.removeAttrs plugins ["xencpu"]))
|
||||
else builtins.concatMap pluginBuildInputs enabledPlugins;
|
||||
in {
|
||||
inherit configureFlags buildInputs;
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thinkfan";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmatare";
|
||||
repo = "thinkfan";
|
||||
rev = version;
|
||||
sha256 = "sha256-ZCZqi7A4qdWtDSkTw6ktHIZnPhdes2AX7+QBroaDDfI=";
|
||||
sha256 = "sha256-aREZv+t4QhtfLKOMrneLiRxgnu0fzB8UV8dvr1dnhx4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -367,9 +367,11 @@ mapAliases ({
|
|||
gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12
|
||||
gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14
|
||||
gmock = gtest; # moved from top-level 2021-03-14
|
||||
go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26
|
||||
go-pup = pup; # added 2017-12-19
|
||||
gobby5 = gobby; # added 2021-02-01
|
||||
gobjectIntrospection = gobject-introspection; # added 2018-12-02
|
||||
gogoclient = throw "gogoclient has been removed, because it was unmaintained"; # added 2021-12-15
|
||||
goimports = gotools; # added 2018-09-16
|
||||
gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23
|
||||
google-gflags = gflags; # added 2019-07-25
|
||||
|
|
|
@ -3537,6 +3537,8 @@ with pkgs;
|
|||
|
||||
oneshot = callPackage ../tools/networking/oneshot { };
|
||||
|
||||
orjail = callPackage ../tools/security/orjail { };
|
||||
|
||||
online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools;
|
||||
|
||||
xkbd = callPackage ../applications/misc/xkbd { };
|
||||
|
@ -22799,10 +22801,6 @@ with pkgs;
|
|||
|
||||
quicktemplate = callPackage ../development/tools/quicktemplate { };
|
||||
|
||||
gogoclient = callPackage ../os-specific/linux/gogoclient {
|
||||
openssl = openssl_1_0_2;
|
||||
};
|
||||
|
||||
linux-pam = callPackage ../os-specific/linux/pam { };
|
||||
|
||||
nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
|
||||
|
@ -23543,7 +23541,7 @@ with pkgs;
|
|||
|
||||
go-font = callPackage ../data/fonts/go-font { };
|
||||
|
||||
graphite-gtk-theme = callPackage ../data/themes/graphite { };
|
||||
graphite-gtk-theme = callPackage ../data/themes/graphite-gtk-theme { };
|
||||
|
||||
graphite-kde-theme = callPackage ../data/themes/graphite-kde-theme { };
|
||||
|
||||
|
@ -30969,10 +30967,11 @@ with pkgs;
|
|||
inherit (darwin) libiconv;
|
||||
inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa;
|
||||
})
|
||||
minetestclient_4 minetestserver_4
|
||||
minetestclient_5 minetestserver_5;
|
||||
|
||||
minetest = minetestclient_5;
|
||||
minetest = minetestclient;
|
||||
minetestclient = minetestclient_5;
|
||||
minetestserver = minetestserver_5;
|
||||
|
||||
mnemosyne = callPackage ../games/mnemosyne {
|
||||
python = python3;
|
||||
|
|
|
@ -392,6 +392,8 @@ in {
|
|||
|
||||
aiorun = callPackage ../development/python-modules/aiorun { };
|
||||
|
||||
aiosenseme = callPackage ../development/python-modules/aiosenseme { };
|
||||
|
||||
aiosenz = callPackage ../development/python-modules/aiosenz { };
|
||||
|
||||
aioserial = callPackage ../development/python-modules/aioserial { };
|
||||
|
@ -2192,9 +2194,10 @@ in {
|
|||
|
||||
# Current LTS
|
||||
django_2 = callPackage ../development/python-modules/django/2.nix { };
|
||||
django_3 = callPackage ../development/python-modules/django/3.nix { };
|
||||
|
||||
# Current latest
|
||||
django_3 = callPackage ../development/python-modules/django/3.nix { };
|
||||
django_4 = callPackage ../development/python-modules/django/4.nix { };
|
||||
|
||||
django-allauth = callPackage ../development/python-modules/django-allauth { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue