public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge release-21.05 into staging-next-21.05

This commit is contained in:
github-actions[bot] 2021-08-04 12:02:27 +00:00 committed by GitHub
parent d57a0c4cd9 465daf79b4
commit 0d1b8f5bca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 67 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/video/qarte/default.nix
View File

@ -3,11 +3,11 @@
let
pythonEnv = python3.withPackages (ps: with ps; [ pyqt5_with_qtmultimedia ]);
in mkDerivation {
name = "qarte-4.6.0";
name = "qarte-4.12.0";
src = fetchbzr {
url = "http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4";
rev = "22";
sha256 = "0v4zpj8w67ydvnmanxbl8pwvn0cfv70c0mlw36a1r4n0rvgxffcn";
rev = "56";
sha256 = "0cq9dg04grl45xw43gi9wsb0vm8c4bcvh813h5lm4ry8b94lfx2i";
};
buildInputs = [ pythonEnv ];

6
pkgs/development/haskell-modules/non-hackage-packages.nix
View File

@ -49,5 +49,11 @@ self: super: {
arion-compose = self.callPackage ../../applications/virtualization/arion/arion-compose.nix {};
# cabal2nix cabal://ap-normalize-0.1.0.1
ap-normalize = self.callPackage ../misc/haskell/ap-normalize {};
# cabal2nix cabal://distribution-nixpkgs
distribution-nixpkgs_1_6_0 = self.callPackage ../misc/haskell/distribution-nixpkgs.nix {};
# cabal2nix cabal://cabal2nix-2.18.0
cabal2nix = self.callPackage ../misc/haskell/cabal2nix.nix {
distribution-nixpkgs = self.distribution-nixpkgs_1_6_0;
};
}

35
pkgs/development/misc/haskell/cabal2nix.nix Normal file
View File

@ -0,0 +1,35 @@
{ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
, containers, deepseq, directory, distribution-nixpkgs, filepath
, hackage-db, hopenssl, hpack, language-nix, lens, lib, monad-par
, monad-par-extras, mtl, optparse-applicative, pretty, process
, split, tasty, tasty-golden, text, time, transformers, yaml
}:
mkDerivation {
pname = "cabal2nix";
version = "2.18.0";
sha256 = "4b90602dc0878c2e4a3e7def2c2ae0e99782b2f0d53d8e3914adaa43038b1f86";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson ansi-wl-pprint base bytestring Cabal containers deepseq
directory distribution-nixpkgs filepath hackage-db hopenssl hpack
language-nix lens optparse-applicative pretty process split text
time transformers yaml
];
executableHaskellDepends = [
aeson base bytestring Cabal containers directory
distribution-nixpkgs filepath hopenssl language-nix lens monad-par
monad-par-extras mtl optparse-applicative pretty
];
testHaskellDepends = [
base Cabal containers directory filepath language-nix lens pretty
process tasty tasty-golden
];
preCheck = ''
export PATH="$PWD/dist/build/cabal2nix:$PATH"
export HOME="$TMPDIR/home"
'';
homepage = "https://github.com/nixos/cabal2nix#readme";
description = "Convert Cabal files into Nix build instructions";
license = lib.licenses.bsd3;
}

19
pkgs/development/misc/haskell/distribution-nixpkgs.nix Normal file
View File

@ -0,0 +1,19 @@
{ mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq
, hspec, language-nix, lens, lib, pretty, process, split
}:
mkDerivation {
pname = "distribution-nixpkgs";
version = "1.6.0";
sha256 = "d1804dcb731858d40859f1cf55ea81b3f6bc63a353437c1009c158e0f9e03354";
revision = "1";
editedCabalFile = "0j35y7ws7rbc68vkmyvpa4m2dyfpzpzzvm4lv7h6r7x34w331dgg";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring Cabal containers deepseq language-nix lens
pretty process split
];
testHaskellDepends = [ base deepseq hspec lens ];
homepage = "https://github.com/NixOS/distribution-nixpkgs";
description = "Types and functions to manipulate the Nixpkgs distribution";
license = lib.licenses.bsd3;
}

8
pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
View File

@ -6,10 +6,10 @@ let
pname = "MacOSX-SDK";
version = "11.0.0";
# https://swscan.apple.com/content/catalogs/others/index-10.16.merged-1.sucatalog
# https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog
src = fetchurl {
url = "http://swcdn.apple.com/content/downloads/58/37/001-75138-A_59RXKDS8YM/12ksm19hgzscfc7cau3yhecz4vpkps7wbq/CLTools_macOSNMOS_SDK.pkg";
sha256 = "0n51ba926ckwm62w5c8lk3w5hj4ihk0p5j02321qi75wh824hl8m";
url = "http://swcdn.apple.com/content/downloads/46/21/001-89745-A_56FM390IW5/v1um2qppgfdnam2e9cdqcqu2r6k8aa3lis/CLTools_macOSNMOS_SDK.pkg";
sha256 = "0n425smj4q1vxbza8fzwnk323fyzbbq866q32w288c44hl5yhwsf";
};
dontBuild = true;
@ -24,7 +24,7 @@ let
'';
installPhase = ''
cd Library/Developer/CommandLineTools/SDKs/MacOSX11.0.sdk
cd Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk
mkdir $out
cp -r System usr $out/