From 2cac5d73ce022d2c6e82cec39b7de973c08b55c4 Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Mon, 5 Mar 2018 14:31:01 -0800 Subject: cloud-sql-proxy: init at 1.11 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24b33231f77e..d8e1943157d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -609,6 +609,8 @@ with pkgs; bonfire = callPackage ../tools/misc/bonfire { }; + cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; + container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; cconv = callPackage ../tools/text/cconv { }; -- cgit 1.4.1 From 4a2bf9c4ec6477c4ca4440c29115e227b5092c89 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 6 May 2018 15:19:41 -0400 Subject: input-utils: init at 1.3 --- pkgs/os-specific/linux/input-utils/default.nix | 30 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/os-specific/linux/input-utils/default.nix (limited to 'pkgs/top-level') diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/os-specific/linux/input-utils/default.nix new file mode 100644 index 000000000000..cd0fc01384bc --- /dev/null +++ b/pkgs/os-specific/linux/input-utils/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, linuxHeaders }: + +stdenv.mkDerivation rec { + name = "input-utils-${version}"; + version = "1.3"; + + src = fetchurl { + url = "https://www.kraxel.org/releases/input/input-${version}.tar.gz"; + sha256 = "11w0pp20knx6qpgzmawdbk1nj2z3fzp8yd6nag6s8bcga16w6hli"; + }; + + prePatch = '' + # Use proper include path for kernel include files. + substituteInPlace ./name.sh --replace "/usr/include/linux/" "${linuxHeaders}/include/linux/" + substituteInPlace ./lirc.sh --replace "/usr/include/linux/" "${linuxHeaders}/include/linux/" + ''; + + makeFlags = [ + "prefix=$(out)" + "STRIP=-s" + ]; + + meta = with stdenv.lib; { + description = "Input layer utilities, includes lsinput"; + homepage = https://www.kraxel.org/blog/linux/input/; + license = licenses.gpl2; + maintainers = with maintainers; [ samueldr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 567167fc4605..45ca547b7bb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3047,6 +3047,8 @@ with pkgs; innoextract = callPackage ../tools/archivers/innoextract { }; + input-utils = callPackage ../os-specific/linux/input-utils { }; + intecture-agent = callPackage ../tools/admin/intecture/agent.nix { }; intecture-auth = callPackage ../tools/admin/intecture/auth.nix { }; -- cgit 1.4.1 From 7b0b4cd3977fe261f34e928bb375a5760b27d93a Mon Sep 17 00:00:00 2001 From: Michael Brantley Date: Wed, 9 May 2018 10:58:33 -0400 Subject: perlPackages.NetZooKeeper: init at 0.41 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3278311f25c0..3dc0ed43a5a6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11758,6 +11758,22 @@ let self = _self // overrides; _self = with self; { }; }; + NetZooKeeper = buildPerlPackage rec { + name = "Net-ZooKeeper-0.41"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MAF/${name}.tar.gz"; + sha256 = "91c177f30f82302eaf3173356eef05c21bc82163df752acb469177bd14a72db9"; + }; + buildInputs = [ pkgs.zookeeper_mt ]; + NIX_CFLAGS_COMPILE = "-I${pkgs.zookeeper_mt}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.zookeeper_mt.out}/lib -lzookeeper_mt"; + meta = { + maintainers = [ maintainers.limeytexan ]; + homepage = https://github.com/mark-5/p5-net-zookeeper; + license = stdenv.lib.licenses.asl20; + }; + }; + PackageConstants = buildPerlPackage { name = "Package-Constants-0.06"; src = fetchurl { -- cgit 1.4.1 From 9410c39b9a8a2f598eb2cc407d9f314c09597818 Mon Sep 17 00:00:00 2001 From: Michael Brantley Date: Wed, 9 May 2018 08:48:28 -0400 Subject: perlPackages.LinuxACL: init at 0.05 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3dc0ed43a5a6..933169f9eb7f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -450,6 +450,21 @@ let self = _self // overrides; _self = with self; { }; }; + LinuxACL = buildPerlPackage rec { + name = "Linux-ACL-0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NA/NAZAROV/${name}.tar.gz"; + sha256 = "312940c1f60f47c4fc93fa0a9d2a626425faa837040c8c2f1ad58ee09f62f371"; + }; + buildInputs = [ pkgs.acl ]; + NIX_CFLAGS_LINK = "-L${pkgs.acl.out}/lib -lacl"; + meta = { + maintainers = [ maintainers.limeytexan ]; + description = "Perl extension for reading and setting Access Control Lists for files by libacl linux library"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ListCompare = buildPerlPackage rec { name = "List-Compare-0.53"; src = fetchurl { -- cgit 1.4.1 From df37647ab2d7069288b6535a9fd6deb2f630d866 Mon Sep 17 00:00:00 2001 From: Michael Brantley Date: Wed, 9 May 2018 13:15:22 -0400 Subject: Fix alphabetization of perl modules --- pkgs/top-level/perl-packages.nix | 58 ++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 933169f9eb7f..22733443ed19 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -450,35 +450,6 @@ let self = _self // overrides; _self = with self; { }; }; - LinuxACL = buildPerlPackage rec { - name = "Linux-ACL-0.05"; - src = fetchurl { - url = "mirror://cpan/authors/id/N/NA/NAZAROV/${name}.tar.gz"; - sha256 = "312940c1f60f47c4fc93fa0a9d2a626425faa837040c8c2f1ad58ee09f62f371"; - }; - buildInputs = [ pkgs.acl ]; - NIX_CFLAGS_LINK = "-L${pkgs.acl.out}/lib -lacl"; - meta = { - maintainers = [ maintainers.limeytexan ]; - description = "Perl extension for reading and setting Access Control Lists for files by libacl linux library"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - - ListCompare = buildPerlPackage rec { - name = "List-Compare-0.53"; - src = fetchurl { - url = "mirror://cpan/authors/id/J/JK/JKEENAN/${name}.tar.gz"; - sha256 = "fdbf4ff67b3135d44475fef7fcac0cd4706407d5720d26dca914860eb10f8550"; - }; - buildInputs = [ IOCaptureOutput ]; - meta = { - homepage = http://thenceforward.net/perl/modules/List-Compare/; - description = "Compare elements of two or more lists"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - ArchiveCpio = buildPerlPackage rec { name = "Archive-Cpio-0.10"; src = fetchurl { @@ -8539,6 +8510,21 @@ let self = _self // overrides; _self = with self; { doCheck = false; }; + LinuxACL = buildPerlPackage rec { + name = "Linux-ACL-0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NA/NAZAROV/${name}.tar.gz"; + sha256 = "312940c1f60f47c4fc93fa0a9d2a626425faa837040c8c2f1ad58ee09f62f371"; + }; + buildInputs = [ pkgs.acl ]; + NIX_CFLAGS_LINK = "-L${pkgs.acl.out}/lib -lacl"; + meta = { + maintainers = [ maintainers.limeytexan ]; + description = "Perl extension for reading and setting Access Control Lists for files by libacl linux library"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LinuxDistribution = buildPerlModule { name = "Linux-Distribution-0.23"; src = fetchurl { @@ -8586,6 +8572,20 @@ let self = _self // overrides; _self = with self; { }; }; + ListCompare = buildPerlPackage rec { + name = "List-Compare-0.53"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JK/JKEENAN/${name}.tar.gz"; + sha256 = "fdbf4ff67b3135d44475fef7fcac0cd4706407d5720d26dca914860eb10f8550"; + }; + buildInputs = [ IOCaptureOutput ]; + meta = { + homepage = http://thenceforward.net/perl/modules/List-Compare/; + description = "Compare elements of two or more lists"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ListMoreUtils = buildPerlPackage rec { name = "List-MoreUtils-0.428"; src = fetchurl { -- cgit 1.4.1 From 1e50e178ae2268ab0fd655a80d9d0c0db0aa62a5 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 9 May 2018 13:50:01 -0700 Subject: simpleitk: init at 1.1.0 (note this only builds the C++ libs, not the Python/Lua/... bindings) (#27451) * conglomerate: init at 2017-09-10 * simpleitk: init at 1.1.0 (note this only builds the C++ libs, not the Python/Lua/... bindings) --- pkgs/development/libraries/simpleitk/default.nix | 29 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/simpleitk/default.nix (limited to 'pkgs/top-level') diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix new file mode 100644 index 000000000000..4802683079d1 --- /dev/null +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, cmake, git, swig, lua, itk }: + +stdenv.mkDerivation rec { + pname = "simpleitk"; + version = "1.0.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://sourceforge.net/projects/${pname}/files/SimpleITK/${version}/Source/SimpleITK-${version}.tar.gz"; + sha256 = "0554j0zp314zhs8isfg31fi6gvsl7xq3xjyyxkx1b1mjkn5qx673"; + }; + + nativeBuildInputs = [ cmake git swig ]; + buildInputs = [ lua itk ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_CXX_FLAGS='-Wno-attributes'" ]; + + checkPhase = "ctest"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://www.simpleitk.org; + description = "Simplified interface to ITK"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d52cc8c5de6b..555ed2a24ff6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11519,6 +11519,8 @@ with pkgs; simp_le = callPackage ../tools/admin/simp_le { }; + simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; }; + sfml = callPackage ../development/libraries/sfml { }; csfml = callPackage ../development/libraries/csfml { }; -- cgit 1.4.1