From 27090dab2e2a4f689ac4c28c71376defd6ea77d0 Mon Sep 17 00:00:00 2001 From: Mike Ripley Date: Thu, 4 Jul 2024 08:11:50 -0400 Subject: [PATCH 1/5] Update Wilma beta vars --- packer/mint-beta.pkrvars.hcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packer/mint-beta.pkrvars.hcl b/packer/mint-beta.pkrvars.hcl index b0e53949..76c34ff4 100644 --- a/packer/mint-beta.pkrvars.hcl +++ b/packer/mint-beta.pkrvars.hcl @@ -1,6 +1,6 @@ -semester = "Sp24" +semester = "Fa24" mint_version = { - version = "21.3" + version = "22" build_type = "beta" } From 575105528713fee566ed386321118f0e510b9c7b Mon Sep 17 00:00:00 2001 From: Mike Ripley Date: Thu, 4 Jul 2024 09:11:50 -0400 Subject: [PATCH 2/5] Remove deprecated partner repo --- roles/common/templates/mint.j2 | 5 ----- roles/common/templates/ubuntu.j2 | 4 ---- 2 files changed, 9 deletions(-) diff --git a/roles/common/templates/mint.j2 b/roles/common/templates/mint.j2 index 57d508da..d9b610e2 100644 --- a/roles/common/templates/mint.j2 +++ b/roles/common/templates/mint.j2 @@ -12,12 +12,7 @@ deb {{ mirror }} {{ ubuntu_release }}-backports main restricted universe multive deb {{ mirror }} {{ ubuntu_release }}-security main restricted universe multiverse {% endfor %} - {% for mirror in common_mint_mirrors %} # Mint sources for {{ mirror }} deb {{ mirror }} {{ ansible_distribution_release }} main upstream import backport - {% endfor %} - -# Parter repository (necessary for optional media codecs) -- not mirrored -deb http://archive.canonical.com/ubuntu {{ ubuntu_release }} partner diff --git a/roles/common/templates/ubuntu.j2 b/roles/common/templates/ubuntu.j2 index ff45a0e9..4fd1501d 100644 --- a/roles/common/templates/ubuntu.j2 +++ b/roles/common/templates/ubuntu.j2 @@ -9,8 +9,4 @@ deb {{ mirror }} {{ ubuntu_release }} main restricted universe multiverse deb {{ mirror }} {{ ubuntu_release }}-updates main restricted universe multiverse deb {{ mirror }} {{ ubuntu_release }}-backports main restricted universe multiverse deb {{ mirror }} {{ ubuntu_release }}-security main restricted universe multiverse - {% endfor %} - -# Parter repository (necessary for optional media codecs) -- not mirrored -deb http://archive.canonical.com/ubuntu {{ ubuntu_release }} partner From 918d3f7ca5a6c4ad10ca43ba3c0ba9f614c924f0 Mon Sep 17 00:00:00 2001 From: Mike Ripley Date: Thu, 4 Jul 2024 09:52:46 -0400 Subject: [PATCH 3/5] Upgrade deprecated sqlite2 --- roles/basic_prog_pkgs/vars/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/basic_prog_pkgs/vars/main.yml b/roles/basic_prog_pkgs/vars/main.yml index afa6d10b..a1180040 100644 --- a/roles/basic_prog_pkgs/vars/main.yml +++ b/roles/basic_prog_pkgs/vars/main.yml @@ -8,7 +8,7 @@ basic_prog_pkgs_intro_development: - meld - python-is-python3 - python3-flake8-docstrings - - sqlite + - sqlite3 - sqlitebrowser - thonny From 1e24ddaa18da4e40a1ea32d36d1fdb3b5df8e77a Mon Sep 17 00:00:00 2001 From: Mike Ripley Date: Thu, 4 Jul 2024 10:03:40 -0400 Subject: [PATCH 4/5] Remove deprecated darglint utility --- roles/basic_prog_pkgs/tasks/main.yml | 8 -------- roles/basic_prog_pkgs/vars/main.yml | 3 --- 2 files changed, 11 deletions(-) diff --git a/roles/basic_prog_pkgs/tasks/main.yml b/roles/basic_prog_pkgs/tasks/main.yml index 8fab83ae..689e623b 100644 --- a/roles/basic_prog_pkgs/tasks/main.yml +++ b/roles/basic_prog_pkgs/tasks/main.yml @@ -4,11 +4,3 @@ ansible.builtin.apt: name: '{{ basic_prog_pkgs_intro_development }}' state: latest - -- name: Install intro pip packages - ansible.builtin.pip: - name: '{{ basic_prog_pkgs_pip }}' - state: present - become: yes - become_user: "{{ item.user }}" - loop: "{{ real_users }}" diff --git a/roles/basic_prog_pkgs/vars/main.yml b/roles/basic_prog_pkgs/vars/main.yml index a1180040..10141a77 100644 --- a/roles/basic_prog_pkgs/vars/main.yml +++ b/roles/basic_prog_pkgs/vars/main.yml @@ -11,6 +11,3 @@ basic_prog_pkgs_intro_development: - sqlite3 - sqlitebrowser - thonny - -basic_prog_pkgs_pip: - - darglint From 2ecf11c3cfc8f2f170e655fb51e69c602bd59167 Mon Sep 17 00:00:00 2001 From: Mike Ripley Date: Thu, 4 Jul 2024 10:21:51 -0400 Subject: [PATCH 5/5] Update Haskell package list --- roles/programming_langs/vars/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/programming_langs/vars/main.yml b/roles/programming_langs/vars/main.yml index 8bf13560..8d1fed7c 100644 --- a/roles/programming_langs/vars/main.yml +++ b/roles/programming_langs/vars/main.yml @@ -4,7 +4,9 @@ programming_langs_ruby_packages: - ruby programming_langs_haskell_packages: - - haskell-platform + - ghc + - ghc-doc + - ghc-prof programming_langs_prolog_packages: - swi-prolog