From d767c0c253bf118ca7291c469da33a7e5d2d767e Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 12 Jul 2018 03:37:33 +0200 Subject: idris: Remove unneeded overrides - The gmp issue has long been fixed and closed - The preBuild thing was never used afaik, it works no problem without it, especially since checks don't run (To get checks to work we'd have to compile the libraries into idris, which are currently nicely separated) - The dependencies overrides aren't needed anymore --- pkgs/top-level/all-packages.nix | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c3109df6d06..42648d0813a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6633,20 +6633,7 @@ with pkgs; icedtea_web = icedtea8_web; idrisPackages = callPackage ../development/idris-modules { - - idris-no-deps = - let - inherit (self.haskell) lib; - haskellPackages = self.haskellPackages.override { - overrides = self: super: { - binary = lib.dontCheck self.binary_0_8_5_1; - parsers = lib.dontCheck super.parsers; - semigroupoids = lib.dontCheck super.semigroupoids; - trifecta = lib.dontCheck super.trifecta; - }; - }; - in - haskellPackages.idris; + idris-no-deps = haskellPackages.idris; }; idris = idrisPackages.with-packages [ idrisPackages.base ] ; -- cgit 1.4.1 From e21606a645fdaecf4c65f79e2b1dfd4f95166e9d Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 15 Jul 2018 15:45:09 +0300 Subject: percona-toolkit: init at 3.0.11 --- pkgs/top-level/perl-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c489ff2fb20d..39eec1493022 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12122,6 +12122,25 @@ let self = _self // overrides; _self = with self; { }; }; + PerconaToolkit = buildPerlPackage rec { + name = "Percona-Toolkit-3.0.11"; + src = fetchFromGitHub { + owner = "percona"; + repo = "percona-toolkit"; + rev = "6e5c5c5e6db0a32c6951c8f798c4547539cdab87"; + sha256 = "18wxvp7psqrx0zdvg47azrals572hv9fx1s3p0q65s87lnk3q63l"; + }; + outputs = [ "out" ]; + buildInputs = [ DBDmysql DBI DigestMD5 IOSocketSSL TermReadKey TimeHiRes ]; + meta = { + description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.''; + homepage = http://www.percona.com/software/percona-toolkit; + license = with stdenv.lib.licenses; [ lgpl2 ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ izorkin ]; + }; + }; + Perl5lib = buildPerlPackage rec { name = "perl5lib-1.02"; src = fetchurl { -- cgit 1.4.1 From e8b29688c8ea5c0efb4f610ad39abf7bd588e91d Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Mon, 16 Jul 2018 13:15:23 +0900 Subject: ffmpeg-full: enable libvpx on Darwin --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e972198f8ab..4b3e340df8f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9136,7 +9136,6 @@ with pkgs; game-music-emu = if stdenv.isDarwin then null else game-music-emu; libjack2 = if stdenv.isDarwin then null else libjack2; libmodplug = if stdenv.isDarwin then null else libmodplug; - libvpx = if stdenv.isDarwin then null else libvpx; openal = if stdenv.isDarwin then null else openal; libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; samba = if stdenv.isDarwin then null else samba; -- cgit 1.4.1 From cb12f601d7438386d355e9807c7fa70a56c3d81a Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 13 Jul 2018 01:07:32 +0200 Subject: idrisPackages: build with hydra --- pkgs/top-level/release.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 81f0874ca12d..5553c4d5265e 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -166,6 +166,7 @@ let } // (mapTestOn ((packagePlatforms pkgs) // rec { haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages; + idrisPackages = packagePlatforms pkgs.idrisPackages; # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66 -- cgit 1.4.1 From 7741be72e73c054df8c6669b0622b7352a118b40 Mon Sep 17 00:00:00 2001 From: Maximilian Bode Date: Wed, 11 Jul 2018 22:40:25 +0200 Subject: aws-rotate-key: init at 1.0.0 --- pkgs/tools/admin/aws-rotate-key/default.nix | 25 +++++++++++++++++++++++++ pkgs/tools/admin/aws-rotate-key/deps.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 56 insertions(+) create mode 100644 pkgs/tools/admin/aws-rotate-key/default.nix create mode 100644 pkgs/tools/admin/aws-rotate-key/deps.nix (limited to 'pkgs/top-level') diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix new file mode 100644 index 000000000000..cffb67e7d6ca --- /dev/null +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "aws-rotate-key-${version}"; + version = "1.0.0"; + + goPackagePath = "github.com/Fullscreen/aws-rotate-key"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "Fullscreen"; + repo = "aws-rotate-key"; + sha256 = "13q7rns65cj8b4i0s75dbswijpra9z74b462zribwfjdm29by5k1"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Easily rotate your AWS key"; + homepage = https://github.com/Fullscreen/aws-rotate-key; + license = licenses.mit; + maintainers = [maintainers.mbode]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/admin/aws-rotate-key/deps.nix b/pkgs/tools/admin/aws-rotate-key/deps.nix new file mode 100644 index 000000000000..680a18e7e2d3 --- /dev/null +++ b/pkgs/tools/admin/aws-rotate-key/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "af26abd521cd7697481572fdbc4a53cbea3dde1b"; + sha256 = "1yribbqy9i4i70dfg3yrjhkn3n0fywpr3kismn2mvi882mm01pxz"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "c2b33e8439af944379acbdd9c3a5fe0bc44bd8a5"; + sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "f844700ba2a387dfee7ab3679e7544b5dbd6d394"; + sha256 = "0s9100bzqj58nnax3dxfgi5qr4rbaa53cb0cj3s58k9jc9z6270m"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a52db70835ff..3f1bbad3a8b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -553,6 +553,8 @@ with pkgs; awslogs = callPackage ../tools/admin/awslogs { }; + aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; + aws_shell = pythonPackages.callPackage ../tools/admin/aws_shell { }; aws-sam-cli = callPackage ../development/tools/aws-sam-cli { }; -- cgit 1.4.1 From 2977fb19cabaaa1929f77fee7599459252a3849e Mon Sep 17 00:00:00 2001 From: Eduard Bopp Date: Mon, 16 Jul 2018 20:23:18 +0200 Subject: pythonPackages.parsy: init at 1.2.0 --- pkgs/development/python-modules/parsy/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/parsy/default.nix (limited to 'pkgs/top-level') diff --git a/pkgs/development/python-modules/parsy/default.nix b/pkgs/development/python-modules/parsy/default.nix new file mode 100644 index 000000000000..4183f30caad9 --- /dev/null +++ b/pkgs/development/python-modules/parsy/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder, pytest }: + +buildPythonPackage rec { + pname = "parsy"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mdqg07x5ybmbmj55x75gyhfcjrn7ml0cf3z0jwbskx845j31m6x"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test test/ + ''; + + disabled = pythonOlder "3.4"; + + meta = with lib; { + homepage = https://github.com/python-parsy/parsy; + description = "Easy-to-use parser combinators, for parsing in pure Python"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ aepsil0n ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7b0e838ae6b..253796324cbb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1882,6 +1882,8 @@ in { ''; }; + parsy = callPackage ../development/python-modules/parsy { }; + portpicker = callPackage ../development/python-modules/portpicker { }; pkginfo = callPackage ../development/python-modules/pkginfo { }; -- cgit 1.4.1 From 8258f5bda435c7a9ea771cb530c7c2367beabf11 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 17 Jul 2018 02:51:41 +0300 Subject: ibniz: init at 1.18 --- pkgs/tools/graphics/ibniz/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/graphics/ibniz/default.nix (limited to 'pkgs/top-level') diff --git a/pkgs/tools/graphics/ibniz/default.nix b/pkgs/tools/graphics/ibniz/default.nix new file mode 100644 index 000000000000..11fad25b85ae --- /dev/null +++ b/pkgs/tools/graphics/ibniz/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, SDL }: + +stdenv.mkDerivation rec { + name = "ibniz-${version}"; + version = "1.18"; + + src = fetchurl { + url = "http://www.pelulamu.net/ibniz/${name}.tar.gz"; + sha256 = "10b4dka8zx7y84m1a58z9j2vly8mz9aw9wn8z9vx9av739j95wp2"; + }; + + buildInputs = [ SDL ]; + + installPhase = '' + mkdir -p $out/bin + cp ibniz $out/bin + ''; + + meta = with stdenv.lib; { + description = "Virtual machine designed for extremely compact low-level audiovisual programs"; + homepage = "http://www.pelulamu.net/ibniz/"; + license = licenses.zlib; + platforms = platforms.linux; + maintainers = [ maintainers.dezgeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ee25484c0d3..fbe0e9c51ff4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3086,6 +3086,8 @@ with pkgs; iannix = libsForQt5.callPackage ../applications/audio/iannix { }; + ibniz = callPackage ../tools/graphics/ibniz { }; + icecast = callPackage ../servers/icecast { }; darkice = callPackage ../tools/audio/darkice { }; -- cgit 1.4.1