Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
960f88760b
@ -8524,10 +8524,10 @@
|
||||
name = "Xinhao Luo";
|
||||
};
|
||||
newam = {
|
||||
email = "alexmgit@protonmail.com";
|
||||
email = "alex@thinglab.org";
|
||||
github = "newAM";
|
||||
githubId = 7845120;
|
||||
name = "Alex M.";
|
||||
name = "Alex Martens";
|
||||
};
|
||||
nikitavoloboev = {
|
||||
email = "nikita.voloboev@gmail.com";
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
|
||||
pname = "zcash";
|
||||
version = "4.5.1";
|
||||
version = "4.6.0-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zcash";
|
||||
repo = "zcash";
|
||||
rev = "v${version}";
|
||||
sha256 = "0kyk3hv1y13b3vwg9kjcrpvz9v3l8lp0ikj977nykd5ms8b1rifa";
|
||||
sha256 = "sha256-YJ5ufo+LYbOTr9SyiEzzp1pcSx6+cHSvDLBOIcx9X+4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1mwprsg74xv6qlxf00w7xapnkisb1aid9hkyr8r90zcwdcy8783r";
|
||||
cargoSha256 = "sha256-m/SBHv3BNYKkSXxHnCdVng3blbHrTc/HxX/nEIa1DnM=";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ];
|
||||
buildInputs = [ boost175 libevent libsodium utf8cpp ]
|
||||
|
||||
@ -205,6 +205,7 @@ in
|
||||
homepage = "https://www.rstudio.com/";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ ciil cfhammill ];
|
||||
mainProgram = "rstudio" + optionalString server "-server";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
|
||||
@ -1,8 +1,25 @@
|
||||
{ lib, fetchFromGitHub, cmake, pkg-config, mkDerivation
|
||||
, qtbase, qtx11extras, qtsvg, makeWrapper
|
||||
, vulkan-loader, libglvnd, xorg, python3, python3Packages
|
||||
, bison, pcre, automake, autoconf, addOpenGLRunpath
|
||||
, waylandSupport ? false, wayland
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, cmake
|
||||
, pkg-config
|
||||
, mkDerivation
|
||||
, qtbase
|
||||
, qtx11extras
|
||||
, qtsvg
|
||||
, makeWrapper
|
||||
, vulkan-loader
|
||||
, libglvnd
|
||||
, xorg
|
||||
, python3
|
||||
, python3Packages
|
||||
, bison
|
||||
, pcre
|
||||
, automake
|
||||
, autoconf
|
||||
, addOpenGLRunpath
|
||||
, waylandSupport ? false
|
||||
, wayland
|
||||
}:
|
||||
let
|
||||
custom_swig = fetchFromGitHub {
|
||||
@ -15,13 +32,13 @@ let
|
||||
in
|
||||
mkDerivation rec {
|
||||
pname = "renderdoc";
|
||||
version = "1.16";
|
||||
version = "1.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "baldurk";
|
||||
repo = "renderdoc";
|
||||
rev = "v${version}";
|
||||
sha256 = "150d1qzjs420clqr48gickiw5ymjx4md6iyjbxmxsdml0pyxpwwn";
|
||||
sha256 = "sha256-Zr7Av49mK48B4N+Ca2vPIgKuVNP4YLVEs4EQepukSs8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -64,6 +81,10 @@ mkDerivation rec {
|
||||
addOpenGLRunpath $out/lib/librenderdoc.so
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A single-frame graphics debugger";
|
||||
homepage = "https://renderdoc.org/";
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
, gtk3
|
||||
, gtksourceview4
|
||||
, hicolor-icon-theme # for setup-hook
|
||||
, json-glib
|
||||
, libarchive
|
||||
, libgee
|
||||
, libhandy
|
||||
@ -24,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "minder";
|
||||
version = "1.13.1";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phase1geo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "07mq595c1vxwsnwkr2zdci0r06yhs75ph2db09mc63k5fjvi8rya";
|
||||
sha256 = "sha256-0x+MMVa9/jOVp9n9JFM1MGndh9H9MzmmHepcez4aT+Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -51,6 +52,7 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
gtksourceview4
|
||||
hicolor-icon-theme
|
||||
json-glib
|
||||
libarchive
|
||||
libgee
|
||||
libhandy
|
||||
|
||||
@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lagrange";
|
||||
version = "1.9.5";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jvknhGTvb2Qw2587TmCJxES2DSv+9+BfMk2IOyqqLt8=";
|
||||
sha256 = "sha256-5K2Fm7CkzVcHM3JC1rgh/vCyXfVTTY47nZFzqgQcoSs";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -38,8 +38,6 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ fribidi harfbuzz libunistring libwebp mpg123 openssl pcre SDL2 zlib ]
|
||||
++ lib.optional stdenv.isDarwin AppKit;
|
||||
|
||||
hardeningDisable = lib.optional (!stdenv.cc.isClang) "format";
|
||||
|
||||
installPhase = lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mv Lagrange.app $out/Applications
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qownnotes";
|
||||
version = "21.12.8";
|
||||
version = "22.1.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
|
||||
# Fetch the checksum of current version with curl:
|
||||
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
|
||||
sha256 = "sha256-iVcGJz4lxyn303ACYBUVm9cOYjVrETpyUapjAieMpqE=";
|
||||
sha256 = "7ac13816e47e23e8469f47b6d48a29f7e98416de0fa9ef77eb3da63b191829f3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"commit": "52e5aa39956d0d5a8158320897630fed86ec2ed3",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/52e5aa39956d0d5a8158320897630fed86ec2ed3.tar.gz",
|
||||
"sha256": "1yx7v3hscyp1jar0kfsc5pmj8i552j5milqzsair67cl8jf37vwz",
|
||||
"msg": "Update from Hackage at 2022-01-05T00:50:25Z"
|
||||
"commit": "0b85617478c8c03b4db538b5dc1774f9fa5bf41c",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b85617478c8c03b4db538b5dc1774f9fa5bf41c.tar.gz",
|
||||
"sha256": "1r2w0cysn4x8hzw0989p9cmqvyqkjs4phy8iisphczw30s02zc27",
|
||||
"msg": "Update from Hackage at 2022-01-14T12:47:41Z"
|
||||
}
|
||||
|
||||
@ -181,7 +181,8 @@ self: super: {
|
||||
# base bound
|
||||
digit = doJailbreak super.digit;
|
||||
|
||||
hnix = generateOptparseApplicativeCompletion "hnix"
|
||||
# hnix.patch needed until the next release is bumped
|
||||
hnix = appendPatch ./patches/hnix.patch (generateOptparseApplicativeCompletion "hnix"
|
||||
(overrideCabal (drv: {
|
||||
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
|
||||
doCheck = false;
|
||||
@ -189,7 +190,7 @@ self: super: {
|
||||
# needs newer version of relude and semialign than stackage has
|
||||
relude = self.relude_1_0_0_1;
|
||||
semialign = self.semialign_1_2_0_1;
|
||||
}));
|
||||
})));
|
||||
|
||||
# Fails for non-obvious reasons while attempting to use doctest.
|
||||
focuslist = dontCheck super.focuslist;
|
||||
@ -1185,7 +1186,6 @@ self: super: {
|
||||
# The test suite depends on an impure cabal-install installation in
|
||||
# $HOME, which we don't have in our build sandbox.
|
||||
cabal-install-parsers = dontCheck super.cabal-install-parsers;
|
||||
cabal-install-parsers_0_4_2 = dontCheck super.cabal-install-parsers_0_4_2;
|
||||
|
||||
# 2021-08-18: Erroneously claims that it needs a newer HStringTemplate (>= 0.8.8) than stackage.
|
||||
gitit = doJailbreak super.gitit;
|
||||
@ -1522,7 +1522,10 @@ self: super: {
|
||||
# Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129
|
||||
servant-swagger = dontCheck super.servant-swagger;
|
||||
|
||||
hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent;
|
||||
# substituteInPlace: https://github.com/hercules-ci/hercules-ci-agent/issues/363
|
||||
hercules-ci-agent = overrideCabal { preConfigure = ''
|
||||
substituteInPlace hercules-ci-agent/Hercules/Agent/Cachix/Init.hs --replace "Cachix.Client.Env" "Cachix.Client.Version"
|
||||
''; } (generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent);
|
||||
|
||||
hercules-ci-cli = pkgs.lib.pipe super.hercules-ci-cli [
|
||||
unmarkBroken
|
||||
@ -1862,29 +1865,22 @@ self: super: {
|
||||
# 2021-05-09: Restrictive bound on hspec-golden. Dep removed in newer versions.
|
||||
tomland = assert super.tomland.version == "1.3.2.0"; doJailbreak super.tomland;
|
||||
|
||||
# 2021-05-09 haskell-ci pins ShellCheck 0.7.1
|
||||
# https://github.com/haskell-CI/haskell-ci/issues/507
|
||||
# 2021-09-05 haskell-ci needs Cabal 3.4,
|
||||
# cabal-install-parsers uses Cabal 3.6 since 0.4.3
|
||||
haskell-ci = super.haskell-ci.override {
|
||||
ShellCheck = self.ShellCheck_0_7_1;
|
||||
cabal-install-parsers = self.cabal-install-parsers_0_4_2;
|
||||
};
|
||||
# 2022-01-16 haskell-ci needs Cabal 3.6,
|
||||
haskell-ci = super.haskell-ci.overrideScope (self: super: {
|
||||
attoparsec = self.attoparsec_0_14_4;
|
||||
Cabal = self.Cabal_3_6_2_0;
|
||||
});
|
||||
|
||||
# Build haskell-ci from git repository, including some useful fixes,
|
||||
# e. g. required for generating the workflows for the cabal2nix repository
|
||||
haskell-ci-unstable = (overrideSrc rec {
|
||||
version = "0.13.20211116-${builtins.substring 0 7 src.rev}";
|
||||
# Build haskell-ci from git repository
|
||||
haskell-ci-unstable = overrideSrc rec {
|
||||
version = "0.14.1-${builtins.substring 0 7 src.rev}";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "haskell-CI";
|
||||
repo = "haskell-ci";
|
||||
rev = "b61df11e7f6010ce09920c231321ab1545a990b5";
|
||||
sha256 = "0v6mqpavz5v161milq6a3x9gzap0pgksd3h4rwi2s3f9b15sczcy";
|
||||
rev = "8311a999b8e8be3aa31f65f314def256aa2d5535";
|
||||
sha256 = "169jaqm4xs2almmvqsk567wayxs0g6kn0l5877c03hzr3d9ykrav";
|
||||
};
|
||||
} super.haskell-ci).overrideScope (self: super: {
|
||||
attoparsec = self.attoparsec_0_14_3;
|
||||
Cabal = self.Cabal_3_6_2_0;
|
||||
});
|
||||
} self.haskell-ci;
|
||||
|
||||
Frames-streamly = super.Frames-streamly.override {
|
||||
relude = super.relude_1_0_0_1;
|
||||
|
||||
@ -49,11 +49,6 @@ self: super: {
|
||||
# cabal-install-parsers is written for Cabal 3.6
|
||||
cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_2_0; };
|
||||
|
||||
# older version of cabal-install-parsers for reverse dependencies that use Cabal 3.4
|
||||
cabal-install-parsers_0_4_2 = super.cabal-install-parsers_0_4_2.override {
|
||||
Cabal = self.Cabal_3_4_1_0;
|
||||
};
|
||||
|
||||
# Jailbreak to fix the build.
|
||||
base-noprelude = doJailbreak super.base-noprelude;
|
||||
system-fileio = doJailbreak super.system-fileio;
|
||||
|
||||
@ -83,7 +83,7 @@ self: super: {
|
||||
# Jailbreaks & Version Updates
|
||||
assoc = doJailbreak super.assoc;
|
||||
async = doJailbreak super.async;
|
||||
attoparsec = super.attoparsec_0_14_3;
|
||||
attoparsec = super.attoparsec_0_14_4;
|
||||
base64-bytestring = doJailbreak super.base64-bytestring;
|
||||
base-compat = self.base-compat_0_12_1;
|
||||
base-compat-batteries = self.base-compat-batteries_0_12_1;
|
||||
@ -102,23 +102,23 @@ self: super: {
|
||||
genvalidity-hspec = self.genvalidity-hspec_1_0_0_0;
|
||||
ghc-byteorder = doJailbreak super.ghc-byteorder;
|
||||
ghc-exactprint = overrideCabal (drv: {
|
||||
# HACK: ghc-exactprint 1.3.0 is not buildable for GHC < 9.2,
|
||||
# HACK: ghc-exactprint 1.4.1 is not buildable for GHC < 9.2,
|
||||
# but hackage2nix evaluates the cabal file with GHC 8.10.*,
|
||||
# causing the build-depends to be skipped. Since the dependency
|
||||
# list hasn't changed much since 0.6.4, we can just reuse the
|
||||
# normal expression.
|
||||
inherit (self.ghc-exactprint_1_3_0) src version;
|
||||
inherit (self.ghc-exactprint_1_4_1) src version;
|
||||
revision = null; editedCabalFile = null;
|
||||
libraryHaskellDepends = [
|
||||
self.fail
|
||||
self.ordered-containers
|
||||
] ++ drv.libraryHaskellDepends or [];
|
||||
}) super.ghc-exactprint;
|
||||
ghc-lib = self.ghc-lib_9_2_1_20211101;
|
||||
ghc-lib-parser = self.ghc-lib-parser_9_2_1_20211101;
|
||||
ghc-lib = self.ghc-lib_9_2_1_20220109;
|
||||
ghc-lib-parser = self.ghc-lib-parser_9_2_1_20220109;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1;
|
||||
hackage-security = doJailbreak super.hackage-security;
|
||||
hashable = super.hashable_1_4_0_1;
|
||||
hashable = super.hashable_1_4_0_2;
|
||||
hashable-time = doJailbreak super.hashable-time_0_3;
|
||||
hedgehog = doJailbreak super.hedgehog;
|
||||
HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP);
|
||||
@ -131,13 +131,13 @@ self: super: {
|
||||
ormolu = self.ormolu_0_4_0_0;
|
||||
OneTuple = super.OneTuple_0_3_1;
|
||||
parallel = doJailbreak super.parallel;
|
||||
path = doJailbreak super.path_0_9_1;
|
||||
path = doJailbreak super.path_0_9_2;
|
||||
polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse);
|
||||
primitive = doJailbreak super.primitive;
|
||||
quickcheck-instances = super.quickcheck-instances_0_3_27;
|
||||
regex-posix = doJailbreak super.regex-posix;
|
||||
resolv = doJailbreak super.resolv;
|
||||
retrie = doDistribute self.retrie_1_2_0_0;
|
||||
retrie = doDistribute self.retrie_1_2_0_1;
|
||||
semialign = super.semialign_1_2_0_1;
|
||||
singleton-bool = doJailbreak super.singleton-bool;
|
||||
scientific = doJailbreak super.scientific;
|
||||
@ -234,7 +234,7 @@ self: super: {
|
||||
sha256 = "0hpp3iw7m7w2abr8vb86gdz3x6c8lj119zxln933k90ia7bmk8jc";
|
||||
};
|
||||
} (super.hlint_3_3_6.overrideScope (self: super: {
|
||||
ghc-lib-parser = self.ghc-lib-parser_9_2_1_20211101;
|
||||
ghc-lib-parser = self.ghc-lib-parser_9_2_1_20220109;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1;
|
||||
}))
|
||||
);
|
||||
|
||||
@ -455,6 +455,7 @@ broken-packages:
|
||||
- brick-dropdownmenu
|
||||
- bricks-internal
|
||||
- brillig
|
||||
- broadcast-chan-tests
|
||||
- broccoli
|
||||
- brok
|
||||
- broker-haskell
|
||||
@ -571,6 +572,7 @@ broken-packages:
|
||||
- capnp
|
||||
- capped-list
|
||||
- capri
|
||||
- captcha-core
|
||||
- caramia
|
||||
- carbonara
|
||||
- cardano-coin-selection
|
||||
@ -3881,6 +3883,7 @@ broken-packages:
|
||||
- pretty-ncols
|
||||
- prettyprinter-vty
|
||||
- prim-array
|
||||
- primecount
|
||||
- primes-type
|
||||
- prim-instances
|
||||
- PrimitiveArray-Pretty
|
||||
@ -4452,6 +4455,8 @@ broken-packages:
|
||||
- show-prettyprint
|
||||
- Shpadoinkle-backend-pardiff
|
||||
- Shpadoinkle-backend-snabbdom
|
||||
- Shpadoinkle-backend-static
|
||||
- Shpadoinkle-html
|
||||
- Shpadoinkle-isreal
|
||||
- Shpadoinkle-streaming
|
||||
- Shpadoinkle-template
|
||||
@ -4852,6 +4857,7 @@ broken-packages:
|
||||
- tagsoup-selection
|
||||
- tai
|
||||
- tai64
|
||||
- tailwind
|
||||
- takahashi
|
||||
- Takusen
|
||||
- takusen-oracle
|
||||
|
||||
@ -158,8 +158,6 @@ extra-packages:
|
||||
- resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
|
||||
- sbv == 7.13 # required for pkgs.petrinizer
|
||||
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
|
||||
- ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version
|
||||
- cabal-install-parsers == 0.4.2 # 2021-09-04: needed haskell-ci by until it upgrades to Cabal >= 3.6
|
||||
- ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4
|
||||
- ghc-lib == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version
|
||||
- ghc-lib-parser == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version
|
||||
@ -623,3 +621,6 @@ dont-distribute-packages:
|
||||
- webkitgtk3
|
||||
- webkitgtk3-javascriptcore
|
||||
- websnap
|
||||
|
||||
# glade relies on system libglade which is deprecated
|
||||
- glade
|
||||
|
||||
@ -618,6 +618,8 @@ dont-distribute-packages:
|
||||
- bricks-parsec
|
||||
- bricks-rendering
|
||||
- bricks-syntax
|
||||
- broadcast-chan-conduit
|
||||
- broadcast-chan-pipes
|
||||
- bronyradiogermany-streaming
|
||||
- brotli-conduit
|
||||
- brotli-streams
|
||||
@ -659,6 +661,8 @@ dont-distribute-packages:
|
||||
- canteven-http
|
||||
- cao
|
||||
- cap
|
||||
- captcha-2captcha
|
||||
- captcha-capmonster
|
||||
- car-pool
|
||||
- carboncopy
|
||||
- cartel
|
||||
@ -827,6 +831,8 @@ dont-distribute-packages:
|
||||
- copilot-language
|
||||
- copilot-libraries
|
||||
- copilot-theorem
|
||||
- core-webserver-servant
|
||||
- core-webserver-warp
|
||||
- coroutine-enumerator
|
||||
- coroutine-iteratee
|
||||
- couch-simple
|
||||
@ -1186,7 +1192,7 @@ dont-distribute-packages:
|
||||
- funnyprint
|
||||
- funsat
|
||||
- fused-effects-squeal
|
||||
- futhark_0_21_2
|
||||
- futhark_0_21_4
|
||||
- fwgl-glfw
|
||||
- fwgl-javascript
|
||||
- fxpak
|
||||
@ -1652,6 +1658,7 @@ dont-distribute-packages:
|
||||
- hsfacter
|
||||
- hslogstash
|
||||
- hspec-expectations-pretty
|
||||
- hspec-expectations-pretty-diff_0_7_2_6
|
||||
- hspec-pg-transact
|
||||
- hspec-setup
|
||||
- hspec-shouldbe
|
||||
@ -1810,6 +1817,7 @@ dont-distribute-packages:
|
||||
- ivy-web
|
||||
- iyql
|
||||
- j2hs
|
||||
- jacinda
|
||||
- jail
|
||||
- java-bridge-extras
|
||||
- java-character
|
||||
@ -1890,6 +1898,7 @@ dont-distribute-packages:
|
||||
- knead-arithmetic
|
||||
- knit-haskell
|
||||
- knots
|
||||
- koji-tool
|
||||
- korfu
|
||||
- ks-test
|
||||
- kurita
|
||||
@ -2161,6 +2170,7 @@ dont-distribute-packages:
|
||||
- mprover
|
||||
- mps
|
||||
- mptcp
|
||||
- mptcpanalyzer
|
||||
- msgpack-aeson
|
||||
- msgpack-idl
|
||||
- msgpack-rpc
|
||||
@ -2295,7 +2305,7 @@ dont-distribute-packages:
|
||||
- pairing
|
||||
- panda
|
||||
- pandoc-japanese-filters
|
||||
- pandoc_2_16_2
|
||||
- pandoc_2_17
|
||||
- papa
|
||||
- papa-base
|
||||
- papa-base-implement
|
||||
@ -2443,6 +2453,7 @@ dont-distribute-packages:
|
||||
- proto3-suite
|
||||
- protobuf-native
|
||||
- protocol-buffers-descriptor-fork
|
||||
- psql
|
||||
- puffytools
|
||||
- pugs-compat
|
||||
- pugs-hsregex
|
||||
|
||||
@ -818,6 +818,12 @@ self: super: builtins.intersectAttrs super {
|
||||
platforms = pkgs.lib.platforms.x86;
|
||||
} super.geomancy;
|
||||
|
||||
hlint = overrideCabal (drv: {
|
||||
postInstall = ''
|
||||
install -Dm644 data/hlint.1 -t "$out/share/man/man1"
|
||||
'' + drv.postInstall or "";
|
||||
}) super.hlint;
|
||||
|
||||
hls-brittany-plugin = overrideCabal (drv: {
|
||||
testToolDepends = [ pkgs.git ];
|
||||
preCheck = ''
|
||||
|
||||
2253
pkgs/development/haskell-modules/hackage-packages.nix
generated
2253
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
24
pkgs/development/haskell-modules/patches/hnix.patch
Normal file
24
pkgs/development/haskell-modules/patches/hnix.patch
Normal file
@ -0,0 +1,24 @@
|
||||
From 06b12ab8a733d4de2a39060ba29c06e4ec1c1187 Mon Sep 17 00:00:00 2001
|
||||
From: Anton Latukha <anton.latukha@gmail.com>
|
||||
Date: Sun, 16 Jan 2022 18:16:50 +0200
|
||||
Subject: [PATCH] fix aeson <2 support
|
||||
|
||||
---
|
||||
src/Nix/Json.hs | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/Nix/Json.hs b/src/Nix/Json.hs
|
||||
index 3fe05269..329899e4 100644
|
||||
--- a/src/Nix/Json.hs
|
||||
+++ b/src/Nix/Json.hs
|
||||
@@ -9,6 +9,8 @@ import qualified Data.Text.Lazy.Encoding as TL
|
||||
#if MIN_VERSION_aeson(2,0,0)
|
||||
import qualified Data.Aeson.Key as AKM
|
||||
import qualified Data.Aeson.KeyMap as AKM
|
||||
+#else
|
||||
+import Nix.Expr.Types
|
||||
#endif
|
||||
import qualified Data.Vector as V
|
||||
import Nix.Atoms
|
||||
--
|
||||
2.34.1
|
||||
@ -1,57 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config
|
||||
, SDL, libGLU, libGL, openal, lua
|
||||
, libdevil, freetype, physfs
|
||||
, libmodplug, mpg123, libvorbis, libogg
|
||||
, libmng
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "love";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/love2d/love/releases/download/${version}/love-${version}-linux-src.tar.gz";
|
||||
sha256 = "0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5";
|
||||
};
|
||||
|
||||
# see discussion on arch linux user repository (https://aur.archlinux.org/packages/love07/?setlang=cs#comment-684696)
|
||||
patches = [ ./0.7-gl-prototypes.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
SDL libGLU libGL openal lua
|
||||
libdevil freetype physfs libmodplug mpg123 libvorbis libogg libmng
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
luaoptions="${"''"} lua luajit "
|
||||
for i in lua luajit-; do
|
||||
for j in 5 5.0 5.1 5.2 5.3 5.4; do
|
||||
luaoptions="$luaoptions $i$j "
|
||||
done
|
||||
done
|
||||
luaso="$(echo "${lua}/lib/"lib*.so.*)"
|
||||
luaso="''${luaso##*/lib}"
|
||||
luaso="''${luaso%%.so*}"
|
||||
luaoptions="$luaoptions $luaso"
|
||||
sed -e "s/${"''"} lua lua.*;/$luaoptions;/" -i configure
|
||||
|
||||
luaincdir="$(echo "${lua}/include"/*/ )"
|
||||
test -d "$luaincdir" && {
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$luaincdir"
|
||||
} || true
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = ''
|
||||
-I${SDL.dev}/include/SDL
|
||||
-I${freetype.dev}include/freetype2
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://love2d.org";
|
||||
description = "A Lua-based 2D game engine/scripting language";
|
||||
license = lib.licenses.zlib;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
};
|
||||
}
|
||||
@ -1,54 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config
|
||||
, SDL, libGLU, libGL, openal, lua
|
||||
, libdevil, freetype, physfs
|
||||
, libmodplug, mpg123, libvorbis, libogg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "love";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/love2d/love/releases/download/${version}/love-${version}-linux-src.tar.gz";
|
||||
sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
SDL libGLU libGL openal lua
|
||||
libdevil freetype physfs libmodplug mpg123 libvorbis libogg
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
luaoptions="${"''"} lua luajit "
|
||||
for i in lua luajit-; do
|
||||
for j in 5 5.0 5.1 5.2 5.3 5.4; do
|
||||
luaoptions="$luaoptions $i$j "
|
||||
done
|
||||
done
|
||||
luaso="$(echo "${lua}/lib/"lib*.so.*)"
|
||||
luaso="''${luaso##*/lib}"
|
||||
luaso="''${luaso%%.so*}"
|
||||
luaoptions="$luaoptions $luaso"
|
||||
sed -e "s/${"''"} lua lua.*;/$luaoptions;/" -i configure
|
||||
|
||||
luaincdir="$(echo "${lua}/include"/*/ )"
|
||||
test -d "$luaincdir" && {
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$luaincdir"
|
||||
} || true
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-I${SDL.dev}/include/SDL"
|
||||
"-I${freetype.dev}include/freetype2"
|
||||
"-DGL_GLEXT_PROTOTYPES" # https://community.khronos.org/t/glgenbuffers-was-not-declared-in-this-scope/59283/2
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://love2d.org";
|
||||
description = "A Lua-based 2D game engine/scripting language";
|
||||
license = lib.licenses.zlib;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
};
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config
|
||||
, SDL2, libGLU, libGL, openal, luajit
|
||||
, libdevil, freetype, physfs
|
||||
, libmodplug, mpg123, libvorbis, libogg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "love";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/love2d/love/releases/download/${version}/love-${version}-linux-src.tar.gz";
|
||||
sha256 = "0wn1npr5gal5b1idh4a5fwc3f5c36lsbjd4r4d699rqlviid15d9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
SDL2 libGLU libGL openal luajit
|
||||
libdevil freetype physfs libmodplug mpg123 libvorbis libogg
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-lua=luajit"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3
|
||||
|
||||
meta = {
|
||||
homepage = "https://love2d.org";
|
||||
description = "A Lua-based 2D game engine/scripting language";
|
||||
license = lib.licenses.zlib;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
@ -12,13 +12,13 @@ assert mpiSupport -> mpi != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "highfive";
|
||||
version = "2.2";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BlueBrain";
|
||||
repo = "HighFive";
|
||||
rev = "4c70d818ed18231563fe49ff197d1c41054be592";
|
||||
sha256 = "02xy3c2ix3nw8109aw75ixj651knzc5rjqwqrxximm4hzwx09frk";
|
||||
rev = "v${version}";
|
||||
sha256 = "qaIThJGdoLgs82h+W4BKQEu1yy1bB8bZFiuxI7IxInw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xdg-desktop-portal-wlr";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emersion";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:13fbzh8bjnhk4xs8j9bpc01q3hy27zpbf0gkk1fnh3hm5pnyfyiv";
|
||||
sha256 = "sha256-weePlNcLmZ3R0IDQ95p0wQvsKTYp+sVlTENJtF8Z78Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland-protocols makeWrapper ];
|
||||
|
||||
@ -12,17 +12,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpuvis";
|
||||
version = "20210220";
|
||||
version = "20211204";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mikesart";
|
||||
repo = pname;
|
||||
rev = "216f7d810e182a89fd96ab9fad2a5c2b1e425ea9";
|
||||
sha256 = "15pj7gy0irlp849a85z68n184jksjri0xhihgh56rs15kq333mwz";
|
||||
rev = "7f47419470687c7ecbdf086b81f5bafdb05d1bef";
|
||||
sha256 = "sha256-29Bv+y0zWzn7QtpsjRV6hr19bCeyVJusPcYiAIEIluk=";
|
||||
};
|
||||
|
||||
# patch dlopen path for gtk3
|
||||
# python2 is wrongly added in the meson file, upstream PR: https://github.com/mikesart/gpuvis/pull/62
|
||||
postPatch = ''
|
||||
substituteInPlace src/hook_gtk3.h \
|
||||
--replace "libgtk-3.so" "${lib.getLib gtk3}/lib/libgtk-3.so"
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "among-sus-unstable";
|
||||
version = "2020-10-29";
|
||||
version = "2021-05-19";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~martijnbraam";
|
||||
repo = "among-sus";
|
||||
rev = "1f4c8d800d025d36ac66826937161be3252fbc57";
|
||||
sha256 = "19jq7ygh9l11dl1h6702bg57m04y35nqd6yqx1rgp1kxwhp45xyh";
|
||||
rev = "554e60bf52e3fa931661b9414189a92bb8f69d78";
|
||||
sha256 = "0j1158nczhvy5i1ykvzvhlv4ndhibgng0dq1lw2bmi8q6k1q1s0w";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
{ fetchgit, lib, stdenv, love, curl, zip }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "0.12.1";
|
||||
pname = "hawkthorne";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hawkthorne/hawkthorne-journey.git";
|
||||
rev = "610b9b3907b2a1b21da2ae926e4c7c4c9e19959b";
|
||||
sha256 = "013smhdf9sh91153fpk2bwhhnpg6pn7kfrpw77jmf0v48i3q44h2";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
love curl zip
|
||||
];
|
||||
|
||||
patches = [
|
||||
./makefile.patch
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Journey to the Center of Hawkthorne - A fan-made retro-style game based on the show Community";
|
||||
longDescription = ''
|
||||
Journey to the Center of Hawkthorne is an open source game written in Love2D.
|
||||
It's based on the show Community, starring Jim Rash and Joel McHale as
|
||||
the primary will-they-or-won't-they relationship.
|
||||
|
||||
This game has been entirely developed by fans of the show, who were inspired
|
||||
to bring to life the video game used to determine the winner of Pierce
|
||||
Hawthorne's inheritance.
|
||||
'';
|
||||
homepage = "https://www.reddit.com/r/hawkthorne";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ campadrenalin ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
@ -1,33 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 55eb817..f3406aa 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -18,10 +18,14 @@ endif
|
||||
|
||||
tilemaps := $(patsubst %.tmx,%.lua,$(wildcard src/maps/*.tmx))
|
||||
|
||||
-maps: $(tilemaps)
|
||||
-
|
||||
love: build/hawkthorne.love
|
||||
|
||||
+shebang: build/hawkthorne.love
|
||||
+ cat <(echo '#!/usr/bin/env love') build/hawkthorne.love > build/hawkthorne
|
||||
+ chmod +x build/hawkthorne
|
||||
+
|
||||
+maps: $(tilemaps)
|
||||
+
|
||||
build/hawkthorne.love: $(tilemaps) src/*
|
||||
mkdir -p build
|
||||
cd src && zip --symlinks -q -r ../build/hawkthorne.love . -x ".*" \
|
||||
@@ -30,6 +34,12 @@ build/hawkthorne.love: $(tilemaps) src/*
|
||||
run: $(tilemaps) $(LOVE)
|
||||
$(LOVE) src
|
||||
|
||||
+check: test
|
||||
+
|
||||
+install: shebang
|
||||
+ mkdir -p $(out)/bin
|
||||
+ cp build/hawkthorne $(out)/bin
|
||||
+
|
||||
src/maps/%.lua: src/maps/%.tmx bin/tmx2lua
|
||||
bin/tmx2lua $<
|
||||
@ -1,49 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub, zip, love_0_7, makeWrapper, makeDesktopItem }:
|
||||
|
||||
let
|
||||
pname = "nottetris2";
|
||||
version = "2.0";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "nottetris2";
|
||||
exec = pname;
|
||||
comment = "It's like tetris, but it's not";
|
||||
desktopName = "nottetris2";
|
||||
genericName = "nottetris2";
|
||||
categories = "Game";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stabyourself";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "17iabh6rr8jim70n96rbhif4xq02g2kppscm8l339yqx6mhb64hs";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ zip makeWrapper ];
|
||||
buildInputs = [ love_0_7 ];
|
||||
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out/bin $out/share/games/lovegames $out/share/applications
|
||||
zip -9 -r ${pname}.love ./*
|
||||
mv ${pname}.love $out/share/games/lovegames/${pname}.love
|
||||
makeWrapper ${love_0_7}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
|
||||
ln -s ${desktopItem}/share/applications/* $out/share/applications/
|
||||
chmod +x $out/bin/${pname}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "It's like Tetris, but it's not";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.wtfpl;
|
||||
maintainers = with maintainers; [ yorickvp ];
|
||||
downloadPage = "https://stabyourself.net/nottetris2/";
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,55 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rimshot";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://stabyourself.net/dl.php?file=${pname}/${pname}-source.zip";
|
||||
sha256 = "08pdkyvki92549605m9bqnr24ipkbwkp5nkr5aagdqnr8ai4rgmi";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
url = "http://stabyourself.net/images/screenshots/rimshot-2.png";
|
||||
sha256 = "08fyiqym3gcpq2vgb5dvafkban42fsbzfcr3iiyw03hz99q53psd";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "rimshot";
|
||||
exec = pname;
|
||||
icon = icon;
|
||||
comment = "Create your own music";
|
||||
desktopName = "Rimshot";
|
||||
genericName = "rimshot";
|
||||
categories = "Audio;AudioVideo;Music";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
buildInputs = [ lua love ];
|
||||
|
||||
unpackPhase = ''
|
||||
unzip -j $src
|
||||
'';
|
||||
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/games/lovegames
|
||||
|
||||
cp -v ./*.love $out/share/games/lovegames/${pname}.love
|
||||
makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
|
||||
|
||||
chmod +x $out/bin/${pname}
|
||||
mkdir -p $out/share/applications
|
||||
ln -s ${desktopItem}/share/applications/* $out/share/applications/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Create your own music";
|
||||
maintainers = with maintainers; [ leenaars ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.free;
|
||||
downloadPage = "http://stabyourself.net/rimshot/";
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }:
|
||||
|
||||
let
|
||||
pname = "vapor";
|
||||
version = "0.2.3";
|
||||
commitid = "dbf509f";
|
||||
|
||||
icon = fetchurl {
|
||||
url = "http://vapor.love2d.org/sites/default/files/vapT240x90.png";
|
||||
sha256 = "1xlra74lpm1y54z6zm6is0gldkswp3wdw09m6a306ch0xjf3f87f";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "Vapor";
|
||||
exec = pname;
|
||||
icon = icon;
|
||||
comment = "LÖVE Distribution Client";
|
||||
desktopName = "Vapor";
|
||||
genericName = "vapor";
|
||||
categories = "Game;";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/josefnpat/${pname}/releases/download/${version}/${pname}_${commitid}.love";
|
||||
sha256 = "0w2qkrrkzfy4h4jld18apypmbi8a8r89y2l11axlv808i2rg68fk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ lua love ];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share
|
||||
|
||||
cp -v $src $out/share/${pname}.love
|
||||
|
||||
makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/${pname}.love
|
||||
|
||||
chmod +x $out/bin/${pname}
|
||||
mkdir -p $out/share/applications
|
||||
ln -s ${desktopItem}/share/applications/* $out/share/applications/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "LÖVE Distribution Client allowing access to many games";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.zlib;
|
||||
maintainers = with maintainers; [ leenaars ];
|
||||
downloadPage = "http://vapor.love2d.org/";
|
||||
};
|
||||
|
||||
}
|
||||
@ -367,6 +367,22 @@ let
|
||||
|
||||
chenglou92.rescript-vscode = callPackage ./rescript { };
|
||||
|
||||
christian-kohler.path-intellisense = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "path-intellisense";
|
||||
publisher = "christian-kohler";
|
||||
version = "2.6.1";
|
||||
sha256 = "sha256-ol98g3pliBlyEQ+n7cR4O04J/0QB9U8+fvf+FC0j0Fc=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "Visual Studio Code plugin that autocompletes filenames";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=christian-kohler.path-intellisense";
|
||||
homepage = "https://github.com/ChristianKohler/PathIntellisense";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ imgabe ];
|
||||
};
|
||||
};
|
||||
|
||||
cmschuetz12.wal = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "wal";
|
||||
|
||||
@ -16,7 +16,7 @@ let
|
||||
'',
|
||||
dontPatchELF ? true,
|
||||
dontStrip ? true,
|
||||
buildInputs ? [],
|
||||
nativeBuildInputs ? [],
|
||||
...
|
||||
}:
|
||||
stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // {
|
||||
@ -28,7 +28,7 @@ let
|
||||
|
||||
installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}";
|
||||
|
||||
buildInputs = [ unzip ] ++ buildInputs;
|
||||
nativeBuildInputs = [ unzip ] ++ nativeBuildInputs;
|
||||
|
||||
installPhase = ''
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, srt
|
||||
, ffmpeg_3_4
|
||||
, bc
|
||||
, pkg-config
|
||||
, perl
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
# server, and the FHS userenv and corresponding NixOS module should
|
||||
# automatically pick up the changes.
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.25.2.5319-c43dc0277";
|
||||
version = "1.25.3.5409-f11334058";
|
||||
pname = "plexmediaserver";
|
||||
|
||||
# Fetch the source
|
||||
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
|
||||
sha256 = "09kkkyli5fygyvlzqd46jzi0y4jp0a24d92ayvfm95gm3fcxl73x";
|
||||
hash = "sha256-Q0768UxZXSuUm26Ro2XIrw8qoQEWCU23P7EBtbiIa0c=";
|
||||
} else fetchurl {
|
||||
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
|
||||
sha256 = "17whd724sjblqxz6d79jb6hrqvkgg5mbh3bh1lr9b8sswa3pxb07";
|
||||
hash = "sha256-TaOvXVeo385vqtv/dYvmQQx8c1K/EMw4MTDucg511Cs=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "basedb" ];
|
||||
|
||||
@ -4,13 +4,13 @@ let
|
||||
pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 ]);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "sickgear";
|
||||
version = "0.25.11";
|
||||
version = "0.25.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SickGear";
|
||||
repo = "SickGear";
|
||||
rev = "release_${version}";
|
||||
sha256 = "sha256-0/Ez10IWvh84G//1vCZMLiu4+Y2+XcVLw9Gm9X+DY0s=";
|
||||
sha256 = "sha256-x6v7CKJkN6gt9askpp/W0CVCKvRaHLBXbagtC+rVNVc=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -386,6 +386,7 @@ mapAliases ({
|
||||
gupnp_igd = gupnp-igd; # added 2018-02-25
|
||||
gupnptools = gupnp-tools; # added 2015-12-19
|
||||
gutenberg = zola; # added 2018-11-17
|
||||
hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # added 2022-01-15
|
||||
hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # added 2021-02-07
|
||||
heimdalFull = heimdal; # added 2018-05-01
|
||||
hepmc = hepmc2; # added 2019-08-05
|
||||
@ -574,6 +575,9 @@ mapAliases ({
|
||||
lua5_expat = luaPackages.luaexpat; # added 2017-05-02
|
||||
lua5_sec = luaPackages.luasec; # added 2017-05-02
|
||||
lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2."; # added 2022-01-12
|
||||
love_0_7 = throw "love_0_7 was removed because it is a very old version and no longer used by any package in nixpkgs"; # added 2022-01-15
|
||||
love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # added 2022-01-15
|
||||
love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # added 2022-01-15
|
||||
lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # added 2020-06-03
|
||||
lzma = xz; # moved from top-level 2021-03-14
|
||||
m3d-linux = m33-linux; # added 2016-08-13
|
||||
@ -656,6 +660,7 @@ mapAliases ({
|
||||
nmap-unfree = nmap; # added 2021-04-06
|
||||
nologin = shadow; # added 2018-04-25
|
||||
nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27
|
||||
nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # added 2022-01-15
|
||||
noto-fonts-cjk = noto-fonts-cjk-sans; # added 2021-12-16
|
||||
now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # added 2021-08-05
|
||||
nxproxy = nx-libs; # added 2019-02-15
|
||||
@ -859,6 +864,7 @@ mapAliases ({
|
||||
qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
|
||||
qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # added 2021-02-15
|
||||
rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23
|
||||
rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # added 2022-01-15
|
||||
riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14
|
||||
ring-daemon = jami-daemon; # added 2021-10-26
|
||||
radare2-cutter = cutter; # added 2021-03-30
|
||||
@ -1047,6 +1053,7 @@ mapAliases ({
|
||||
uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries";
|
||||
v4l_utils = v4l-utils; # added 2019-08-07
|
||||
v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages";
|
||||
vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists";
|
||||
vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26
|
||||
varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26
|
||||
varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26
|
||||
|
||||
@ -13541,9 +13541,6 @@ with pkgs;
|
||||
|
||||
lolcode = callPackage ../development/interpreters/lolcode { };
|
||||
|
||||
love_0_7 = callPackage ../development/interpreters/love/0.7.nix { lua=lua5_1; };
|
||||
love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; };
|
||||
love_0_9 = callPackage ../development/interpreters/love/0.9.nix { };
|
||||
love_0_10 = callPackage ../development/interpreters/love/0.10.nix { };
|
||||
love_11 = callPackage ../development/interpreters/love/11.nix { };
|
||||
love = love_0_10;
|
||||
@ -30760,8 +30757,6 @@ with pkgs;
|
||||
|
||||
harmonist = callPackage ../games/harmonist { };
|
||||
|
||||
hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; };
|
||||
|
||||
hedgewars = libsForQt514.callPackage ../games/hedgewars {
|
||||
inherit (haskellPackages) ghcWithPackages;
|
||||
};
|
||||
@ -30925,8 +30920,6 @@ with pkgs;
|
||||
|
||||
newtonwars = callPackage ../games/newtonwars { };
|
||||
|
||||
nottetris2 = callPackage ../games/nottetris2 { };
|
||||
|
||||
nudoku = callPackage ../games/nudoku { };
|
||||
|
||||
nxengine-evo = callPackage ../games/nxengine-evo { };
|
||||
@ -31075,8 +31068,6 @@ with pkgs;
|
||||
|
||||
rili = callPackage ../games/rili { };
|
||||
|
||||
rimshot = callPackage ../games/rimshot { love = love_0_7; };
|
||||
|
||||
rogue = callPackage ../games/rogue {
|
||||
ncurses = ncurses5;
|
||||
};
|
||||
@ -31328,8 +31319,6 @@ with pkgs;
|
||||
|
||||
ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ];
|
||||
|
||||
vapor = callPackage ../games/vapor { love = love_0_8; };
|
||||
|
||||
vapoursynth = callPackage ../development/libraries/vapoursynth {
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user