Jan Tojnar
3 years ago
commit
594a885912
@ -0,0 +1,28 @@ |
||||
{ lib, setuptools, boto3, requests, click, pyyaml, pydantic, buildPythonApplication |
||||
, pythonOlder, fetchFromGitHub, awscli }: |
||||
|
||||
buildPythonApplication rec { |
||||
pname = "nimbo"; |
||||
version = "0.2.4"; |
||||
disabled = pythonOlder "3.6"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "nimbo-sh"; |
||||
repo = pname; |
||||
rev = "v${version}"; |
||||
sha256 = "1fs28s9ynfxrb4rzba6cmik0kl0q0vkpb4zdappsq62jqf960k24"; |
||||
}; |
||||
|
||||
propagatedBuildInputs = [ setuptools boto3 awscli requests click pyyaml pydantic ]; |
||||
|
||||
# nimbo tests require an AWS instance |
||||
doCheck = false; |
||||
pythonImportsCheck = [ "nimbo" ]; |
||||
|
||||
meta = with lib; { |
||||
description = "Run machine learning jobs on AWS with a single command"; |
||||
homepage = "https://github.com/nimbo-sh/nimbo"; |
||||
license = licenses.bsl11; |
||||
maintainers = with maintainers; [ alex-eyre noreferences ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,89 @@ |
||||
{ lib |
||||
, fetchurl |
||||
, python3 |
||||
, gettext |
||||
, makeDesktopItem |
||||
, copyDesktopItems |
||||
}: |
||||
|
||||
python3.pkgs.buildPythonApplication rec { |
||||
pname = "timeline"; |
||||
version = "2.4.0"; |
||||
|
||||
src = fetchurl { |
||||
url = "mirror://sourceforge/thetimelineproj/${pname}-${version}.zip"; |
||||
sha256 = "1pa0whqci6c2p20xf7gbndrrpr1xg42ixhql595ibdd4p3l37v23"; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ]; |
||||
|
||||
pythonPath = with python3.pkgs; [ |
||||
wxPython_4_0 # not compatible with wxPython_4_1. reported upstream https://github.com/wxWidgets/Phoenix/issues/1956 |
||||
humblewx |
||||
icalendar |
||||
markdown |
||||
pysvg-py3 |
||||
pillow |
||||
]; |
||||
|
||||
checkInputs = [ |
||||
gettext |
||||
python3.pkgs.mock |
||||
]; |
||||
|
||||
desktopItems = [ |
||||
(makeDesktopItem { |
||||
desktopName = "Timeline"; |
||||
name = "timeline"; |
||||
comment = "Display and navigate information on a timeline"; |
||||
icon = "timeline"; |
||||
terminal = false; |
||||
exec = "timeline"; |
||||
categories = "Office;Calendar;"; |
||||
}) |
||||
]; |
||||
|
||||
dontBuild = true; |
||||
doCheck = false; |
||||
|
||||
patchPhase = '' |
||||
sed -i "s|_ROOT =.*|_ROOT = \"$out/usr/share/timeline/\"|" source/timelinelib/config/paths.py |
||||
''; |
||||
|
||||
installPhase = '' |
||||
runHook preInstall |
||||
|
||||
site_packages=$out/${python3.pkgs.python.sitePackages} |
||||
install -D -m755 source/timeline.py $out/bin/timeline |
||||
mkdir -p $site_packages |
||||
cp -r source/timelinelib $site_packages/ |
||||
|
||||
mkdir -p $out/usr/share/timeline/locale |
||||
cp -r icons $out/usr/share/timeline/ |
||||
cp -r translations/ $out/usr/share/timeline/ |
||||
|
||||
mkdir -p $out/share/icons/hicolor/{48x48,32x32,16x16}/apps |
||||
cp icons/48.png $out/share/icons/hicolor/48x48/apps/timeline.png |
||||
cp icons/32.png $out/share/icons/hicolor/32x32/apps/timeline.png |
||||
cp icons/16.png $out/share/icons/hicolor/16x16/apps/timeline.png |
||||
|
||||
runHook postInstall |
||||
''; |
||||
|
||||
# tests fail because they need an x server |
||||
# Unable to access the X Display, is $DISPLAY set properly? |
||||
checkPhase = '' |
||||
runHook preCheck |
||||
${python3.interpreter} tools/execute-specs.py |
||||
runHook postCheck |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
homepage = "http://thetimelineproj.sourceforge.net/"; |
||||
changelog = "http://thetimelineproj.sourceforge.net/changelog.html"; |
||||
description = "Display and navigate information on a timeline"; |
||||
license = with licenses; [ gpl3Only cc-by-sa-30 ]; |
||||
platforms = with platforms; unix; |
||||
maintainers = with maintainers; [ davidak ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,22 @@ |
||||
{ stdenv, lib, buildGoModule, fetchFromGitHub }: |
||||
|
||||
buildGoModule rec { |
||||
pname = "prism"; |
||||
version = "0.1.1"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "muesli"; |
||||
repo = pname; |
||||
rev = "v${version}"; |
||||
sha256 = "0q7q7aj3fm45bnx6hgl9c1ll8na16x6p7qapr0c4a6dhxwd7n511"; |
||||
}; |
||||
|
||||
vendorSha256 = "1mkd1s9zgzy9agy2rjjk8wfdga7nzv9cmwgiarfi4xrqzj4mbaxq"; |
||||
|
||||
meta = with lib; { |
||||
description = "An RTMP stream recaster/splitter"; |
||||
homepage = "https://github.com/muesli/prism"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ paperdigits ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,115 @@ |
||||
{ lib |
||||
, stdenv |
||||
, fetchFromGitLab |
||||
, fetchurl |
||||
, fetchgit |
||||
, ffmpeg |
||||
, libGL |
||||
, libX11 |
||||
, libcap |
||||
, libdrm |
||||
, libinput |
||||
, libpng |
||||
, libxcb |
||||
, libxkbcommon |
||||
, mesa |
||||
, meson |
||||
, ninja |
||||
, pixman |
||||
, pkg-config |
||||
, unzip |
||||
, wayland |
||||
, wayland-protocols |
||||
, xcbutilerrors |
||||
, xcbutilimage |
||||
, xcbutilwm |
||||
}: |
||||
|
||||
let |
||||
# cereal.wrap |
||||
cereal-wrap = fetchurl { |
||||
name = "cereal-1.3.0.tar.gz"; |
||||
url = "https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz"; |
||||
hash = "sha256-Mp6j4xMLAmwDpKzFDhaOfa/05uZhvGp9/sDXe1cIUdU="; |
||||
}; |
||||
cereal-wrapdb = fetchurl { |
||||
name = "cereal-1.3.0-1-wrap.zip"; |
||||
url = "https://wrapdb.mesonbuild.com/v1/projects/cereal/1.3.0/1/get_zip"; |
||||
hash = "sha256-QYck5UT7fPLqtLDb1iOSX4Hnnns48Jj23Ae/LCfLSKY="; |
||||
}; |
||||
|
||||
# expected.wrap |
||||
expected-wrap = fetchgit { |
||||
name = "expected"; |
||||
url = "https://gitlab.com/cardboardwm/expected"; |
||||
rev = "0ee13cb2b058809aa9708c45ca18d494e72a759e"; |
||||
sha256 = "sha256-gYr4/pjuLlr3k6Jcrg2/SzJLtbgyA+ZN2oMHkHXANDo="; |
||||
}; |
||||
|
||||
# wlroots.wrap |
||||
wlroots-wrap = fetchgit { |
||||
name = "wlroots"; |
||||
url = "https://github.com/swaywm/wlroots"; |
||||
rev = "0.12.0"; |
||||
sha256 = "sha256-1rE3D+kQprjcjobc95/mQkUa5y1noY0MdoYJ/SpFQwY="; |
||||
}; |
||||
in |
||||
stdenv.mkDerivation rec { |
||||
pname = "cardboard"; |
||||
version = "0.0.0-unstable=2021-01-21"; |
||||
|
||||
src = fetchFromGitLab { |
||||
owner = "cardboardwm"; |
||||
repo = pname; |
||||
rev = "f2ef2ff076ddbbd23994553b8eff131f9bd0207f"; |
||||
hash = "sha256-43aqAWk4QoIP0BpRyPRDWFtVh/1UbrBoEeTDEF2gZX4="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ |
||||
meson |
||||
ninja |
||||
pkg-config |
||||
unzip |
||||
]; |
||||
buildInputs = [ |
||||
ffmpeg |
||||
libGL |
||||
libX11 |
||||
libcap |
||||
libdrm |
||||
libinput |
||||
libpng |
||||
libxcb |
||||
libxkbcommon |
||||
mesa |
||||
pixman |
||||
wayland |
||||
wayland-protocols |
||||
xcbutilerrors |
||||
xcbutilimage |
||||
xcbutilwm |
||||
]; |
||||
|
||||
postPatch = '' |
||||
(cd subprojects |
||||
tar xvf ${cereal-wrap} |
||||
unzip ${cereal-wrapdb} |
||||
cp -r ${expected-wrap} ${expected-wrap.name} |
||||
cp -r ${wlroots-wrap} ${wlroots-wrap.name} |
||||
) |
||||
''; |
||||
|
||||
# "Inherited" from Nixpkgs expression for wlroots |
||||
mesonFlags = [ |
||||
"-Dwlroots:logind-provider=systemd" |
||||
"-Dwlroots:libseat=disabled" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
homepage = "https://gitlab.com/cardboardwm/cardboard"; |
||||
description = "A scrollable, tiling Wayland compositor inspired on PaperWM"; |
||||
license = licenses.gpl3Only; |
||||
maintainers = with maintainers; [ AndersonTorres ]; |
||||
platforms = with platforms; unix; |
||||
}; |
||||
} |
||||
@ -0,0 +1,13 @@ |
||||
diff --git a/default/Makefile b/default/Makefile
|
||||
index 172d5d9..540a1c0 100644
|
||||
--- a/default/Makefile
|
||||
+++ b/default/Makefile
|
||||
@@ -1,7 +1,7 @@
|
||||
WP_NAME=f34
|
||||
WP_BIGNAME=F34
|
||||
WP_DIR=$(DESTDIR)/usr/share/backgrounds/$(WP_NAME)
|
||||
-WP_DIR_LN=/usr/share/backgrounds/$(WP_NAME)
|
||||
+WP_DIR_LN=$(DESTDIR)/usr/share/backgrounds/$(WP_NAME)
|
||||
GNOME_BG_DIR=$(DESTDIR)/usr/share/gnome-background-properties
|
||||
KDE_BG_DIR=$(DESTDIR)/usr/share/wallpapers
|
||||
MATE_BG_DIR=$(DESTDIR)/usr/share/mate-background-properties
|
||||
@ -1,6 +1,6 @@ |
||||
{ |
||||
"commit": "95e79fb1492c7f34c2454dcb783ac8b46c0f5c8c", |
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/95e79fb1492c7f34c2454dcb783ac8b46c0f5c8c.tar.gz", |
||||
"sha256": "1wp7m8j6z2j6h8z14cnzg223jmkcgpsafraxiirbih3h4wqq2nhr", |
||||
"msg": "Update from Hackage at 2021-05-03T20:39:01Z" |
||||
"commit": "3d54acea35f6f709fa96c87696b845b3044dcab5", |
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3d54acea35f6f709fa96c87696b845b3044dcab5.tar.gz", |
||||
"sha256": "1zlkjs9d8r5k803wbsz5fmsrs76150chcnz2jaapmq32riyvm21g", |
||||
"msg": "Update from Hackage at 2021-05-07T19:29:19Z" |
||||
} |
||||
|
||||
@ -0,0 +1,71 @@ |
||||
# ARM-SPECIFIC OVERRIDES FOR THE HASKELL PACKAGE SET IN NIXPKGS |
||||
# |
||||
# This extension is applied to all haskell package sets in nixpkgs |
||||
# if `stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64` |
||||
# to apply arm specific workarounds or fixes. |
||||
# |
||||
# The file is split into three parts: |
||||
# |
||||
# * Overrides that are applied for all arm platforms |
||||
# * Overrides for aarch32 platforms |
||||
# * Overrides for aarch64 platforms |
||||
# |
||||
# This may be extended in the future to also include compiler- |
||||
# specific sections as compiler and linker related bugs may |
||||
# get fixed subsequently. |
||||
# |
||||
# When adding new overrides, try to research which section they |
||||
# belong into. Most likely we'll be favouring aarch64 overrides |
||||
# in practice since that is the only platform we can test on |
||||
# Hydra. Also take care to group overrides by the issue they |
||||
# solve, so refactors and updates to this file are less tedious. |
||||
{ pkgs, haskellLib }: |
||||
|
||||
let |
||||
inherit (pkgs) lib; |
||||
in |
||||
|
||||
with haskellLib; |
||||
|
||||
self: super: { |
||||
# COMMON ARM OVERRIDES |
||||
|
||||
# moved here from configuration-common.nix, no reason given. |
||||
servant-docs = dontCheck super.servant-docs; |
||||
swagger2 = dontHaddock (dontCheck super.swagger2); |
||||
|
||||
# Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 |
||||
happy = dontCheck super.happy; |
||||
|
||||
} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 { |
||||
# AARCH64-SPECIFIC OVERRIDES |
||||
|
||||
# Doctests fail on aarch64 due to a GHCi linking bug |
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295437 |
||||
# TODO: figure out if needed on aarch32 as well |
||||
language-nix = dontCheck super.language-nix; |
||||
trifecta = dontCheck super.trifecta; |
||||
ad = dontCheck super.ad; |
||||
vinyl = dontCheck super.vinyl; |
||||
BNFC = dontCheck super.BNFC; |
||||
C-structs = dontCheck super.C-structs; |
||||
accelerate = dontCheck super.accelerate; |
||||
focuslist = dontCheck super.focuslist; |
||||
flight-kml = dontCheck super.flight-kml; |
||||
exact-real = dontCheck super.exact-real; |
||||
autoapply = dontCheck super.autoapply; |
||||
hint = dontCheck super.hint; |
||||
hgeometry = dontCheck super.hgeometry; |
||||
headroom = dontCheck super.headroom; |
||||
haskell-time-range = dontCheck super.haskell-time-range; |
||||
hsakamai = dontCheck super.hsakamai; |
||||
hsemail-ns = dontCheck super.hsemail-ns; |
||||
openapi3 = dontCheck super.openapi3; |
||||
|
||||
# https://github.com/ekmett/half/issues/35 |
||||
half = dontCheck super.half; |
||||
|
||||
} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch32 { |
||||
# AARCH32-SPECIFIC OVERRIDES |
||||
|
||||
} |
||||
@ -0,0 +1,164 @@ |
||||
# DARWIN-SPECIFIC OVERRIDES FOR THE HASKELL PACKAGE SET IN NIXPKGS |
||||
|
||||
{ pkgs, haskellLib }: |
||||
|
||||
let |
||||
inherit (pkgs) lib darwin; |
||||
in |
||||
|
||||
with haskellLib; |
||||
|
||||
self: super: { |
||||
|
||||
# the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo |
||||
# see: https://github.com/psibi/shell-conduit/issues/12 |
||||
shell-conduit = dontCheck super.shell-conduit; |
||||
|
||||
conduit-extra = super.conduit-extra.overrideAttrs (drv: { |
||||
__darwinAllowLocalNetworking = true; |
||||
}); |
||||
|
||||
halive = addBuildDepend super.halive darwin.apple_sdk.frameworks.AppKit; |
||||
|
||||
# Hakyll's tests are broken on Darwin (3 failures); and they require util-linux |
||||
hakyll = overrideCabal super.hakyll { |
||||
testToolDepends = []; |
||||
doCheck = false; |
||||
}; |
||||
|
||||
barbly = addBuildDepend super.barbly darwin.apple_sdk.frameworks.AppKit; |
||||
|
||||
double-conversion = addExtraLibrary super.double-conversion pkgs.libcxx; |
||||
|
||||
apecs-physics = addPkgconfigDepends super.apecs-physics [ |
||||
darwin.apple_sdk.frameworks.ApplicationServices |
||||
]; |
||||
|
||||
# "erf table" test fails on Darwin |
||||
# https://github.com/bos/math-functions/issues/63 |
||||
math-functions = dontCheck super.math-functions; |
||||
|
||||
# darwin doesn't have sub-second resolution |
||||
# https://github.com/hspec/mockery/issues/11 |
||||
mockery = overrideCabal super.mockery (drv: { |
||||
preCheck = '' |
||||
export TRAVIS=true |
||||
'' + (drv.preCheck or ""); |
||||
}); |
||||
|
||||
# https://github.com/ndmitchell/shake/issues/206 |
||||
shake = dontCheck super.shake; |
||||
|
||||
filecache = dontCheck super.filecache; |
||||
|
||||
# gtk/gtk3 needs to be told on Darwin to use the Quartz |
||||
# rather than X11 backend (see eg https://github.com/gtk2hs/gtk2hs/issues/249). |
||||
gtk3 = appendConfigureFlag super.gtk3 "-f have-quartz-gtk"; |
||||
gtk = appendConfigureFlag super.gtk "-f have-quartz-gtk"; |
||||
|
||||
OpenAL = addExtraLibrary super.OpenAL darwin.apple_sdk.frameworks.OpenAL; |
||||
|
||||
proteaaudio = addExtraLibrary super.proteaaudio darwin.apple_sdk.frameworks.AudioToolbox; |
||||
|
||||
# the system-fileio tests use canonicalizePath, which fails in the sandbox |
||||
system-fileio = dontCheck super.system-fileio; |
||||
|
||||
# Prevents needing to add `security_tool` as a run-time dependency for |
||||
# everything using x509-system to give access to the `security` executable. |
||||
# |
||||
# darwin.security_tool is broken in Mojave (#45042) |
||||
# |
||||
# We will use the system provided security for now. |
||||
# Beware this WILL break in sandboxes! |
||||
# |
||||
# TODO(matthewbauer): If someone really needs this to work in sandboxes, |
||||
# I think we can add a propagatedImpureHost dep here, but I’m hoping to |
||||
# get a proper fix available soonish. |
||||
x509-system = overrideCabal super.x509-system (drv: |
||||
lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) { |
||||
postPatch = '' |
||||
substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security |
||||
'' + (drv.postPatch or ""); |
||||
}); |
||||
|
||||
# https://github.com/haskell-foundation/foundation/pull/412 |
||||
foundation = dontCheck super.foundation; |
||||
|
||||
llvm-hs = overrideCabal super.llvm-hs (oldAttrs: { |
||||
# One test fails on darwin. |
||||
doCheck = false; |
||||
# llvm-hs's Setup.hs file tries to add the lib/ directory from LLVM8 to |
||||
# the DYLD_LIBRARY_PATH environment variable. This messes up clang |
||||
# when called from GHC, probably because clang is version 7, but we are |
||||
# using LLVM8. |
||||
preCompileBuildDriver = '' |
||||
substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()" |
||||
'' + (oldAttrs.preCompileBuildDriver or ""); |
||||
}); |
||||
|
||||
yesod-bin = addBuildDepend super.yesod-bin darwin.apple_sdk.frameworks.Cocoa; |
||||
|
||||
hmatrix = addBuildDepend super.hmatrix darwin.apple_sdk.frameworks.Accelerate; |
||||
|
||||
# Ensure the necessary frameworks are propagatedBuildInputs on darwin |
||||
OpenGLRaw = overrideCabal super.OpenGLRaw (drv: { |
||||
librarySystemDepends = []; |
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ |
||||
darwin.apple_sdk.frameworks.OpenGL |
||||
]; |
||||
preConfigure = '' |
||||
frameworkPaths=($(for i in $nativeBuildInputs; do if [ -d "$i"/Library/Frameworks ]; then echo "-F$i/Library/Frameworks"; fi done)) |
||||
frameworkPaths=$(IFS=, ; echo "''${frameworkPaths[@]}") |
||||
configureFlags+=$(if [ -n "$frameworkPaths" ]; then echo -n "--ghc-options=-optl=$frameworkPaths"; fi) |
||||
'' + (drv.preConfigure or ""); |
||||
}); |
||||
GLURaw = overrideCabal super.GLURaw (drv: { |
||||
librarySystemDepends = []; |
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ |
||||
darwin.apple_sdk.frameworks.OpenGL |
||||
]; |
||||
}); |
||||
bindings-GLFW = overrideCabal super.bindings-GLFW (drv: { |
||||
librarySystemDepends = []; |
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ |
||||
darwin.apple_sdk.frameworks.AGL |
||||
darwin.apple_sdk.frameworks.Cocoa |
||||
darwin.apple_sdk.frameworks.OpenGL |
||||
darwin.apple_sdk.frameworks.IOKit |
||||
darwin.apple_sdk.frameworks.Kernel |
||||
darwin.apple_sdk.frameworks.CoreVideo |
||||
darwin.CF |
||||
]; |
||||
}); |
||||
OpenCL = overrideCabal super.OpenCL (drv: { |
||||
librarySystemDepends = []; |
||||
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ |
||||
darwin.apple_sdk.frameworks.OpenCL |
||||
]; |
||||
}); |
||||
|
||||
# cabal2nix likes to generate dependencies on hinotify when hfsevents is |
||||
# really required on darwin: https://github.com/NixOS/cabal2nix/issues/146. |
||||
hinotify = self.hfsevents; |
||||
|
||||
# FSEvents API is very buggy and tests are unreliable. See |
||||
# http://openradar.appspot.com/10207999 and similar issues. |
||||
fsnotify = addBuildDepend (dontCheck super.fsnotify) |
||||
darwin.apple_sdk.frameworks.Cocoa; |
||||
|
||||
FractalArt = overrideCabal super.FractalArt (drv: { |
||||
librarySystemDepends = [ |
||||
darwin.libobjc |
||||
darwin.apple_sdk.frameworks.AppKit |
||||
] ++ (drv.librarySystemDepends or []); |
||||
}); |
||||
|
||||
arbtt = overrideCabal super.arbtt (drv: { |
||||
librarySystemDepends = [ |
||||
darwin.apple_sdk.frameworks.Foundation |
||||
darwin.apple_sdk.frameworks.Carbon |
||||
darwin.apple_sdk.frameworks.IOKit |
||||
] ++ (drv.librarySystemDepends or []); |
||||
}); |
||||
|
||||
} |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue