github-actions[bot]
2 years ago
committed by
GitHub
commit
e5e403219b
@ -0,0 +1,25 @@ |
||||
{ config, lib, pkgs, ... }: |
||||
|
||||
let |
||||
cfg = config.hardware.saleae-logic; |
||||
in |
||||
{ |
||||
options.hardware.saleae-logic = { |
||||
enable = lib.mkEnableOption "udev rules for Saleae Logic devices"; |
||||
|
||||
package = lib.mkOption { |
||||
type = lib.types.package; |
||||
default = pkgs.saleae-logic-2; |
||||
defaultText = lib.literalExpression "pkgs.saleae-logic-2"; |
||||
description = '' |
||||
Saleae Logic package to use. |
||||
''; |
||||
}; |
||||
}; |
||||
|
||||
config = lib.mkIf cfg.enable { |
||||
services.udev.packages = [ cfg.package ]; |
||||
}; |
||||
|
||||
meta.maintainers = with lib.maintainers; [ chivay ]; |
||||
} |
||||
@ -0,0 +1,53 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchFromGitHub |
||||
, django |
||||
, freezegun |
||||
, psycopg2 |
||||
, pytest-django |
||||
, pytestCheckHook |
||||
, pythonOlder |
||||
, setuptools-scm |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "django-model-utils"; |
||||
version = "4.2.0"; |
||||
disabled = pythonOlder "3.6"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "jazzband"; |
||||
repo = "django-model-utils"; |
||||
rev = version; |
||||
sha256 = "sha256-TLqvpP/ZaGGFdqnN+UHbhXv1K1YVYTYBkCiWCjYrFh8="; |
||||
}; |
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version; |
||||
|
||||
nativeBuildInputs = [ |
||||
setuptools-scm |
||||
]; |
||||
|
||||
propagatedBuildInputs = [ |
||||
django |
||||
]; |
||||
|
||||
# requires postgres database |
||||
doCheck = false; |
||||
|
||||
checkInputs = [ |
||||
freezegun |
||||
psycopg2 |
||||
pytest-django |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
pythonImportsCheck = [ "model_utils" ]; |
||||
|
||||
meta = with lib; { |
||||
homepage = "https://github.com/jazzband/django-model-utils"; |
||||
description = "Django model mixins and utilities"; |
||||
license = licenses.bsd3; |
||||
maintainers = with maintainers; [ SuperSandro2000 ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,43 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchFromGitHub |
||||
, asn1crypto |
||||
, cbor2 |
||||
, pythonOlder |
||||
, pydantic |
||||
, pyopenssl |
||||
, pytestCheckHook |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "webauthn"; |
||||
version = "1.5.2"; |
||||
disabled = pythonOlder "3"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "duo-labs"; |
||||
repo = "py_webauthn"; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-sjl65vx1VthVX6ED3lXXAcn2D5WzzGAINKBjCc10rcs="; |
||||
}; |
||||
|
||||
propagatedBuildInputs = [ |
||||
asn1crypto |
||||
cbor2 |
||||
pydantic |
||||
pyopenssl |
||||
]; |
||||
|
||||
checkInputs = [ |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
pythonImportsCheck = [ "webauthn" ]; |
||||
|
||||
meta = with lib; { |
||||
homepage = "https://github.com/duo-labs/py_webauthn"; |
||||
description = "Implementation of the WebAuthn API"; |
||||
license = licenses.bsd3; |
||||
maintainers = with maintainers; [ SuperSandro2000 ]; |
||||
}; |
||||
} |
||||
@ -1,113 +0,0 @@ |
||||
From 33d5affabf8ff84f2c028b9303c6a9e83cc824ad Mon Sep 17 00:00:00 2001
|
||||
From: James Cowgill <james410@cowgill.org.uk>
|
||||
Date: Sat, 9 May 2015 01:54:14 +0100
|
||||
Subject: [PATCH] Remove dependency on GLU - fixes build with SFML 2.3
|
||||
|
||||
---
|
||||
premake4.lua | 8 ++++----
|
||||
src/Shaders/postFX.cpp | 2 +-
|
||||
src/System/window.cpp | 12 ++++++------
|
||||
3 files changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/premake4.lua b/premake4.lua
|
||||
index 023dddd..5af4495 100755
|
||||
--- a/premake4.lua
|
||||
+++ b/premake4.lua
|
||||
@@ -11,11 +11,11 @@ project "mars"
|
||||
defines { "NDEBUG" }
|
||||
flags { "Optimize" }
|
||||
if os.get() == "windows" then
|
||||
- links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "glu32", "opengl32", "fribidi-0", "tag" }
|
||||
+ links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "opengl32", "fribidi-0", "tag" }
|
||||
elseif os.get() == "macosx" then
|
||||
links { "sfml-graphics.framework", "sfml-audio.framework", "sfml-system.framework", "sfml-window.framework", "opengl.framework", "fribidi", "tag" }
|
||||
else
|
||||
- links { "GLU", "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "fribidi", "tag" }
|
||||
+ links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "fribidi", "tag" }
|
||||
libdirs { "/usr/lib", "/usr/local/lib" }
|
||||
end
|
||||
|
||||
@@ -23,10 +23,10 @@ project "mars"
|
||||
defines { "_DEBUG", "DEBUG" }
|
||||
flags { "Symbols" }
|
||||
if os.get() == "windows" then
|
||||
- links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "glu32", "opengl32", "fribidi-0", "tag" }
|
||||
+ links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "opengl32", "fribidi-0", "tag" }
|
||||
elseif os.get() == "macosx" then
|
||||
links { "sfml-graphics.framework", "sfml-audio.framework", "sfml-system.framework", "sfml-window.framework", "opengl.framework", "fribidi", "tag" }
|
||||
else
|
||||
- links { "GLU", "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "fribidi", "tag" }
|
||||
+ links { "sfml-graphics", "sfml-audio", "sfml-system", "sfml-window", "fribidi", "tag" }
|
||||
libdirs { "/usr/lib", "/usr/local/lib" }
|
||||
end
|
||||
diff --git a/src/Shaders/postFX.cpp b/src/Shaders/postFX.cpp
|
||||
index 987f411..f767a47 100644
|
||||
--- a/src/Shaders/postFX.cpp
|
||||
+++ b/src/Shaders/postFX.cpp
|
||||
@@ -78,7 +78,7 @@ namespace postFX {
|
||||
postFX_.loadFromFile(settings::C_dataPath + "shaders/bump.frag", sf::Shader::Fragment);
|
||||
bumpMap_.create(SPACE_X_RESOLUTION*0.5f, SPACE_Y_RESOLUTION*0.5f);
|
||||
glViewport(0,0,SPACE_X_RESOLUTION*0.5f,SPACE_Y_RESOLUTION*0.5f);
|
||||
- gluOrtho2D(0, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0);
|
||||
+ glOrtho(0, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0, -1, 1);
|
||||
glEnable(GL_BLEND);
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
postFX_.setParameter("BumpMap", bumpMap_.getTexture());
|
||||
diff --git a/src/System/window.cpp b/src/System/window.cpp
|
||||
index e9a099a..8e12dcc 100644
|
||||
--- a/src/System/window.cpp
|
||||
+++ b/src/System/window.cpp
|
||||
@@ -222,7 +222,7 @@ namespace window {
|
||||
glLoadIdentity();
|
||||
|
||||
// Setup translation (according to left-upper corner)
|
||||
- gluOrtho2D(0.f, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0.f);
|
||||
+ glOrtho(0.f, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0.f, -1, 1);
|
||||
|
||||
// probably improves performance...
|
||||
glDisable(GL_LIGHTING);
|
||||
@@ -247,7 +247,7 @@ namespace window {
|
||||
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glLoadIdentity();
|
||||
- gluOrtho2D(0.f, viewPort_.x_, viewPort_.y_, 0.f);
|
||||
+ glOrtho(0.f, viewPort_.x_, viewPort_.y_, 0.f, -1, 1);
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glLoadIdentity();
|
||||
|
||||
@@ -255,7 +255,7 @@ namespace window {
|
||||
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glLoadIdentity();
|
||||
- gluOrtho2D(0.f, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0.f);
|
||||
+ glOrtho(0.f, SPACE_X_RESOLUTION, SPACE_Y_RESOLUTION, 0.f, -1, 1);
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glLoadIdentity();
|
||||
}
|
||||
@@ -270,7 +270,7 @@ namespace window {
|
||||
glLoadIdentity();
|
||||
setViewPort();
|
||||
|
||||
- gluOrtho2D(0.f, viewPort_.x_, viewPort_.y_, 0.f);
|
||||
+ glOrtho(0.f, viewPort_.x_, viewPort_.y_, 0.f, -1, 1);
|
||||
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glLoadIdentity();
|
||||
@@ -284,7 +284,7 @@ namespace window {
|
||||
glLoadIdentity();
|
||||
setViewPort();
|
||||
|
||||
- gluOrtho2D(0.f, viewPort_.x_, viewPort_.y_, 0.f);
|
||||
+ glOrtho(0.f, viewPort_.x_, viewPort_.y_, 0.f, -1, 1);
|
||||
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glLoadIdentity();
|
||||
@@ -294,7 +294,7 @@ namespace window {
|
||||
else {
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glLoadIdentity();
|
||||
- gluOrtho2D(0.f, viewPort_.x_, viewPort_.y_, 0.f);
|
||||
+ glOrtho(0.f, viewPort_.x_, viewPort_.y_, 0.f, -1, 1);
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glLoadIdentity();
|
||||
}
|
||||
@ -1,19 +0,0 @@ |
||||
diff --git a/src/System/window.cpp b/src/System/window.cpp
|
||||
index e9a099a..e3f6de9 100644
|
||||
--- a/src/System/window.cpp
|
||||
+++ b/src/System/window.cpp
|
||||
@@ -308,12 +308,12 @@ namespace window {
|
||||
glEnable(GL_TEXTURE_2D);
|
||||
|
||||
if (shader)
|
||||
- shader->bind();
|
||||
+ sf::Shader::bind(shader);
|
||||
|
||||
window_.draw(toBeDrawn, states);
|
||||
|
||||
if (shader)
|
||||
- shader->unbind();
|
||||
+ sf::Shader::bind(NULL);
|
||||
|
||||
window_.popGLStates();
|
||||
glPopMatrix();
|
||||
Loading…
Reference in new issue