From b13df331991dd24a7a54764c7984fd11322f8752 Mon Sep 17 00:00:00 2001 From: Anbang Wen Date: Sun, 30 May 2021 21:48:04 -0700 Subject: [PATCH 1/3] nixos/apple-sdk: 11.0 -> 11.1 The previous URL is a dead link. This commit updates it and bump the SDK version to 11.1. (cherry picked from commit 2565e3bba62d8d2f57a975c7ecce97d7c557dfa6) --- pkgs/os-specific/darwin/apple-sdk-11.0/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index 03a6650d9d9..44b119e1a23 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -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/ From ae42a59565cd9274905f09cfcc88f774c1ff8d10 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 1 Aug 2021 17:07:34 +0200 Subject: [PATCH 2/3] =?UTF-8?q?qarte:=204.6.0=20=E2=86=92=204.12.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 5af58916df9f9192499263ec2c798a3e1a9218c1) --- pkgs/applications/video/qarte/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index 26b3153019f..9b80ddedcf3 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -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 ]; From 259f027a4b9b39b0f552673c74caeea3ddf8f79f Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 4 Aug 2021 11:41:08 +0200 Subject: [PATCH 3/3] cabal2nix: 2.17.0 -> 2.18.0 https://github.com/NixOS/cabal2nix/blob/v2.18.0/CHANGELOG.md 2.18.0 mostly brings bug fixes, especially the one fixing the unclear error message if a cabal file was missing (which was forgotten in the changelog). It is not technically a non-breaking change since the Haskell API changed. Since there shouldn't be any breakage for users and all known reverse dependencies of cabal2nix have been broken for a while, the benefits of backporting outweigh the risks. --- .../haskell-modules/non-hackage-packages.nix | 6 ++++ pkgs/development/misc/haskell/cabal2nix.nix | 35 +++++++++++++++++++ .../misc/haskell/distribution-nixpkgs.nix | 19 ++++++++++ 3 files changed, 60 insertions(+) create mode 100644 pkgs/development/misc/haskell/cabal2nix.nix create mode 100644 pkgs/development/misc/haskell/distribution-nixpkgs.nix diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index e8007a91d03..56ad1b8c25f 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -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; + }; } diff --git a/pkgs/development/misc/haskell/cabal2nix.nix b/pkgs/development/misc/haskell/cabal2nix.nix new file mode 100644 index 00000000000..05a621856d0 --- /dev/null +++ b/pkgs/development/misc/haskell/cabal2nix.nix @@ -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; +} diff --git a/pkgs/development/misc/haskell/distribution-nixpkgs.nix b/pkgs/development/misc/haskell/distribution-nixpkgs.nix new file mode 100644 index 00000000000..92b2b89b2c6 --- /dev/null +++ b/pkgs/development/misc/haskell/distribution-nixpkgs.nix @@ -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; +}