Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable SDL #108

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable SDL #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "nixpkgs"]
path = nixpkgs
url = https://github.com/nh2/nixpkgs.git
url = https://github.com/NixOS/nixpkgs.git
2 changes: 1 addition & 1 deletion nixpkgs
Open in desktop
Submodule nixpkgs updated 2549 files
2 changes: 1 addition & 1 deletion nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ if builtins.getEnv "STATIC_HASKELL_NIX_CI_NIXPKGS_UNSTABLE_BUILD" == "1"
if builtins.pathExists ./nixpkgs/pkgs
then import ./nixpkgs {}
# Pinned nixpkgs version; should be kept up-to-date with our submodule.
else import (fetchTarball https://github.com/NixOS/nixpkgs/archive/d00b5a5fa6fe8bdf7005abb06c46ae0245aec8b5.tar.gz) {}
else import (fetchTarball https://github.com/NixOS/nixpkgs/archive/95f1154f993bc788bad7df1feed1b98c7e7381cb.tar.gz) {}
3 changes: 0 additions & 3 deletions survey/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,6 @@ let

# Stackage package names we want to blacklist.
blacklist = [
# TODO: Try to remove when https://github.com/NixOS/nixpkgs/pull/128746 is available to us
"alsa-pcm" "alsa-seq" "ALUT" "OpenAL" "sdl2" "sdl2-gfx" "sdl2-image" "sdl2-mixer" "sdl2-ttf"

# depends on `sbv` -> `openjdk`, which pulls in a huge dependency closure
"crackNum"

Expand Down